clean up warnings (#1269)
* warnings in sdo, moxy, dbws
* add override ann
* remove redundant casts, inheritdoc
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/dbws/org.eclipse.persistence.dbws/pom.xml b/dbws/org.eclipse.persistence.dbws/pom.xml
index 511cece..c920ed4 100644
--- a/dbws/org.eclipse.persistence.dbws/pom.xml
+++ b/dbws/org.eclipse.persistence.dbws/pom.xml
@@ -31,6 +31,8 @@
</parent>
<properties>
+ <!-- disable warnings for exports for now -->
+ <comp.xlint>-Xlint:all,-rawtypes,-unchecked,-serial,-exports</comp.xlint>
<test-skip-dbws>${skipTests}</test-skip-dbws>
</properties>
diff --git a/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/keymappings/KeyMappingsTestSuite.java b/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/keymappings/KeyMappingsTestSuite.java
index f001fd0..20cc162 100644
--- a/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/keymappings/KeyMappingsTestSuite.java
+++ b/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/keymappings/KeyMappingsTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -717,7 +717,7 @@
for (DynamicEntity employee : resultVector) {
xrDynEntityCol.add(employee);
xrDynEntityCol.add(employee.get("address"));
- Vector<DynamicEntity> phones = (Vector<DynamicEntity>)employee.get("phones");
+ Vector<DynamicEntity> phones = employee.get("phones");
phones.size(); // trigger IndirectList
for (DynamicEntity phone : phones) {
xrDynEntityCol.add(phone);
@@ -745,7 +745,7 @@
assertTrue("employee1 __pk incorrent", Integer.valueOf(1).equals(employee1.get("employeeId")));
assertTrue("employee1 first name incorrent", "Mike".equals(employee1.get("firstName")));
assertTrue("employee1 last name incorrent", "Norman".equals(employee1.get("lastName")));
- ArrayList<DynamicEntity> phones = (ArrayList<DynamicEntity>)employee1.get("phones"); // phones
+ ArrayList<DynamicEntity> phones = employee1.get("phones"); // phones
assertTrue("employee1 has wrong number of phones", phones.size() == 2);
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/xrdynamicentity/XRCustomer.java b/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/xrdynamicentity/XRCustomer.java
index 00bb6ee..45ba515 100644
--- a/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/xrdynamicentity/XRCustomer.java
+++ b/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/xrdynamicentity/XRCustomer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
super();
}
+ @Override
public XRDynamicPropertiesManager fetchPropertiesManager() {
return DPM;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/xrdynamicentity/XRDynamicEntityTestSuite.java b/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/xrdynamicentity/XRDynamicEntityTestSuite.java
index 6ee9293..cb0958a 100644
--- a/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/xrdynamicentity/XRDynamicEntityTestSuite.java
+++ b/dbws/org.eclipse.persistence.dbws/src/it/java/dbws/testing/xrdynamicentity/XRDynamicEntityTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,20 +88,19 @@
@SuppressWarnings("unchecked")
@Test
- public void buildTestEntity() throws InstantiationException, IllegalAccessException,
- NoSuchFieldException {
+ public void buildTestEntity() throws ReflectiveOperationException {
XRDynamicClassLoader xrdcl =
new XRDynamicClassLoader(XRDynamicEntityTestSuite.class.getClassLoader());
Class<XRDynamicEntity> testClass =
(Class<XRDynamicEntity>)xrdcl.createDynamicClass(TEST_CLASSNAME);
- XRDynamicEntity newInstance = testClass.newInstance();
+ XRDynamicEntity newInstance = testClass.getConstructor().newInstance();
XRDynamicPropertiesManager xrDPM = newInstance.fetchPropertiesManager();
Set<String> propertyNames = new HashSet<String>();
propertyNames.add(FIELD_1);
propertyNames.add(FIELD_2);
xrDPM.setPropertyNames(propertyNames);
//build instance
- XRDynamicEntity newInstance2 = testClass.newInstance();
+ XRDynamicEntity newInstance2 = testClass.getConstructor().newInstance();
assertNotNull(newInstance2);
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java b/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java
index 408fc25..71cbf60 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java
@@ -26,10 +26,9 @@
requires static jakarta.servlet; //AM
requires org.eclipse.persistence.asm;
- requires org.eclipse.persistence.core;
requires org.eclipse.persistence.jpa;
requires org.eclipse.persistence.jpa.jpql;
- requires org.eclipse.persistence.moxy;
+ requires transitive org.eclipse.persistence.moxy;
exports org.eclipse.persistence.dbws;
exports org.eclipse.persistence.jpa.rs;
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/dbws/DBWSModelProject.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/dbws/DBWSModelProject.java
index 26230cd..5133ae7 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/dbws/DBWSModelProject.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/dbws/DBWSModelProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -283,6 +283,7 @@
XMLDirectMapping isCollection = new XMLDirectMapping();
isCollection.setAttributeAccessor(new AttributeAccessor() {
+
@Override
public String getAttributeName() {
return "isCollection";
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPResponseWriter.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPResponseWriter.java
index 70c5e73..361c4e1 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPResponseWriter.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPResponseWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -206,11 +206,9 @@
XMLDescriptor descriptor = resultDescriptors.get(op.getName());
SOAPResponse response = null;
try {
- response = (SOAPResponse) descriptor.getJavaClass().newInstance();
- } catch (InstantiationException ie) {
+ response = (SOAPResponse) descriptor.getJavaClass().getConstructor().newInstance();
+ } catch (ReflectiveOperationException ie) {
throw new SOAPException(ie);
- } catch (IllegalAccessException iae) {
- throw new SOAPException(iae);
}
response.setResult(result);
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/JPQLQueryHandler.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/JPQLQueryHandler.java
index f4c69b2..ecc1f2b 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/JPQLQueryHandler.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/JPQLQueryHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,6 @@
this.jpqlString = sqlString;
}
- /**
- * {@inheritDoc}
- */
@Override
public void initializeCall(XRServiceAdapter xrService, QueryOperation queryOperation,
DatabaseQuery databaseQuery) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/NamedQueryHandler.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/NamedQueryHandler.java
index f613540..88ef70f 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/NamedQueryHandler.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/NamedQueryHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,9 +52,6 @@
this.descriptor = descriptor;
}
- /**
- * {@inheritDoc}
- */
@Override
public void validate(XRServiceAdapter xrService, QueryOperation queryOperation) {
if (descriptor != null) {
@@ -90,9 +87,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void initialize(XRServiceAdapter xrService, QueryOperation queryOperation) {
if (descriptor != null) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/ProjectHelper.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/ProjectHelper.java
index 710fec1..baa812e 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/ProjectHelper.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/ProjectHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,7 +62,7 @@
XRDynamicPropertiesManager xrDPM = null;
if (!clz.getName().endsWith(COLLECTION_WRAPPER_SUFFIX)) {
try {
- XRDynamicEntity newInstance = (XRDynamicEntity)clz.newInstance();
+ XRDynamicEntity newInstance = (XRDynamicEntity)clz.getConstructor().newInstance();
xrDPM = newInstance.fetchPropertiesManager();
}
catch (Exception e) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QueryOperation.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QueryOperation.java
index 8d23cb6..8b46418 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QueryOperation.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QueryOperation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -450,8 +450,8 @@
}
// handle BLOB types
if (value instanceof Blob) {
- value = ((XMLConversionManager) xrService.getOXSession().
- getDatasourcePlatform().getConversionManager()).
+ value = xrService.getOXSession().
+ getDatasourcePlatform().getConversionManager().
convertObject(value, ClassConstants.APBYTE);
}
return AttachmentHelper.buildAttachmentHandler((byte[])value, mimeType);
@@ -506,7 +506,7 @@
objs[0] = ((ArrayList<?>)value).get(0);
DatabaseRecord dr = new DatabaseRecord();
dr.add(new DatabaseField(ITEMS_STR), objs);
- populateTargetObjectFromRecord(desc.getMappings(), (AbstractRecord) dr, targetObject, (AbstractSession)xrService.getORSession());
+ populateTargetObjectFromRecord(desc.getMappings(), dr, targetObject, (AbstractSession)xrService.getORSession());
}
value = targetObject;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/SQLQueryHandler.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/SQLQueryHandler.java
index 1a6e69a..d168f45 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/SQLQueryHandler.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/SQLQueryHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,18 +41,12 @@
this.sqlString = sqlString;
}
- /**
- * {@inheritDoc}
- */
@Override
public void initialize(XRServiceAdapter xrService, QueryOperation queryOperation) {
super.initialize(xrService, queryOperation);
getDatabaseQuery().setIsUserDefined(true);
}
- /**
- * {@inheritDoc}
- */
@Override
public void initializeCall(XRServiceAdapter xrService, QueryOperation queryOperation,
DatabaseQuery databaseQuery) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/StoredProcedureQueryHandler.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/StoredProcedureQueryHandler.java
index 03f59d1..e66cf48 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/StoredProcedureQueryHandler.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/StoredProcedureQueryHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -194,8 +194,8 @@
field.setSqlType(queryOperation.getResult().getJdbcType());
field.setSqlTypeName(getTypeNameForJDBCType(queryOperation.getResult().getJdbcType()));
// replace the original field with the new one
- ((StoredFunctionCall)spCall).getParameters().remove(0);
- ((StoredFunctionCall)spCall).getParameters().add(0, field);
+ spCall.getParameters().remove(0);
+ spCall.getParameters().add(0, field);
}
// support stored function with out args
for (ProcedureOutputArgument arg : getOutArguments()) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/DynamicRestClassLoader.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/DynamicRestClassLoader.java
index 1d93123..6e3cb4d 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/DynamicRestClassLoader.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/DynamicRestClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,18 +39,21 @@
super(delegate, writer);
}
+ @Override
public void createDynamicAdapter(String className) {
// Reference adapter for JPARS version < 2.0
RestAdapterClassWriter restAdapter = new RestAdapterClassWriter(className);
addClass(restAdapter.getClassName(), restAdapter);
}
+ @Override
public void createDynamicCollectionAdapter(String className) {
// Collection adapter for JPARS version >= 2.0
RestCollectionAdapterClassWriter restCollectionAdapter = new RestCollectionAdapterClassWriter(className);
addClass(restCollectionAdapter.getClassName(), restCollectionAdapter);
}
+ @Override
public void createDynamicReferenceAdapter(String className) {
// Reference adapter for JPARS version >= 2.0
RestReferenceAdapterV2ClassWriter restReferenceAdapterV2 = new RestReferenceAdapterV2ClassWriter(className);
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureResponseBuilderImpl.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureResponseBuilderImpl.java
index 39560a6..8bea568 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureResponseBuilderImpl.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureResponseBuilderImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,17 +43,11 @@
@SuppressWarnings({ "rawtypes", "unchecked" })
public class FeatureResponseBuilderImpl implements FeatureResponseBuilder {
- /**
- * {@inheritDoc}
- */
@Override
public Object buildReadAllQueryResponse(PersistenceContext context, Map<String, Object> queryParams, List<Object> items, UriInfo uriInfo) {
return items;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildReportQueryResponse(PersistenceContext context, Map<String, Object> queryParams, List<Object[]> results, List<ReportItem> items, UriInfo uriInfo) {
if ((results != null) && (!results.isEmpty())) {
@@ -64,9 +58,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildAttributeResponse(PersistenceContext context, Map<String, Object> queryParams, String attribute, Object result, UriInfo uriInfo) {
if (result instanceof Collection) {
@@ -81,9 +72,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildSingleResultQueryResponse(PersistenceContext context, Map<String, Object> queryParams, Object result, List<ReportItem> items, UriInfo uriInfo) {
final SingleResultQueryList response = new SingleResultQueryList();
@@ -92,9 +80,6 @@
return response;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildSingleEntityResponse(PersistenceContext context, Map<String, Object> queryParams, Object result, UriInfo uriInfo) {
return result;
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureSetPreV2.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureSetPreV2.java
index 26c32a3..9841022 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureSetPreV2.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureSetPreV2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,9 +46,6 @@
*/
public class FeatureSetPreV2 implements FeatureSet {
- /**
- * {@inheritDoc}
- */
@Override
public boolean isSupported(Feature feature) {
switch (feature) {
@@ -60,9 +57,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public FeatureResponseBuilder getResponseBuilder(Feature feature) {
switch (feature) {
@@ -73,9 +67,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public List<MetadataSource> getMetadataSources() {
final List<MetadataSource> metadataSources = new ArrayList<MetadataSource>();
@@ -98,17 +89,11 @@
return metadataSources;
}
- /**
- * {@inheritDoc}
- */
@Override
public MetadataSource getDynamicMetadataSource(AbstractSession session, String packageName) {
return new DynamicXMLMetadataSource(session, packageName);
}
- /**
- * {@inheritDoc}
- */
@Override
public SessionEventListener getSessionEventListener(AbstractSession session) {
return new PreLoginMappingAdapter(session);
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureSetV2.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureSetV2.java
index be38943..e10c888 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureSetV2.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/FeatureSetV2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,9 +49,6 @@
*/
public class FeatureSetV2 implements FeatureSet {
- /**
- * {@inheritDoc}
- */
@Override
public boolean isSupported(Feature feature) {
switch (feature) {
@@ -64,9 +61,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public FeatureResponseBuilder getResponseBuilder(Feature feature) {
switch (feature) {
@@ -77,9 +71,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public List<MetadataSource> getMetadataSources() {
final List<MetadataSource> metadataSources = new ArrayList<MetadataSource>();
@@ -104,17 +95,11 @@
return metadataSources;
}
- /**
- * {@inheritDoc}
- */
@Override
public MetadataSource getDynamicMetadataSource(AbstractSession session, String packageName) {
return new DynamicXmlV2MetadataSource(session, packageName);
}
- /**
- * {@inheritDoc}
- */
@Override
public SessionEventListener getSessionEventListener(AbstractSession session) {
return new PreLoginMappingAdapterV2();
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/core/selflinks/SelfLinksResponseBuilder.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/core/selflinks/SelfLinksResponseBuilder.java
index 4a9896c..099f426 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/core/selflinks/SelfLinksResponseBuilder.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/core/selflinks/SelfLinksResponseBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,17 +53,11 @@
@SuppressWarnings({ "unchecked"})
public class SelfLinksResponseBuilder extends FeatureResponseBuilderImpl {
- /**
- * {@inheritDoc}
- */
@Override
public Object buildReadAllQueryResponse(PersistenceContext context, Map<String, Object> queryParams, List<Object> items, UriInfo uriInfo) {
return collectionResponse(context, items, uriInfo);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildReportQueryResponse(PersistenceContext context, Map<String, Object> queryParams, List<Object[]> results, List<ReportItem> items, UriInfo uriInfo) {
ReportQueryResultCollection response = new ReportQueryResultCollection();
@@ -78,9 +72,6 @@
return response;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildSingleResultQueryResponse(PersistenceContext context, Map<String, Object> queryParams, Object result, List<ReportItem> items, UriInfo uriInfo) {
final SingleResultQueryResult response = new SingleResultQueryResult();
@@ -94,9 +85,6 @@
return response;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildAttributeResponse(PersistenceContext context, Map<String, Object> queryParams, String attribute, Object item, UriInfo uriInfo) {
if (item instanceof List) {
@@ -105,9 +93,6 @@
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildSingleEntityResponse(PersistenceContext context, Map<String, Object> queryParams, Object result, UriInfo uriInfo) {
if (result instanceof PersistenceWeavedRest) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/paging/PagingResponseBuilder.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/paging/PagingResponseBuilder.java
index 84918d3..850cb2f 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/paging/PagingResponseBuilder.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/features/paging/PagingResponseBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,9 +46,6 @@
*/
public class PagingResponseBuilder extends FeatureResponseBuilderImpl {
- /**
- * {@inheritDoc}
- */
@Override
public Object buildReadAllQueryResponse(PersistenceContext context, Map<String, Object> queryParams, List<Object> items, UriInfo uriInfo) {
ReadAllQueryResultCollection response = new ReadAllQueryResultCollection();
@@ -59,17 +56,11 @@
return populatePagedCollectionLinks(queryParams, uriInfo, response);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildReportQueryResponse(PersistenceContext context, Map<String, Object> queryParams, List<Object[]> results, List<ReportItem> items, UriInfo uriInfo) {
return populatePagedReportQueryCollectionLinks(queryParams, results, items, uriInfo);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildAttributeResponse(PersistenceContext context, Map<String, Object> queryParams, String attribute, Object results, UriInfo uriInfo) {
if (results instanceof List) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/resources/common/AbstractPersistenceUnitResource.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/resources/common/AbstractPersistenceUnitResource.java
index 5a03059..13b61cc 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/resources/common/AbstractPersistenceUnitResource.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/resources/common/AbstractPersistenceUnitResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -180,7 +180,7 @@
collectionName = collectionMapping.getAttributeClassification().getSimpleName();
}
if (collectionMapping.getContainerPolicy().isMapPolicy()) {
- String mapKeyType = ((MapContainerPolicy) collectionMapping.getContainerPolicy()).getKeyType().getClass().getSimpleName();
+ String mapKeyType = collectionMapping.getContainerPolicy().getKeyType().getClass().getSimpleName();
target = collectionType + "<" + mapKeyType + ", " + collectionName + ">";
} else {
target = collectionType + "<" + collectionName + ">";
@@ -201,7 +201,7 @@
collectionName = collectionMapping.getAttributeClassification().getSimpleName();
}
if (collectionMapping.getContainerPolicy().isMapPolicy()) {
- String mapKeyType = ((MapContainerPolicy) collectionMapping.getContainerPolicy()).getKeyType().getClass().getSimpleName();
+ String mapKeyType = collectionMapping.getContainerPolicy().getKeyType().getClass().getSimpleName();
target = collectionType + "<" + mapKeyType + ", " + collectionName + ">";
} else {
target = collectionType + "<" + collectionName + ">";
@@ -289,7 +289,7 @@
if (((MapEntryExpression) item.getAttributeExpression()).shouldReturnMapEntry()) {
returnQuery.getReturnTypes().add(Map.Entry.class.getSimpleName());
} else {
- returnQuery.getReturnTypes().add(((Class<?>) ((CollectionMapping) item.getMapping()).getContainerPolicy().getKeyType()).getSimpleName());
+ returnQuery.getReturnTypes().add(((Class<?>) item.getMapping().getContainerPolicy().getKeyType()).getSimpleName());
}
} else {
returnQuery.getReturnTypes().add(item.getMapping().getAttributeClassification().getSimpleName());
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/ConcreteSubclassFactory.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/ConcreteSubclassFactory.java
index b7d4ccd..e0cbf60 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/ConcreteSubclassFactory.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/ConcreteSubclassFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,10 +43,9 @@
* Creates a new ConcreteSubclass object.
*
* @return the object
- * @throws InstantiationException the instantiation exception
- * @throws IllegalAccessException the illegal access exception
+ * @throws ReflectiveOperationException for errors
*/
- public Object createConcreteSubclass() throws InstantiationException, IllegalAccessException {
- return clazz.newInstance();
+ public Object createConcreteSubclass() throws ReflectiveOperationException {
+ return clazz.getConstructor().newInstance();
}
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/InMemoryArchive.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/InMemoryArchive.java
index 140fdbe..50307ad 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/InMemoryArchive.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/InMemoryArchive.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,7 +39,7 @@
private InputStream stream = null;
private InMemoryArchive(){
- super((URL)null, (String)null);
+ super(null, null);
String persistenceFactoryResource = InMemoryArchive.class.getName().replace('.', '/') + ".class";
URL myURL = InMemoryArchive.class.getClassLoader().getResource(persistenceFactoryResource);
try{
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/PreLoginMappingAdapterV2.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/PreLoginMappingAdapterV2.java
index a246ed6..a80436a 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/PreLoginMappingAdapterV2.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/PreLoginMappingAdapterV2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
public PreLoginMappingAdapterV2() {
}
- /**
- * {@inheritDoc}
- */
@Override
public void preLogin(SessionEvent event) {
final Project project = event.getSession().getProject();
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/list/ReadAllQueryResultCollection.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/list/ReadAllQueryResultCollection.java
index de2ce0e..ee58e06 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/list/ReadAllQueryResultCollection.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/list/ReadAllQueryResultCollection.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,105 +38,66 @@
private Integer count = null;
private List<LinkV2> links;
- /**
- * {@inheritDoc}
- */
@Override
public List<Object> getItems() {
return items;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setItems(List<Object> items) {
this.items = items;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setHasMore(Boolean hasMore) {
this.hasMore = hasMore;
}
- /**
- * {@inheritDoc}
- */
@Override
public Boolean getHasMore() {
return hasMore;
}
- /**
- * {@inheritDoc}
- */
@Override
public Integer getCount() {
return count;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setCount(Integer count) {
this.count = count;
}
- /**
- * {@inheritDoc}
- */
@Override
public Integer getLimit() {
return limit;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLimit(Integer limit) {
this.limit = limit;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setOffset(Integer offset) {
this.offset = offset;
}
- /**
- * {@inheritDoc}
- */
@Override
public Integer getOffset() {
return this.offset;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<LinkV2> getLinks() {
return this.links;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLinks(List<LinkV2> links) {
this.links = links;
}
- /**
- * {@inheritDoc}
- */
@Override
public void addLink(LinkV2 link) {
if (this.links == null) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXMLMetadataSource.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXMLMetadataSource.java
index 9c9c9ea..057cfa4 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXMLMetadataSource.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXMLMetadataSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -134,14 +134,14 @@
// No way to find out the type of the collection from EIS mappings, currently, so just set the container policy here...
// It will be fine for simple collections
if (mapping instanceof EISCompositeDirectCollectionMapping) {
- xmlElement.setContainerType(((EISCompositeDirectCollectionMapping) mapping).getContainerPolicy().getContainerClassName());
+ xmlElement.setContainerType(mapping.getContainerPolicy().getContainerClassName());
} else if (mapping instanceof EISCompositeCollectionMapping) {
- xmlElement.setContainerType(((EISCompositeCollectionMapping) mapping).getContainerPolicy().getContainerClassName());
+ xmlElement.setContainerType(mapping.getContainerPolicy().getContainerClassName());
xmlElement.setType(((EISCompositeCollectionMapping) mapping).getReferenceClassName());
}
} else {
xmlElement.setType(((CollectionMapping) mapping).getReferenceClassName());
- xmlElement.setContainerType(((CollectionMapping) mapping).getContainerPolicy().getContainerClassName());
+ xmlElement.setContainerType(mapping.getContainerPolicy().getContainerClassName());
}
} else {
xmlElement.setType(mapping.getAttributeClassification().getName());
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXmlV2MetadataSource.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXmlV2MetadataSource.java
index cc0c489..9a54fd8 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXmlV2MetadataSource.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/DynamicXmlV2MetadataSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -144,9 +144,6 @@
return objectFactory.createXmlElement(xmlElement);
}
- /**
- * {@inheritDoc}
- */
@Override
public XmlBindings getXmlBindings(Map<String, ?> properties, ClassLoader classLoader) {
return this.xmlBindings;
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/SingleResultQueryResultMetadataSource.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/SingleResultQueryResultMetadataSource.java
index 6f63b85..d2f9ec0 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/SingleResultQueryResultMetadataSource.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/util/metadatasources/SingleResultQueryResultMetadataSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,9 +46,6 @@
javaTypes.getJavaType().add(javaType);
}
- /**
- * {@inheritDoc}
- */
@Override
public XmlBindings getXmlBindings(Map<String, ?> properties, ClassLoader classLoader) {
return this.xmlBindings;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/Menu.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/Menu.java
index 819cd4c..52db677 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/Menu.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/Menu.java
@@ -148,7 +148,7 @@
}
public Collection getItems() {
- return (Collection)getItemsHolder().getValue();
+ return getItemsHolder().getValue();
}
public ValueHolderInterface<Collection<MenuItem>> getItemsHolder() {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee1.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee1.java
index f2b56c1..2540de1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee1.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/mapping/Employee1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -94,7 +94,7 @@
tables.addElement(new DatabaseTable("MUL_CTRY"));
tables.addElement(new DatabaseTable("MUL_ADDR"));
tables.addElement(new DatabaseTable("MUL_EMP"));
- ((RelationalDescriptor) descriptor).setMultipleTableInsertOrder(tables);
+ descriptor.setMultipleTableInsertOrder(tables);
}
/**
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/performance/EmployeeSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/performance/EmployeeSystem.java
index 6bb7206..dc2f0c6 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/performance/EmployeeSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/performance/EmployeeSystem.java
@@ -47,7 +47,7 @@
// Configure sequencing to be same as Hibernate defaults.
session.getLogin().useNativeSequencing();
session.getLogin().getDefaultSequence().setPreallocationSize(100);
- ((DatabaseSessionImpl)session).getSequencingControl().resetSequencing();
+ session.getSequencingControl().resetSequencing();
dropTableConstraints(session);
// Recreate sequences to help provide more consistent hash values for primary key
// to improve test consistency.
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/performance/toplink/EmployeeSystem.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/performance/toplink/EmployeeSystem.java
index fb40943..d6c72d9 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/performance/toplink/EmployeeSystem.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/performance/toplink/EmployeeSystem.java
@@ -45,7 +45,7 @@
// Configure sequencing to be same as Hibernate defaults.
session.getLogin().useNativeSequencing();
session.getLogin().getDefaultSequence().setPreallocationSize(100);
- ((DatabaseSessionImpl)session).getSequencingControl().resetSequencing();
+ session.getSequencingControl().resetSequencing();
dropTableConstraints(session);
// Recreate sequences to help provide more consistent hash values for primary key
// to improve test consistency.
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/VerifyCascadeDelete.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/VerifyCascadeDelete.java
index b85c05f..408bf30 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/VerifyCascadeDelete.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/VerifyCascadeDelete.java
@@ -41,7 +41,7 @@
super.setup();
// AggregateCollectionMapping descriptors now cloned - should be obtained from the parent descriptor (Agent or Builder).
ClassDescriptor parentDescriptor = getSession().getDescriptor(cls);
- ClassDescriptor customerDescriptor = ((AggregateCollectionMapping)parentDescriptor.getMappingForAttributeName("customers")).getReferenceDescriptor();
+ ClassDescriptor customerDescriptor = parentDescriptor.getMappingForAttributeName("customers").getReferenceDescriptor();
companyMapping = (OneToOneMapping)customerDescriptor.getMappingForAttributeName("company");
privateOwnedValue = companyMapping.isPrivateOwned();
companyMapping.setIsPrivateOwned(false);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/Server.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/Server.java
index d756e3c..65b3459 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/Server.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/Server.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,7 +54,7 @@
ConnectionPool cp = this.serverSession.getConnectionPool("default");
try {
//close off one of the connections. This part of the test sees if our reconnect on the fly works.
- ((org.eclipse.persistence.internal.databaseaccess.DatabaseAccessor)cp.getConnectionsAvailable().get(0)).getConnection().close();
+ cp.getConnectionsAvailable().get(0).getConnection().close();
} catch (java.sql.SQLException e) {
e.printStackTrace(System.out);
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/Server1.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/Server1.java
index c7b92f2..3fb87dd 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/Server1.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/clientserver/Server1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,7 +53,7 @@
ConnectionPool cp = this.serverSession.getConnectionPool("default");
try {
//close off one of the connections. This part of the test sees if our reconnect on the fly works.
- ((org.eclipse.persistence.internal.databaseaccess.DatabaseAccessor)cp.getConnectionsAvailable().get(0)).getConnection().close();
+ cp.getConnectionsAvailable().get(0).getConnection().close();
} catch (java.sql.SQLException e) {
e.printStackTrace(System.out);
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedcache/DistributedCacheMergeTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedcache/DistributedCacheMergeTest.java
index 23616fa..032f3c6 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedcache/DistributedCacheMergeTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedcache/DistributedCacheMergeTest.java
@@ -100,7 +100,7 @@
cm.setUrl("rmi://localhost:41099");
// turn on cache sync with RCM
session.setShouldPropagateChanges(true);
- cm.setServerPlatform(((org.eclipse.persistence.sessions.DatabaseSession)getSession()).getServerPlatform());
+ cm.setServerPlatform(getSession().getServerPlatform());
cm.initialize();
// Sleep to allow RCM to startup and find each session.
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/DistributedServer.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/DistributedServer.java
index fc0ba0e..e9a04a2 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/DistributedServer.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/DistributedServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,11 +60,11 @@
String name = (String)enumtr.next();
Session oldMemberSession = ((SessionBroker)testSssion).getSessionForName(name);
Session newMemberSession = ((SessionBroker)this.session).getSessionForName(name);
- ((DatabaseAccessor)((AbstractSession)newMemberSession).getAccessor()).closeConnection();
+ ((AbstractSession)newMemberSession).getAccessor().closeConnection();
((AbstractSession)newMemberSession).setAccessor(((AbstractSession)oldMemberSession).getAccessor());
}
} else {
- ((DatabaseAccessor)((AbstractSession)this.session).getAccessor()).closeConnection();
+ ((AbstractSession)this.session).getAccessor().closeConnection();
((AbstractSession)this.session).setAccessor(((AbstractSession)testSssion).getAccessor());
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RCMDistributedServersModel.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RCMDistributedServersModel.java
index aa05d5d..54db24d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RCMDistributedServersModel.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/RCMDistributedServersModel.java
@@ -130,7 +130,7 @@
cm.setUrl("rmi://localhost:1099");
// turn on cache sync with RCM
((AbstractSession)getSession()).setShouldPropagateChanges(true);
- cm.setServerPlatform(((org.eclipse.persistence.sessions.DatabaseSession)getSession()).getServerPlatform());
+ cm.setServerPlatform(getSession().getServerPlatform());
cm.initialize();
// Sleep to allow RCM to startup and find each session.
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/NativeSequencingTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/NativeSequencingTestSuite.java
index 8eef793..04af57a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/NativeSequencingTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/NativeSequencingTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,7 +49,7 @@
// configureSequencing
NativeSequence sequence = new NativeSequence();
sequence.setPreallocationSize(1);
- ((AbstractSession)session).getProject().getLogin().setDefaultSequence(sequence);
+ session.getProject().getLogin().setDefaultSequence(sequence);
sequence.onConnect(session.getPlatform());
typeBuilder.configureSequencing(sequence, ENTITY_TYPE + "_SEQ", "SID");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/TableSequencingTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/TableSequencingTestSuite.java
index e953190..a564cc2 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/TableSequencingTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/TableSequencingTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,7 +52,7 @@
sequence.setCounterFieldName("SEQ_VALUE");
sequence.setNameFieldName("SEQ_NAME");
sequence.setPreallocationSize(5);
- ((AbstractSession)session).getProject().getLogin().setDefaultSequence(sequence);
+ session.getProject().getLogin().setDefaultSequence(sequence);
sequence.onConnect(session.getPlatform());
typeBuilder.configureSequencing(sequence, ENTITY_TYPE + "_SEQ", "SID");
dynamicHelper.addTypes(true, true, typeBuilder.getType());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/UnaryTableSequencingTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/UnaryTableSequencingTestSuite.java
index 6f438dc..64d3752 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/UnaryTableSequencingTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/dynamic/simple/sequencing/UnaryTableSequencingTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,7 +50,7 @@
UnaryTableSequence sequence = new UnaryTableSequence(SEQ_TABLE_NAME);
sequence.setCounterFieldName("SEQ_VALUE");
sequence.setPreallocationSize(5);
- ((AbstractSession)session).getProject().getLogin().setDefaultSequence(sequence);
+ session.getProject().getLogin().setDefaultSequence(sequence);
sequence.onConnect(session.getPlatform());
typeBuilder.configureSequencing(sequence, SEQ_TABLE_NAME, "SID");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/CacheStatementBatchWritingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/CacheStatementBatchWritingTest.java
index e2e1b53..346df96 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/CacheStatementBatchWritingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/CacheStatementBatchWritingTest.java
@@ -76,7 +76,7 @@
try {
Method method = uow.getParent().getAccessor().getClass().getDeclaredMethod("getStatementCache", new Class[] { });
method.setAccessible(true);
- statementCache = (Map)method.invoke((DatabaseAccessor)uow.getParent().getAccessor(), new Object[] { });
+ statementCache = (Map)method.invoke(uow.getParent().getAccessor(), new Object[] { });
statement = (PreparedStatement)statementCache.get(sql);
} catch (Exception ex) {
throw new TestErrorException("Failed to run test. Check java.policy file \"SupressAccessChecks\" perission required :" +
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/ReconnectFlushStatementCacheTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/ReconnectFlushStatementCacheTest.java
index 8351bd6..9a60ca3 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/ReconnectFlushStatementCacheTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/feature/ReconnectFlushStatementCacheTest.java
@@ -67,9 +67,9 @@
params.addElement("Bob");
Vector result = (Vector)session.executeQuery(query, params);
- ((DatabaseAccessor)((AbstractSession)session).getAccessor()).closeConnection();
+ ((AbstractSession)session).getAccessor().closeConnection();
- ((DatabaseAccessor)((AbstractSession)session).getAccessor()).reestablishConnection((AbstractSession)session);
+ ((AbstractSession)session).getAccessor().reestablishConnection((AbstractSession)session);
try {
// this query will fail if the cache is not flushed
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cacheinvalidation/InvalidateAllTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cacheinvalidation/InvalidateAllTest.java
index 4ebbc26..fcb74b6 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cacheinvalidation/InvalidateAllTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/identitymaps/cacheinvalidation/InvalidateAllTest.java
@@ -53,7 +53,7 @@
@Override
public void test() {
- ((IdentityMapAccessor)m_session.getIdentityMapAccessor()).invalidateAll();
+ m_session.getIdentityMapAccessor().invalidateAll();
}
@Override
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkCommitResumeTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkCommitResumeTest.java
index bc87ab8..b0535dc 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkCommitResumeTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkCommitResumeTest.java
@@ -80,7 +80,7 @@
*/
protected void changeUnitOfWorkWorkingCopy() {
Company company = (Company)this.unitOfWorkWorkingCopy;
- Vector vehicles = (Vector)company.getVehicles().getValue();
+ Vector vehicles = company.getVehicles().getValue();
// Delete a vehicle
vehicles.removeElement(vehicles.firstElement());
@@ -103,7 +103,7 @@
*/
protected void changeUnitOfWorkWorkingCopyAgain() {
Company company = (Company)this.unitOfWorkWorkingCopy;
- Vector vehicles = (Vector)company.getVehicles().getValue();
+ Vector vehicles = company.getVehicles().getValue();
// Adjust Company name
company.setName(company.name + "0");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkTest.java
index 6b6e14c..847182e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/inheritance/UnitOfWorkTest.java
@@ -66,7 +66,7 @@
protected void changeUnitOfWorkWorkingCopy() {
Company company = (Company)this.unitOfWorkWorkingCopy;
- Vector vehicles = (Vector)company.getVehicles().getValue();
+ Vector vehicles = company.getVehicles().getValue();
//delete a vehicle
// vehicles.removeElement(vehicles.firstElement());
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllFirstResultVsRownumFilteringTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllFirstResultVsRownumFilteringTest.java
index 50eefbe..fa44f53 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllFirstResultVsRownumFilteringTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllFirstResultVsRownumFilteringTest.java
@@ -77,7 +77,7 @@
}
@Override
public void startTest() {
- ((OraclePlatform)getSession().getPlatform()).setShouldUseRownumFiltering(false);
+ getSession().getPlatform().setShouldUseRownumFiltering(false);
}
/**
@@ -85,7 +85,7 @@
*/
@Override
public void endTest() {
- ((OraclePlatform)getSession().getPlatform()).setShouldUseRownumFiltering(true);
+ getSession().getPlatform().setShouldUseRownumFiltering(true);
}
};
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllMaxRowsFirstResultVsRownumFilteringTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllMaxRowsFirstResultVsRownumFilteringTest.java
index 4e69a70..2f42507 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllMaxRowsFirstResultVsRownumFilteringTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllMaxRowsFirstResultVsRownumFilteringTest.java
@@ -77,7 +77,7 @@
}
@Override
public void startTest() {
- ((OraclePlatform)getSession().getPlatform()).setShouldUseRownumFiltering(false);
+ getSession().getPlatform().setShouldUseRownumFiltering(false);
}
/**
@@ -85,7 +85,7 @@
*/
@Override
public void endTest() {
- ((OraclePlatform)getSession().getPlatform()).setShouldUseRownumFiltering(true);
+ getSession().getPlatform().setShouldUseRownumFiltering(true);
}
};
test.setName("ReadAllMaxRowsFirstResultTest");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllMaxRowsVsRownumFilteringTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllMaxRowsVsRownumFilteringTest.java
index 5401edf..9bfa200 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllMaxRowsVsRownumFilteringTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/performance/reading/ReadAllMaxRowsVsRownumFilteringTest.java
@@ -74,7 +74,7 @@
}
@Override
public void startTest() {
- ((OraclePlatform)getSession().getPlatform()).setShouldUseRownumFiltering(false);
+ getSession().getPlatform().setShouldUseRownumFiltering(false);
}
/**
@@ -82,7 +82,7 @@
*/
@Override
public void endTest() {
- ((OraclePlatform)getSession().getPlatform()).setShouldUseRownumFiltering(true);
+ getSession().getPlatform().setShouldUseRownumFiltering(true);
}
};
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/plsql/PLSQLTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/plsql/PLSQLTest.java
index 6f40332..02ebf23 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/plsql/PLSQLTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/plsql/PLSQLTest.java
@@ -84,8 +84,8 @@
Object queryValue = queryRecord.get(field);
if (value instanceof Number) {
// Avoid Java number type in-equality.
- value = ((Number)value).toString();
- queryValue = ((Number)queryValue).toString();
+ value = value.toString();
+ queryValue = queryValue.toString();
}
if (!value.equals(queryValue)) {
throwError("Results do not match: " + queryValue + " expected: " + value);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/ConformResultsWithPrimaryKeyExpressionTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/ConformResultsWithPrimaryKeyExpressionTest.java
index 45d7997..010949c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/ConformResultsWithPrimaryKeyExpressionTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/ConformResultsWithPrimaryKeyExpressionTest.java
@@ -104,10 +104,10 @@
exactPrimaryKeyExpression = emp.get("id").equal("" + selectionObject.getId());
}
if (shouldCheckCacheByExactPrimaryKey()) {
- ((ReadObjectQuery)conformedQuery).setSelectionCriteria(exactPrimaryKeyExpression);
+ conformedQuery.setSelectionCriteria(exactPrimaryKeyExpression);
} else {
Expression inexactPrimaryKeyExpression = exactPrimaryKeyExpression.and(emp.get("firstName").equal(selectionObject.getFirstName()));
- ((ReadObjectQuery)conformedQuery).setSelectionCriteria(inexactPrimaryKeyExpression);
+ conformedQuery.setSelectionCriteria(inexactPrimaryKeyExpression);
}
conformedQuery.conformResultsInUnitOfWork();
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/ObjectLevelReadQueryTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/ObjectLevelReadQueryTest.java
index 8f4ea55..9697fef 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/ObjectLevelReadQueryTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/ObjectLevelReadQueryTest.java
@@ -183,7 +183,7 @@
while(execute) {
try {
isCustomQueryUsed.set(query, Boolean.TRUE);
- isCustomQueryUsed.set(query, (Boolean)null);
+ isCustomQueryUsed.set(query, null);
} catch (IllegalArgumentException | IllegalAccessException e) {
log.logThrowable(WARNING, e);
execute = false;
@@ -220,7 +220,7 @@
protected DatabaseQuery callCheckForCustomQueryMethod(final Object instance, final Method method) throws Throwable {
DatabaseQuery databaseQuery;
try {
- databaseQuery = (DatabaseQuery)method.invoke(instance, session, (AbstractRecord)null);
+ databaseQuery = (DatabaseQuery)method.invoke(instance, session, null);
} catch (InvocationTargetException e) {
if (e.getTargetException() instanceof NullPointerException) {
log.log(WARNING, FAIL_NPE);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QueryFrameworkTestSuite.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QueryFrameworkTestSuite.java
index 6cd1d00..e15d557 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QueryFrameworkTestSuite.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/queries/QueryFrameworkTestSuite.java
@@ -316,14 +316,14 @@
ReadAllQuery query = new ReadAllQuery(Employee.class);
query.setIsReadOnly(true);
List result = (List) uow.executeQuery(query);
- if (((UnitOfWorkImpl)uow).isObjectRegistered(result.get(0))) {
+ if (uow.isObjectRegistered(result.get(0))) {
throwError("Read-only result was registered.");
}
// Test read objects.
ReadObjectQuery objectQuery = new ReadObjectQuery(result.get(0));
objectQuery.setIsReadOnly(true);
Employee employee = (Employee)uow.executeQuery(objectQuery);
- if (((UnitOfWorkImpl)uow).isObjectRegistered(employee)) {
+ if (uow.isObjectRegistered(employee)) {
throwError("Read-only result was registered.");
}
if (employee != result.get(0)) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/readonly/ReadOnlyClassAccessingTestCase.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/readonly/ReadOnlyClassAccessingTestCase.java
index 29671c9..0df9454 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/readonly/ReadOnlyClassAccessingTestCase.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/readonly/ReadOnlyClassAccessingTestCase.java
@@ -90,7 +90,7 @@
protected void test() {
// Test acquiring a unit of work.
UnitOfWork uow1 = getSession().acquireUnitOfWork();
- if (!((UnitOfWorkImpl)uow1).getReadOnlyClasses().isEmpty()) {
+ if (!uow1.getReadOnlyClasses().isEmpty()) {
throw new TestErrorException(" When acquiring a UnitOfWork from a Session, the read-only classes where not empty as expected.");
}
uow1.release();
@@ -102,7 +102,7 @@
UnitOfWork uow2 = getSession().acquireUnitOfWork();
uow2.removeAllReadOnlyClasses();
uow2.addReadOnlyClasses(classes);
- if (!areEqual(((UnitOfWorkImpl)uow2).getReadOnlyClasses(), classes)) {
+ if (!areEqual(uow2.getReadOnlyClasses(), classes)) {
throw new TestErrorException("When acquiring a UnitOfWork from a Session, the read-only classes specified did not get set in the UnitOfWork;");
}
@@ -128,7 +128,7 @@
// Test the removeAll.
uow2.removeAllReadOnlyClasses();
- if ((uow2.isClassReadOnly(Country.class)) || (!((UnitOfWorkImpl)uow2).getReadOnlyClasses().isEmpty())) {
+ if ((uow2.isClassReadOnly(Country.class)) || (!uow2.getReadOnlyClasses().isEmpty())) {
throw new TestErrorException("Did not remove all the read-only classes from a UnitOfWork properly");
}
@@ -137,7 +137,7 @@
uow2.registerObject(new Address());
uow2.removeAllReadOnlyClasses();
uow2.addReadOnlyClasses(classes);
- if (areEqual(((UnitOfWorkImpl)uow2).getReadOnlyClasses(), classes)) {
+ if (areEqual(uow2.getReadOnlyClasses(), classes)) {
throw new TestErrorException("Shouldn't be able to change the readOnlyClasses of a UnitOfWork after an object was registered.");
}
} catch (org.eclipse.persistence.exceptions.ValidationException ex) {
@@ -152,7 +152,7 @@
someClasses.addElement(Address.class);
getSession().getProject().setDefaultReadOnlyClasses(someClasses);
UnitOfWork uow3 = getSession().acquireUnitOfWork();
- if (!areEqual(((UnitOfWorkImpl)uow3).getReadOnlyClasses(), someClasses)) {
+ if (!areEqual(uow3.getReadOnlyClasses(), someClasses)) {
throw new TestErrorException("The default read-only classes were not set properly when a UnitOfWork was aquired");
}
// Nested units of work should not be able to reduce the set of read-only classes.
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/remote/RemoteConnectionExceptionsTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/remote/RemoteConnectionExceptionsTest.java
index 27ccca5..3027693 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/remote/RemoteConnectionExceptionsTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/remote/RemoteConnectionExceptionsTest.java
@@ -164,7 +164,7 @@
if (ok) {
ok = TestException.class.isInstance(exception);
if (ok) {
- ok = ((TestException)exception).getMessage().endsWith(generator.getMessage());
+ ok = exception.getMessage().endsWith(generator.getMessage());
}
}
} else {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/returning/model/AdapterWithReturnObjectControl.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/returning/model/AdapterWithReturnObjectControl.java
index 97afde4..35b5f3b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/returning/model/AdapterWithReturnObjectControl.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/returning/model/AdapterWithReturnObjectControl.java
@@ -90,7 +90,7 @@
mapping.writeFromObjectIntoRow(object2, (DatabaseRecord)row, (AbstractSession)session, writeType);
}
} else if (aggregate1 != null && aggregate2 != null && aggregate1.getClass().equals(aggregate2.getClass())) {
- ClassDescriptor desc = ((AggregateObjectMapping)mapping).getReferenceDescriptor();
+ ClassDescriptor desc = mapping.getReferenceDescriptor();
getChange(row, session, aggregate1, aggregate2, desc, useUOW, writeType);
} else {
mapping.writeFromObjectIntoRow(object2, (DatabaseRecord)row, (AbstractSession)session, writeType);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/tableswithspacesmodel/EmployeeWithSpacesDeleteTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/tableswithspacesmodel/EmployeeWithSpacesDeleteTest.java
index eb54917..bd19f33 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/tableswithspacesmodel/EmployeeWithSpacesDeleteTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/tableswithspacesmodel/EmployeeWithSpacesDeleteTest.java
@@ -41,8 +41,8 @@
public static void deleteDependencies(org.eclipse.persistence.sessions.Session session, Employee employee) {
// CR2114 - following line modified; employee.getClass() passed as argument
String appendString = ((AbstractSession)session).getPlatform(employee.getClass()).getTableQualifier();
- String startQuoteChar = ((DatasourcePlatform)((AbstractSession)session).getPlatform(employee.getClass())).getStartDelimiter();
- String endQuoteChar = ((DatasourcePlatform)((AbstractSession)session).getPlatform(employee.getClass())).getEndDelimiter();
+ String startQuoteChar = ((AbstractSession)session).getPlatform(employee.getClass()).getStartDelimiter();
+ String endQuoteChar = ((AbstractSession)session).getPlatform(employee.getClass()).getEndDelimiter();
if (appendString.length() != 0)
appendString = appendString + ".";
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/tableswithspacesmodel/ProjectWithSpacesDeleteTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/tableswithspacesmodel/ProjectWithSpacesDeleteTest.java
index dc4c6c0..626c356 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/tableswithspacesmodel/ProjectWithSpacesDeleteTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/tableswithspacesmodel/ProjectWithSpacesDeleteTest.java
@@ -48,8 +48,8 @@
if (appendString.length() != 0) {
appendString = appendString + ".";
}
- String startQuoteChar = ((DatasourcePlatform)getAbstractSession().getPlatform(org.eclipse.persistence.testing.models.employee.domain.Project.class)).getStartDelimiter();
- String endQuoteChar = ((DatasourcePlatform)getAbstractSession().getPlatform(org.eclipse.persistence.testing.models.employee.domain.Project.class)).getEndDelimiter();
+ String startQuoteChar = getAbstractSession().getPlatform(org.eclipse.persistence.testing.models.employee.domain.Project.class).getStartDelimiter();
+ String endQuoteChar = getAbstractSession().getPlatform(org.eclipse.persistence.testing.models.employee.domain.Project.class).getEndDelimiter();
// Must drop references first to appease constraints.
Session session = getAbstractSession().getSessionForClass(org.eclipse.persistence.testing.models.employee.domain.Project.class);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/CLOBTester.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/CLOBTester.java
index a14ea4b..e1320a8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/CLOBTester.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/CLOBTester.java
@@ -149,7 +149,7 @@
super.verify(testCase);
} catch (TestErrorException verifyFailedException) {
// Database bridges which do not support long literal values
- if ((caughtException != null) && (testCase.getSession().getPlatform().isOracle() && (((java.sql.SQLException)((DatabaseException)caughtException).getInternalException()).getErrorCode() == 1704))) {
+ if ((caughtException != null) && (testCase.getSession().getPlatform().isOracle() && (((java.sql.SQLException) caughtException.getInternalException()).getErrorCode() == 1704))) {
throw new TestWarningException("CLOB Write failed. " + caughtException.toString() + "\n Turn on String Binding and re-run test");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/StringTester.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/StringTester.java
index 920516c..06eaa78 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/StringTester.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/types/StringTester.java
@@ -163,7 +163,7 @@
super.verify(testCase);
} catch (TestErrorException verifyFailedException) {
// Char fields always are trimmed (by us) this is an error if they are not
- if (((StringTester)testCase.getObjectFromDatabase()) != null) {
+ if (testCase.getObjectFromDatabase() != null) {
String fixed = ((StringTester)testCase.getObjectFromDatabase()).getFixedString();
if ((fixed != null) && (fixed.length() > 0) && (fixed.charAt(fixed.length() - 1) == ' ')) {
if (fixed.equals(" ")) {// Stupid drivers make "" -> " "
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/AttributeNameNotSpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/AttributeNameNotSpecifiedTest.java
index ea5ca02..ec139b4 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/AttributeNameNotSpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/AttributeNameNotSpecifiedTest.java
@@ -35,7 +35,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.attributeNameNotSpecified();
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -43,7 +43,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ClassIndicatorFieldNotFoundTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ClassIndicatorFieldNotFoundTest.java
index afdb4c1..7534bbb 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ClassIndicatorFieldNotFoundTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ClassIndicatorFieldNotFoundTest.java
@@ -37,7 +37,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.classIndicatorFieldNotFound(null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -45,7 +45,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/CloseConnAfterDatabaseSessionTxnTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/CloseConnAfterDatabaseSessionTxnTest.java
index edcb828..9da1690 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/CloseConnAfterDatabaseSessionTxnTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/CloseConnAfterDatabaseSessionTxnTest.java
@@ -38,7 +38,7 @@
@Override
public void setup() {
org.eclipse.persistence.sessions.Project project = new org.eclipse.persistence.testing.models.employee.relational.EmployeeProject();
- DatasourceLogin clonedLogin = (DatasourceLogin)((org.eclipse.persistence.sessions.DatabaseSession)getSession()).getProject().getDatasourceLogin().clone();
+ DatasourceLogin clonedLogin = (DatasourceLogin) getSession().getProject().getDatasourceLogin().clone();
project.setLogin(clonedLogin);
clonedLogin.useExternalConnectionPooling();
session=project.createDatabaseSession();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DescriptorForInterfaceIsMissingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DescriptorForInterfaceIsMissingTest.java
index 9737f56..ee4b0e6 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DescriptorForInterfaceIsMissingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DescriptorForInterfaceIsMissingTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.descriptorForInterfaceIsMissing(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Project.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Project.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Project.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Project.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DescriptorIsMissingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DescriptorIsMissingTest.java
index 752af33..d2de55b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DescriptorIsMissingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DescriptorIsMissingTest.java
@@ -38,7 +38,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.descriptorIsMissing(null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.insurance.Address.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.insurance.Address.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -46,7 +46,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.insurance.Address.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.insurance.Address.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DirectFieldNameNotSetTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DirectFieldNameNotSetTest.java
index e642e5a..75e38a8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DirectFieldNameNotSetTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/DirectFieldNameNotSetTest.java
@@ -37,7 +37,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.directFieldNameNotSet(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -45,7 +45,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ForeignKeysDefinedIncorrectlyTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ForeignKeysDefinedIncorrectlyTest.java
index b78cd22..197ab21 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ForeignKeysDefinedIncorrectlyTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ForeignKeysDefinedIncorrectlyTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.foreignKeysDefinedIncorrectly(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/GetMethodReturnTypeNotValidTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/GetMethodReturnTypeNotValidTest.java
index 868844e..3f2ce33 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/GetMethodReturnTypeNotValidTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/GetMethodReturnTypeNotValidTest.java
@@ -72,7 +72,7 @@
idMapping.setFieldName("EMPLOYEE.EMP_ID");
idMapping.setGetMethodName("getId");
idMapping.setSetMethodName("setId");
- ((MethodAttributeAccessor)idMapping.getAttributeAccessor()).initializeAttributes(PersonWithValueHolder.class);
+ idMapping.getAttributeAccessor().initializeAttributes(PersonWithValueHolder.class);
descriptor.addMapping(idMapping);
OneToManyMapping phoneNumbersMapping = new OneToManyMapping();
@@ -83,7 +83,7 @@
phoneNumbersMapping.setSetMethodName("setPhones");
phoneNumbersMapping.setGetMethodName("getPhones");
phoneNumbersMapping.addTargetForeignKeyFieldName("PHONE.EMP_ID", "EMPLOYEE.EMP_ID");
- ((MethodAttributeAccessor)phoneNumbersMapping.getAttributeAccessor()).initializeAttributes(PersonWithValueHolder.class);
+ phoneNumbersMapping.getAttributeAccessor().initializeAttributes(PersonWithValueHolder.class);
descriptor.addMapping(phoneNumbersMapping);
return descriptor;
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalAccessWhileGettingValueThruInstanceVariableAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalAccessWhileGettingValueThruInstanceVariableAccessorTest.java
index 3b0dea7..d346637 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalAccessWhileGettingValueThruInstanceVariableAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalAccessWhileGettingValueThruInstanceVariableAccessorTest.java
@@ -60,7 +60,7 @@
DatabaseMapping dMapping = descriptor().getMappingForAttributeName("illegalAccess");
// DatabaseMapping idMapping = descriptor().getMappingForAttributeName("id");
//InstanceVariableAttributeAccessor MethodAttributeAccessor
- ((MethodAttributeAccessor)dMapping.getAttributeAccessor()).initializeAttributes(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
+ dMapping.getAttributeAccessor().initializeAttributes(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
// ((InstanceVariableAttributeAccessor)dMapping.getAttributeAccessor()).initializeAttributes(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
address = (String)dMapping.getAttributeValueFromObject(person);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileGettingValueThruInstanceVariableAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileGettingValueThruInstanceVariableAccessorTest.java
index 05d8a33..0807ef5 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileGettingValueThruInstanceVariableAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileGettingValueThruInstanceVariableAccessorTest.java
@@ -42,7 +42,7 @@
expectedException = DescriptorException.illegalArgumentWhileGettingValueThruInstanceVariableAccessor(null, null, null, null);
getAbstractSession().beginTransaction();
getSession().getIdentityMapAccessor().initializeAllIdentityMaps();
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -50,7 +50,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
@@ -70,14 +70,14 @@
getSession().getIntegrityChecker().dontCatchExceptions();
((DatabaseSession)getSession()).addDescriptor(descriptor());
- UnitOfWork uow = ((DatabaseSession)getSession()).acquireUnitOfWork();
+ UnitOfWork uow = getSession().acquireUnitOfWork();
uow.registerObject(person);
uow.commit();
DatabaseMapping dMapping = descriptor().getMappingForAttributeName("p_name");
DatabaseMapping idMapping = descriptor().getMappingForAttributeName("p_id");
- ((InstanceVariableAttributeAccessor)dMapping.getAttributeAccessor()).initializeAttributes(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
- ((InstanceVariableAttributeAccessor)dMapping.getAttributeAccessor()).initializeAttributes(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
+ dMapping.getAttributeAccessor().initializeAttributes(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
+ dMapping.getAttributeAccessor().initializeAttributes(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
dMapping.getAttributeValueFromObject(address);
} catch (EclipseLinkException exception) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileGettingValueThruMethodAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileGettingValueThruMethodAccessorTest.java
index 60686cf..f7a2a1d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileGettingValueThruMethodAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileGettingValueThruMethodAccessorTest.java
@@ -41,7 +41,7 @@
expectedException = DescriptorException.illegalArgumentWhileGettingValueThruMethodAccessor("getName", "Person", null);
getAbstractSession().beginTransaction();
getSession().getIdentityMapAccessor().initializeAllIdentityMaps();
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.tests.validation.PersonMethodAccess.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.tests.validation.PersonMethodAccess.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -49,7 +49,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.PersonMethodAccess.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.PersonMethodAccess.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
@@ -70,7 +70,7 @@
// ((DatabaseSession) getSession()).login();
- UnitOfWork uow = ((DatabaseSession)getSession()).acquireUnitOfWork();
+ UnitOfWork uow = getSession().acquireUnitOfWork();
uow.registerObject(person);
uow.commit();
@@ -114,7 +114,7 @@
p_idMapping.setGetMethodName("getId");
p_idMapping.setSetMethodName("setId");
- ((MethodAttributeAccessor)p_idMapping.getAttributeAccessor()).initializeAttributes(PersonMethodAccess.class);
+ p_idMapping.getAttributeAccessor().initializeAttributes(PersonMethodAccess.class);
descriptor.addMapping(p_idMapping);
@@ -125,7 +125,7 @@
p_nameMapping.setGetMethodName("getName");
p_nameMapping.setSetMethodName("setName");
- ((MethodAttributeAccessor)p_nameMapping.getAttributeAccessor()).initializeAttributes(PersonMethodAccess.class);
+ p_nameMapping.getAttributeAccessor().initializeAttributes(PersonMethodAccess.class);
descriptor.addMapping(p_nameMapping);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileSettingValueThruInstanceVariableAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileSettingValueThruInstanceVariableAccessorTest.java
index cd039a0..0248878 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileSettingValueThruInstanceVariableAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileSettingValueThruInstanceVariableAccessorTest.java
@@ -42,7 +42,7 @@
expectedException = DescriptorException.illegalArgumentWhileSettingValueThruInstanceVariableAccessor(null, null, null, null);
getAbstractSession().beginTransaction();
getSession().getIdentityMapAccessor().initializeAllIdentityMaps();
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -50,7 +50,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.PersonInstanceAccess.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
@@ -70,16 +70,16 @@
getSession().getIntegrityChecker().dontCatchExceptions();
((DatabaseSession)getSession()).addDescriptor(descriptor());
//((DatabaseSession) getSession()).login();
- UnitOfWork uow = ((DatabaseSession)getSession()).acquireUnitOfWork();
+ UnitOfWork uow = getSession().acquireUnitOfWork();
uow.registerObject(person);
uow.commit();
DatabaseMapping dMapping = descriptor().getMappingForAttributeName("p_name");
DatabaseMapping idMapping = descriptor().getMappingForAttributeName("p_id");
- ((InstanceVariableAttributeAccessor)dMapping.getAttributeAccessor()).initializeAttributes(PersonInstanceAccess.class);
- ((InstanceVariableAttributeAccessor)idMapping.getAttributeAccessor()).initializeAttributes(PersonInstanceAccess.class);
+ dMapping.getAttributeAccessor().initializeAttributes(PersonInstanceAccess.class);
+ idMapping.getAttributeAccessor().initializeAttributes(PersonInstanceAccess.class);
//((InstanceVariableAttributeAccessor)idMapping.getAttributeAccessor()).setGetMethodName("Vesna");
- ((InstanceVariableAttributeAccessor)dMapping.getAttributeAccessor()).setAttributeValueInObject(address, dMapping.getAttributeValueFromObject(person));
+ dMapping.getAttributeAccessor().setAttributeValueInObject(address, dMapping.getAttributeValueFromObject(person));
//((DatabaseSession) getSession()).logout();
} catch (EclipseLinkException exception) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileSettingValueThruMethodAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileSettingValueThruMethodAccessorTest.java
index 4af0335..c07431d 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileSettingValueThruMethodAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IllegalArgumentWhileSettingValueThruMethodAccessorTest.java
@@ -41,7 +41,7 @@
expectedException = DescriptorException.illegalArgumentWhileSettingValueThruMethodAccessor("setName", "Person", null);
getAbstractSession().beginTransaction();
getSession().getIdentityMapAccessor().initializeAllIdentityMaps();
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.tests.validation.PersonMethodAccess.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.tests.validation.PersonMethodAccess.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -49,7 +49,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.PersonMethodAccess.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.PersonMethodAccess.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
@@ -68,16 +68,16 @@
getSession().getIntegrityChecker().dontCatchExceptions();
((DatabaseSession)getSession()).addDescriptor(descriptor());
// ((DatabaseSession) getSession()).login();
- UnitOfWork uow = ((DatabaseSession)getSession()).acquireUnitOfWork();
+ UnitOfWork uow = getSession().acquireUnitOfWork();
uow.registerObject(person);
uow.commit();
DatabaseMapping dMapping = descriptor().getMappingForAttributeName("p_name");
DatabaseMapping idMapping = descriptor().getMappingForAttributeName("p_id");
- ((MethodAttributeAccessor)dMapping.getAttributeAccessor()).initializeAttributes(PersonMethodAccess.class);
- ((MethodAttributeAccessor)idMapping.getAttributeAccessor()).initializeAttributes(PersonMethodAccess.class);
+ dMapping.getAttributeAccessor().initializeAttributes(PersonMethodAccess.class);
+ idMapping.getAttributeAccessor().initializeAttributes(PersonMethodAccess.class);
((MethodAttributeAccessor)idMapping.getAttributeAccessor()).setGetMethodName("Vesna");
- ((MethodAttributeAccessor)dMapping.getAttributeAccessor()).setAttributeValueInObject(address, dMapping.getAttributeValueFromObject(person));
+ dMapping.getAttributeAccessor().setAttributeValueInObject(address, dMapping.getAttributeValueFromObject(person));
// ((DatabaseSession) getSession()).logout();
} catch (EclipseLinkException exception) {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IncorrectCollectionPolicyTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IncorrectCollectionPolicyTest.java
index 5066ffe..04e67fd 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IncorrectCollectionPolicyTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/IncorrectCollectionPolicyTest.java
@@ -45,7 +45,7 @@
expectedException = DescriptorException.incorrectCollectionPolicy(null, null, null);
- ClassDescriptor descriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.mapping.Employee.class);
+ ClassDescriptor descriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.mapping.Employee.class);
//incorrectCollectionPolicy is thrown in CollectionMapping
mapping = (OneToManyMapping)descriptor.getMappingForAttributeName("managedEmployees");
//This causes the exception. managedEmployees is a vector while MapContainerPolicy is used.
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidIdentityMapTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidIdentityMapTest.java
index 81ff27e..bb6761c 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidIdentityMapTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidIdentityMapTest.java
@@ -42,7 +42,7 @@
expectedException = DescriptorException.invalidIdentityMap(null, null); //causes 7012 error
- descriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ descriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIdentityMapClass = descriptor.getIdentityMapClass();
//the following causes the correct error to occure.
descriptor.setIdentityMapClass(null);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidIndirectionContainerClassTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidIndirectionContainerClassTest.java
index 287eec7..a9f2691 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidIndirectionContainerClassTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidIndirectionContainerClassTest.java
@@ -46,7 +46,7 @@
expectedException = DescriptorException.invalidIndirectionContainerClass(new ContainerIndirectionPolicy(), null);
- descriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ descriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
mapping = (OneToManyMapping)descriptor.getMappingForAttributeName("phoneNumbers");
orgIndirectionPolicy = mapping.getIndirectionPolicy();
//An invalid indirection container class
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_extractPrimaryKeyForReferenceObject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_extractPrimaryKeyForReferenceObject.java
index 610e15e..54e79ab 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_extractPrimaryKeyForReferenceObject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_extractPrimaryKeyForReferenceObject.java
@@ -49,7 +49,7 @@
expectedException = DescriptorException.invalidUseOfTransparentIndirection(null);
- descriptor = ((DatabaseSession)getSession()).getDescriptor(Employee.class);
+ descriptor = getSession().getDescriptor(Employee.class);
//extractPrimaryKeyForReferenceObject is used in OneToOneMapping
mapping = (OneToOneMapping)descriptor.getMappingForAttributeName("address");
orgIndirectionPolicy = mapping.getIndirectionPolicy();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_nullValueFromRow.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_nullValueFromRow.java
index 57980d5..2521e1f 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_nullValueFromRow.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_nullValueFromRow.java
@@ -46,7 +46,7 @@
employee = (Employee)getSession().readObject(Employee.class);
expectedException = DescriptorException.invalidUseOfTransparentIndirection(null);
- descriptor = ((DatabaseSession)getSession()).getDescriptor(Employee.class);
+ descriptor = getSession().getDescriptor(Employee.class);
//nullValueFromRow is used in OneToOneMapping
mapping = (OneToOneMapping)descriptor.getMappingForAttributeName("address");
orgIndirectionPolicy = mapping.getIndirectionPolicy();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_valueFromMethod.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_valueFromMethod.java
index 925c55e..e7d4dc8 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_valueFromMethod.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/InvalidUseOfTransparentIndirectionTest_valueFromMethod.java
@@ -47,7 +47,7 @@
expectedException = DescriptorException.invalidUseOfTransparentIndirection(null);
- descriptor = ((DatabaseSession)getSession()).getDescriptor(Employee.class);
+ descriptor = getSession().getDescriptor(Employee.class);
//valueFromMethod is used in TransformationMapping
mapping = (TransformationMapping)descriptor.getMappingForAttributeName("normalHours");
orgIndirectionPolicy = mapping.getIndirectionPolicy();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MappingMustBeReadOnlyWhenStoredInCacheTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MappingMustBeReadOnlyWhenStoredInCacheTest.java
index ec5ae1c..b4f0905 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MappingMustBeReadOnlyWhenStoredInCacheTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MappingMustBeReadOnlyWhenStoredInCacheTest.java
@@ -42,7 +42,7 @@
@Override
protected void setup() {
- descriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ descriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
mapping = (DirectToFieldMapping)descriptor.getMappingForAttributeName("firstName");
orgReadOnly = mapping.isReadOnly();
mapping.readWrite();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MultipleTablePrimaryKeyMustBeFullyQualifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MultipleTablePrimaryKeyMustBeFullyQualifiedTest.java
index b55d3e1..4429bbc 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MultipleTablePrimaryKeyMustBeFullyQualifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MultipleTablePrimaryKeyMustBeFullyQualifiedTest.java
@@ -35,7 +35,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.multipleTablePrimaryKeyMustBeFullyQualified(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -43,7 +43,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MultipleWriteMappingsForFieldTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MultipleWriteMappingsForFieldTest.java
index 5ec1f63..1e7a59b 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MultipleWriteMappingsForFieldTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/MultipleWriteMappingsForFieldTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.multipleWriteMappingsForField(null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoAttributeTransformationMethodTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoAttributeTransformationMethodTest.java
index dfc5b0c..67ca3ba 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoAttributeTransformationMethodTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoAttributeTransformationMethodTest.java
@@ -38,7 +38,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noAttributeTransformationMethod(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
getSession().setIntegrityChecker(new IntegrityChecker());
getSession().getIntegrityChecker().dontCatchExceptions();
@@ -49,7 +49,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
if (orgDescriptor != null) {
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoFieldNameForMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoFieldNameForMappingTest.java
index a7af691..300553a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoFieldNameForMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoFieldNameForMappingTest.java
@@ -38,7 +38,7 @@
expectedException = DescriptorException.attributeNameNotSpecified();
expectedException.setErrorCode(50); //work around to avoid 7012 error
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
getSession().setIntegrityChecker(new IntegrityChecker());
getSession().getIntegrityChecker().dontCatchExceptions();
@@ -49,7 +49,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null) {
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoForeighKeysAreSpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoForeighKeysAreSpecifiedTest.java
index 94ced8b..f3288fc 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoForeighKeysAreSpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoForeighKeysAreSpecifiedTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noForeignKeysAreSpecified(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoMappingForPrimaryKeyTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoMappingForPrimaryKeyTest.java
index 66b268e..f1c7aea 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoMappingForPrimaryKeyTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoMappingForPrimaryKeyTest.java
@@ -35,7 +35,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noMappingForPrimaryKey(null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -43,7 +43,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoReferenceKeyIsSpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoReferenceKeyIsSpecifiedTest.java
index 023416c..dc0a0b7 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoReferenceKeyIsSpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoReferenceKeyIsSpecifiedTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noReferenceKeyIsSpecified(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoRelationTableTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoRelationTableTest.java
index 57a07b6..6f379ce 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoRelationTableTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoRelationTableTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noRelationTable(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSourceRelationKeysSpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSourceRelationKeysSpecifiedTest.java
index b440211..7dd4824 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSourceRelationKeysSpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSourceRelationKeysSpecifiedTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noSourceRelationKeysSpecified(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSubClassMatchTest_AggregateObject.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSubClassMatchTest_AggregateObject.java
index 1127de6..da24987 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSubClassMatchTest_AggregateObject.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSubClassMatchTest_AggregateObject.java
@@ -49,8 +49,8 @@
Employee employee = new Employee();
- ClassDescriptor descriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
- ClassDescriptor projDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
+ ClassDescriptor descriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ ClassDescriptor projDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
mapping = (org.eclipse.persistence.mappings.AggregateObjectMapping)descriptor.getMappingForAttributeName("period");
orgInheritancePolicy = mapping.getReferenceDescriptor().getInheritancePolicyOrNull();
org.eclipse.persistence.internal.sessions.ObjectChangeSet changeSet = new ObjectChangeSet(new Vector(), projDescriptor, employee, new org.eclipse.persistence.internal.sessions.UnitOfWorkChangeSet(), true);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodOnInitializingAttributeMethodTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodOnInitializingAttributeMethodTest.java
index 5824ff4..e095b38 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodOnInitializingAttributeMethodTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodOnInitializingAttributeMethodTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noSuchMethodOnInitializingAttributeMethod(null, null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileConvertingToMethodTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileConvertingToMethodTest.java
index 920a163..2b5200e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileConvertingToMethodTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileConvertingToMethodTest.java
@@ -37,7 +37,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noSuchMethodWhileConvertingToMethod(null, null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
getSession().setIntegrityChecker(new IntegrityChecker());
getSession().getIntegrityChecker().dontCatchExceptions();
@@ -48,7 +48,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
if (orgDescriptor != null) {
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessorTest.java
index 4b190de..ca000f9 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessorTest.java
@@ -35,7 +35,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noSuchMethodWhileInitializingAttributesInMethodAccessor(null, null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -43,7 +43,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessor_GetTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessor_GetTest.java
index edb6a19..d4cc445 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessor_GetTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessor_GetTest.java
@@ -35,7 +35,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noSuchMethodWhileInitializingAttributesInMethodAccessor(null, null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -43,7 +43,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessor_SetTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessor_SetTest.java
index c7ea718..c2f09fa 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessor_SetTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoSuchMethodWhileInitializingAttributesInMethodAccessor_SetTest.java
@@ -35,7 +35,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noSuchMethodWhileInitializingAttributesInMethodAccessor(null, null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -43,7 +43,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoTargetForeignKeysSpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoTargetForeignKeysSpecifiedTest.java
index 094509e..30da17a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoTargetForeignKeysSpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoTargetForeignKeysSpecifiedTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noTargetForeignKeysSpecified(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoTargetRelationKeysSpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoTargetRelationKeysSpecifiedTest.java
index 902b481..78970b1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoTargetRelationKeysSpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NoTargetRelationKeysSpecifiedTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.noTargetRelationKeysSpecified(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NullPointerWhileSettingValueThruInstanceVariableAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NullPointerWhileSettingValueThruInstanceVariableAccessorTest.java
index 301f892..78ad2fd 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NullPointerWhileSettingValueThruInstanceVariableAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/NullPointerWhileSettingValueThruInstanceVariableAccessorTest.java
@@ -36,7 +36,7 @@
protected void setup() {
expectedException = DescriptorException.nullPointerWhileSettingValueThruInstanceVariableAccessor(null, null, null);
- ClassDescriptor descriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ ClassDescriptor descriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
mapping = descriptor.getMappingForAttributeName("salary");
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParameterAndMappingWithIndirectionMismatchTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParameterAndMappingWithIndirectionMismatchTest.java
index e41f9f1..5240580 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParameterAndMappingWithIndirectionMismatchTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParameterAndMappingWithIndirectionMismatchTest.java
@@ -74,7 +74,7 @@
idMapping.setFieldName("EMPLOYEE.EMP_ID");
idMapping.setGetMethodName("getId");
idMapping.setSetMethodName("setId");
- ((MethodAttributeAccessor)idMapping.getAttributeAccessor()).initializeAttributes(PersonWithValueHolder.class);
+ idMapping.getAttributeAccessor().initializeAttributes(PersonWithValueHolder.class);
descriptor.addMapping(idMapping);
OneToOneMapping addressMapping = new OneToOneMapping();
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParameterAndMappingWithTransparentIndirectionMismatchTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParameterAndMappingWithTransparentIndirectionMismatchTest.java
index d3625e9..739ba35 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParameterAndMappingWithTransparentIndirectionMismatchTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParameterAndMappingWithTransparentIndirectionMismatchTest.java
@@ -73,7 +73,7 @@
idMapping.setFieldName("EMPLOYEE.EMP_ID");
idMapping.setGetMethodName("getId");
idMapping.setSetMethodName("setId");
- ((MethodAttributeAccessor)idMapping.getAttributeAccessor()).initializeAttributes(PersonWithValueHolder.class);
+ idMapping.getAttributeAccessor().initializeAttributes(PersonWithValueHolder.class);
descriptor.addMapping(idMapping);
OneToManyMapping phoneNumbersMapping = new OneToManyMapping();
@@ -84,7 +84,7 @@
phoneNumbersMapping.setSetMethodName("setPhones");
phoneNumbersMapping.setGetMethodName("getPhones");
phoneNumbersMapping.addTargetForeignKeyFieldName("PHONE.EMP_ID", "EMPLOYEE.EMP_ID");
- ((MethodAttributeAccessor)phoneNumbersMapping.getAttributeAccessor()).initializeAttributes(PersonWithValueHolder.class);
+ phoneNumbersMapping.getAttributeAccessor().initializeAttributes(PersonWithValueHolder.class);
descriptor.addMapping(phoneNumbersMapping);
return descriptor;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParentClassIsSelfTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParentClassIsSelfTest.java
index d83d7cf..c551df2 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParentClassIsSelfTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParentClassIsSelfTest.java
@@ -35,7 +35,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.parentClassIsSelf(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -43,7 +43,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParentDescriptorNotSpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParentDescriptorNotSpecifiedTest.java
index e060b93..23242df 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParentDescriptorNotSpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ParentDescriptorNotSpecifiedTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.parentDescriptorNotSpecified(null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.LargeProject.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReferenceKeyFieldNotProperlySpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReferenceKeyFieldNotProperlySpecifiedTest.java
index 6765fac..bc2a239 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReferenceKeyFieldNotProperlySpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReferenceKeyFieldNotProperlySpecifiedTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.referenceKeyFieldNotProperlySpecified(null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReferenceTableNotSpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReferenceTableNotSpecifiedTest.java
index 673388e..4c483a1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReferenceTableNotSpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReferenceTableNotSpecifiedTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.referenceTableNotSpecified(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/RelationKeyFieldNotProperlySpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/RelationKeyFieldNotProperlySpecifiedTest.java
index 5e3736f..35c8089 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/RelationKeyFieldNotProperlySpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/RelationKeyFieldNotProperlySpecifiedTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.relationKeyFieldNotProperlySpecified(null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.Employee.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReturnTypeInGetAttributeAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReturnTypeInGetAttributeAccessorTest.java
index c653fff..46b9c03 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReturnTypeInGetAttributeAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ReturnTypeInGetAttributeAccessorTest.java
@@ -37,7 +37,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.returnTypeInGetAttributeAccessor(null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -45,7 +45,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TableNotSpecifiedTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TableNotSpecifiedTest.java
index 3ba0553..6ab5372 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TableNotSpecifiedTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TableNotSpecifiedTest.java
@@ -35,7 +35,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.tableNotSpecified(null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.EmploymentPeriod.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.EmploymentPeriod.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -43,7 +43,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.EmploymentPeriod.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.EmploymentPeriod.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileGettingValueThruMethodAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileGettingValueThruMethodAccessorTest.java
index 19f5b26..4cb8a8a 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileGettingValueThruMethodAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileGettingValueThruMethodAccessorTest.java
@@ -57,7 +57,7 @@
@Override
public void test() {
try {
- ((MethodAttributeAccessor)mapping.getAttributeAccessor()).initializeAttributes(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
+ mapping.getAttributeAccessor().initializeAttributes(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
mapping.getAttributeValueFromObject(person);
} catch (EclipseLinkException exception) {
caughtException = exception;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileInvokingFieldToMethodTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileInvokingFieldToMethodTest.java
index 34d6a22..5e6c4cf 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileInvokingFieldToMethodTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileInvokingFieldToMethodTest.java
@@ -54,7 +54,7 @@
PersonWithValueHolder person = new PersonWithValueHolder();
person.setName("Person");
((DatabaseSession)getSession()).addDescriptor(descriptor());
- UnitOfWork uow = ((DatabaseSession)getSession()).acquireUnitOfWork();
+ UnitOfWork uow = getSession().acquireUnitOfWork();
try {
uow.registerObject(person); //error is thrown at this line, the rest is not needed - Ian
// uow.commit();
@@ -79,7 +79,7 @@
idMapping.setFieldName("EMPLOYEE.EMP_ID");
//idMapping.setGetMethodName("getId");
//idMapping.setSetMethodName("setId");
- ((InstanceVariableAttributeAccessor)idMapping.getAttributeAccessor()).initializeAttributes(PersonWithValueHolder.class);
+ idMapping.getAttributeAccessor().initializeAttributes(PersonWithValueHolder.class);
descriptor.addMapping(idMapping);
TransformationMapping normalHoursMapping = new TransformationMapping();
@@ -87,7 +87,7 @@
normalHoursMapping.setAttributeTransformation("buildNormalHours");
normalHoursMapping.addFieldTransformation("EMPLOYEE.START_TIME", "getStartTime");
normalHoursMapping.addFieldTransformation("EMPLOYEE.END_TIME", "getEndTime");
- ((InstanceVariableAttributeAccessor)idMapping.getAttributeAccessor()).initializeAttributes(PersonWithValueHolder.class);
+ idMapping.getAttributeAccessor().initializeAttributes(PersonWithValueHolder.class);
descriptor.addMapping(normalHoursMapping);
return descriptor;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileSettingValueThruMethodAccessorTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileSettingValueThruMethodAccessorTest.java
index d1430df..526fbf2 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileSettingValueThruMethodAccessorTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/TargetInvocationWhileSettingValueThruMethodAccessorTest.java
@@ -56,7 +56,7 @@
@Override
public void test() {
try {
- ((MethodAttributeAccessor)mapping.getAttributeAccessor()).initializeAttributes(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
+ mapping.getAttributeAccessor().initializeAttributes(org.eclipse.persistence.testing.tests.validation.EmployeeWithProblems.class);
mapping.setAttributeValueInObject(person, "invalid_data");
} catch (EclipseLinkException exception) {
caughtException = exception;
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ValueNotFoundInClassIndicatorMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ValueNotFoundInClassIndicatorMappingTest.java
index c0c6984..6728154 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ValueNotFoundInClassIndicatorMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/ValueNotFoundInClassIndicatorMappingTest.java
@@ -36,7 +36,7 @@
@Override
protected void setup() {
expectedException = DescriptorException.valueNotFoundInClassIndicatorMapping(null, null);
- orgDescriptor = ((DatabaseSession)getSession()).getDescriptor(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
+ orgDescriptor = getSession().getDescriptor(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
orgIntegrityChecker = getSession().getIntegrityChecker();
}
ClassDescriptor orgDescriptor;
@@ -44,7 +44,7 @@
@Override
public void reset() {
- ((DatabaseSession)getSession()).getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
+ getSession().getDescriptors().remove(org.eclipse.persistence.testing.models.employee.domain.SmallProject.class);
if (orgDescriptor != null)
((DatabaseSession)getSession()).addDescriptor(orgDescriptor);
if (orgIntegrityChecker != null)
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/VariableOneToOneMappingIsNotDefinedProperlyTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/VariableOneToOneMappingIsNotDefinedProperlyTest.java
index 5024fbc..123a5dd 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/VariableOneToOneMappingIsNotDefinedProperlyTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/validation/VariableOneToOneMappingIsNotDefinedProperlyTest.java
@@ -62,7 +62,7 @@
@Override
protected void setup() {
- descriptor = ((DatabaseSession)getSession()).getDescriptor(Actor.class);
+ descriptor = getSession().getDescriptor(Actor.class);
mapping = (VariableOneToOneMapping)descriptor.getMappingForAttributeName("program");
sourceField = new DatabaseField("ACTOR.PROGRAM_ID");
@@ -100,7 +100,7 @@
if (testMode == 0) {
mapping.writeFromObjectIntoRow(actor, databaseRow, (AbstractSession)getSession(), WriteType.UNDEFINED); //test one
} else if (testMode == 1) {
- mapping.writeFromObjectIntoRowWithChangeRecord((org.eclipse.persistence.internal.sessions.ChangeRecord)changeRecord, databaseRow, (AbstractSession)getSession(), WriteType.UNDEFINED); //test two
+ mapping.writeFromObjectIntoRowWithChangeRecord(changeRecord, databaseRow, (AbstractSession)getSession(), WriteType.UNDEFINED); //test two
} else if (testMode == 2) {
mapping.writeFromObjectIntoRowForWhereClause(deleteObjectQuery, databaseRow); //test three
} else {
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/CollectionMappingIsMapPolicyTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/CollectionMappingIsMapPolicyTest.java
index e90e426..6b7a748 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/CollectionMappingIsMapPolicyTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/CollectionMappingIsMapPolicyTest.java
@@ -51,9 +51,9 @@
mappingToModify = (DatabaseMapping)mappingsEnum.nextElement();
if (mappingToModify.isForeignReferenceMapping()) {
- if (((ForeignReferenceMapping)mappingToModify).isCollectionMapping()) {
+ if (mappingToModify.isCollectionMapping()) {
CollectionMapping collectionMapping =
- (CollectionMapping)(((ForeignReferenceMapping)mappingToModify));
+ (CollectionMapping) mappingToModify;
collectionMapping.setContainerPolicy(policy);
policy.setKeyName("testMethod");
collectionMapping.getContainerPolicy().setContainerClass(Vector.class);
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLSortedCollectionMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLSortedCollectionMapping.java
index 53a8a37..9f417d1 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLSortedCollectionMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/ProjectXMLSortedCollectionMapping.java
@@ -65,8 +65,8 @@
DatabaseMapping mappingToModify = descriptorToModify.getMappingForAttributeName("projects");
if (mappingToModify.isForeignReferenceMapping()) {
- if (((ForeignReferenceMapping)mappingToModify).isCollectionMapping()) {
- CollectionMapping collectionMapping = (CollectionMapping)(((ForeignReferenceMapping)mappingToModify));
+ if (mappingToModify.isCollectionMapping()) {
+ CollectionMapping collectionMapping = (CollectionMapping) mappingToModify;
collectionMapping.useSortedSetClassName(TreeSet.class.getName(),getComparator().getName());
}
}else{
@@ -91,7 +91,7 @@
CollectionMapping collectionMapping = (CollectionMapping)readBackMapping;
ContainerPolicy containerPolciy = collectionMapping.getContainerPolicy();
if(containerPolciy.isCollectionPolicy()){
- Class conatinerClass = ((SortedCollectionContainerPolicy)containerPolciy).getContainerClass();
+ Class conatinerClass = containerPolciy.getContainerClass();
Class comparatorClass = ((SortedCollectionContainerPolicy)containerPolciy).getComparatorClass();
if(!conatinerClass.equals(TreeSet.class) ){
throw new TestErrorException("The container class read was not equal to the conatiner class set originally, which expected as the java.util.TreeSet class. ");
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/UseCollectionClassOnMappingTest.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/UseCollectionClassOnMappingTest.java
index 7950eaf..ff81c5e 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/UseCollectionClassOnMappingTest.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/UseCollectionClassOnMappingTest.java
@@ -43,9 +43,9 @@
mappingToModify = descriptorToModify.getMappingForAttributeName("projects");
if (mappingToModify.isForeignReferenceMapping()) {
- if (((ForeignReferenceMapping)mappingToModify).isCollectionMapping()) {
+ if (mappingToModify.isCollectionMapping()) {
CollectionMapping collectionMapping =
- (CollectionMapping)(((ForeignReferenceMapping)mappingToModify));
+ (CollectionMapping) mappingToModify;
collectionMapping.getContainerPolicy().setContainerClass(Employee.class);
}
}
diff --git a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/UseTransparentMapOnCollectionMapping.java b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/UseTransparentMapOnCollectionMapping.java
index 0abe752..ce65335 100644
--- a/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/UseTransparentMapOnCollectionMapping.java
+++ b/foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/workbenchintegration/UseTransparentMapOnCollectionMapping.java
@@ -54,9 +54,9 @@
mappingToModify = (DatabaseMapping)mappingsEnum.nextElement();
if (mappingToModify.isForeignReferenceMapping()) {
- if (((ForeignReferenceMapping)mappingToModify).isCollectionMapping()) {
+ if (mappingToModify.isCollectionMapping()) {
CollectionMapping collectionMapping =
- (CollectionMapping)(((ForeignReferenceMapping)mappingToModify));
+ (CollectionMapping) mappingToModify;
collectionMapping.setContainerPolicy(mapPolicy);
mapPolicy.setKeyName("testMethod");
collectionMapping.getContainerPolicy().setContainerClass(Vector.class);
diff --git a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/identitymaps/CacheIdTest.java b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/identitymaps/CacheIdTest.java
index 41f28d0..e2c84d7 100644
--- a/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/identitymaps/CacheIdTest.java
+++ b/foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/identitymaps/CacheIdTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -147,9 +147,9 @@
newCacheId("any"), newCacheId((Object)null));
smaller("many primaryKey - smaller",
- newCacheId("ab", (Object)null), newCacheId("ab", "any"));
+ newCacheId("ab", null), newCacheId("ab", "any"));
greater("many primaryKey - greater",
- newCacheId("bc", "any"), newCacheId("bc", (Object)null));
+ newCacheId("bc", "any"), newCacheId("bc", null));
}
@Test
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIConnectionExceptionsTest.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIConnectionExceptionsTest.java
index b73e763..900ba2d 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIConnectionExceptionsTest.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIConnectionExceptionsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
super(mode, RMIConnection.class);
}
+@Override
protected void setKnownBugs() {
super.setKnownBugs();
if(generator.getMode() == TransporterGenerator.SET_EXCEPTION_INTO_TRANSPORTER) {
@@ -43,6 +44,7 @@
}
}
+@Override
public void setup() throws Exception {
Session session = new DatabaseSessionImpl();
session.setProperty("TransporterGenerator", generator);
@@ -53,6 +55,7 @@
setRemoteConnection(rmiConnection);
}
+@Override
public void reset() throws Exception {
InitialContext initialNamingContext = new InitialContext();
initialNamingContext.unbind(getNameToBind());
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIIIOPRemoteModel.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIIIOPRemoteModel.java
index d77adb6..8e1d0ac 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIIIOPRemoteModel.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIIIOPRemoteModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,6 +63,7 @@
return rmiConnection;
}
+ @Override
public void setup() {
RemoteModel.originalSession = getSession();
RMIServerManagerController.start(buildServerSession());
@@ -74,6 +75,7 @@
getExecutor().setSession(remoteSession);
}
+ @Override
public void addTests() {
super.addTests();
addTest(getExceptionsTestSuite());
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java
index 1b70f36..15292e6 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/RMIRemoteSessionControllerDispatcherForTestingExceptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
*
* @param remoteCommand RemoteCommand The command to be executed on the remote session
*/
+ @Override
public Transporter processCommand(Transporter remoteTransporter) {
return handleByMode();
}
@@ -58,6 +59,7 @@
* Begin a transaction on the database.
*/
+ @Override
public Transporter beginTransaction() {
return handleByMode();
}
@@ -66,6 +68,7 @@
* Begin a transaction on the database.
*/
+ @Override
public Transporter beginEarlyTransaction() {
return handleByMode();
}
@@ -74,6 +77,7 @@
* Remote unit of work after serialization is commited locally.
*/
+ @Override
public Transporter commitRootUnitOfWork(Transporter remoteUnitOfWork) {
return handleByMode();
}
@@ -82,6 +86,7 @@
* Commit a transaction on the database.
*/
+ @Override
public Transporter commitTransaction() {
return handleByMode();
}
@@ -122,6 +127,7 @@
* Used for closing cursored streams across RMI.
*/
+ @Override
public Transporter cursoredStreamClose(Transporter remoteCursoredStreamID) {
return handleByMode();
}
@@ -130,6 +136,7 @@
* Retrieve next page size of objects from the remote cursored stream
*/
+ @Override
public Transporter cursoredStreamNextPage(Transporter remoteCursoredStream, int pageSize) {
return handleByMode();
}
@@ -138,6 +145,7 @@
* Return the cursored stream size
*/
+ @Override
public Transporter cursoredStreamSize(Transporter remoteCursoredStreamOid) {
return handleByMode();
}
@@ -146,6 +154,7 @@
* Returns a remote cursor stub in a transporter
*/
+ @Override
public Transporter cursorSelectObjects(Transporter remoteTransporter) {
return handleByMode();
}
@@ -154,6 +163,7 @@
* A remote query after serialization is executed locally.
*/
+ @Override
public Transporter executeNamedQuery(Transporter nameTransporter, Transporter classTransporter, Transporter argumentsTransporter) {
return handleByMode();
}
@@ -162,6 +172,7 @@
* A remote query after serialization is executed locally.
*/
+ @Override
public Transporter executeQuery(Transporter query) {
return handleByMode();
}
@@ -170,6 +181,7 @@
* Extract descriptor from the session
*/
+ @Override
public Transporter getDescriptor(Transporter theClass) {
return handleByMode();
}
@@ -178,6 +190,7 @@
* Extract descriptor from the session
*/
+ @Override
public Transporter getDescriptorForAlias(Transporter theClass) {
return handleByMode();
}
@@ -187,6 +200,7 @@
*
*/
+ @Override
public Transporter getDefaultReadOnlyClasses() {
return handleByMode();
}
@@ -220,6 +234,7 @@
* Get the associated session login.
*/
+ @Override
public Transporter getLogin() {
return handleByMode();
}
@@ -248,6 +263,7 @@
* INTERNAL: Get the value returned by remote function call
*/
+ @Override
public Transporter getSequenceNumberNamed(Transporter remoteFunctionCall) {
return handleByMode();
}
@@ -273,6 +289,7 @@
return handleByMode();
}
+ @Override
public Transporter initializeIdentityMapsOnServerSession() {
return handleByMode();
}
@@ -281,6 +298,7 @@
* The corresponding original value holder is instantiated.
*/
+ @Override
public Transporter instantiateRemoteValueHolderOnServer(Transporter remoteValueHolder) {
return handleByMode();
}
@@ -341,6 +359,7 @@
* Rollback a transaction on the database.
*/
+ @Override
public Transporter rollbackTransaction() {
return handleByMode();
}
@@ -349,6 +368,7 @@
* Moves the cursor to the given row number in the result set
*/
+ @Override
public Transporter scrollableCursorAbsolute(Transporter remoteScrollableCursorOid, int rows) {
return handleByMode();
}
@@ -357,6 +377,7 @@
* Moves the cursor to the end of the result set, just after the last row.
*/
+ @Override
public Transporter scrollableCursorAfterLast(Transporter remoteScrollableCursorOid) {
return handleByMode();
}
@@ -365,6 +386,7 @@
* Moves the cursor to the front of the result set, just before the first row
*/
+ @Override
public Transporter scrollableCursorBeforeFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -373,6 +395,7 @@
* Used for closing scrollable cursor across RMI.
*/
+ @Override
public Transporter scrollableCursorClose(Transporter remoteScrollableCursorOid) {
return handleByMode();
}
@@ -381,6 +404,7 @@
* Retrieves the current row index number
*/
+ @Override
public Transporter scrollableCursorCurrentIndex(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -389,6 +413,7 @@
* Moves the cursor to the first row in the result set
*/
+ @Override
public Transporter scrollableCursorFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -397,6 +422,7 @@
* Indicates whether the cursor is after the last row in the result set.
*/
+ @Override
public Transporter scrollableCursorIsAfterLast(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -405,6 +431,7 @@
* Indicates whether the cursor is before the first row in the result set.
*/
+ @Override
public Transporter scrollableCursorIsBeforeFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -413,6 +440,7 @@
* Indicates whether the cursor is on the first row of the result set.
*/
+ @Override
public Transporter scrollableCursorIsFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -421,6 +449,7 @@
* Indicates whether the cursor is on the last row of the result set.
*/
+ @Override
public Transporter scrollableCursorIsLast(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -429,6 +458,7 @@
* Moves the cursor to the last row in the result set
*/
+ @Override
public Transporter scrollableCursorLast(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -437,6 +467,7 @@
* Retrieve next object from the scrollable cursor
*/
+ @Override
public Transporter scrollableCursorNextObject(Transporter scrollableCursorOid) {
return handleByMode();
}
@@ -445,6 +476,7 @@
* Retrieve previous object from the scrollable cursor
*/
+ @Override
public Transporter scrollableCursorPreviousObject(Transporter scrollableCursorOid) {
return handleByMode();
}
@@ -453,6 +485,7 @@
* Moves the cursor to the given row number in the result set
*/
+ @Override
public Transporter scrollableCursorRelative(Transporter remoteScrollableCursor, int rows) {
return handleByMode();
}
@@ -461,6 +494,7 @@
* Return the cursor size
*/
+ @Override
public Transporter scrollableCursorSize(Transporter remoteCursorOid) {
return handleByMode();
}
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManagerController_Tie.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManagerController_Tie.java
index 8658739..e87b5b5 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManagerController_Tie.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManagerController_Tie.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,11 @@
"RMI:org.eclipse.persistence.testing.tests.remote.rmi.IIOP.RMIServerManager:0000000000000000"
};
+ @Override
public String[] _ids() {
return _type_ids;
}
+ @Override
public OutputStream _invoke(String method, InputStream _in, ResponseHandler reply) throws SystemException {
try {
org.omg.CORBA_2_3.portable.InputStream in =
@@ -59,23 +61,29 @@
throw new UnknownException(ex);
}
}
+ @Override
public void deactivate() {
_orb().disconnect(this);
_set_delegate(null);
target = null;
}
+ @Override
public Remote getTarget() {
return target;
}
+ @Override
public ORB orb() {
return _orb();
}
+ @Override
public void orb(ORB orb) {
orb.connect(this);
}
+ @Override
public void setTarget(Remote target) {
this.target = (RMIServerManagerController) target;
}
+ @Override
public org.omg.CORBA.Object thisObject() {
return this;
}
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManager_Stub.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManager_Stub.java
index d4c18e2..23e919a 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManager_Stub.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/rmi/IIOP/_RMIServerManager_Stub.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,9 +36,11 @@
"RMI:org.eclipse.persistence.testing.tests.remote.rmi.IIOP.RMIServerManager:0000000000000000"
};
+ @Override
public String[] _ids() {
return _type_ids;
}
+ @Override
public RMIRemoteSessionController createRemoteSessionController() throws RemoteException {
if (!Util.isLocal(this)) {
try {
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java
index fd85d45..67e0d88 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBARemoteSessionControllerDispatcherForTestingExceptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
* @param remoteCommand RemoteCommand The command to be executed on the remote session
*/
+@Override
public Transporter processCommand(Transporter remoteTransporter)
{
return handleByMode();
@@ -61,6 +62,7 @@
* Begin a transaction on the database.
*/
+@Override
public Transporter beginTransaction()
{
return handleByMode();
@@ -70,6 +72,7 @@
* Begin a transaction on the database.
*/
+@Override
public Transporter beginEarlyTransaction()
{
return handleByMode();
@@ -78,6 +81,7 @@
* Remote unit of work after serialization is commited locally.
*/
+@Override
public Transporter commitRootUnitOfWork(Transporter remoteUnitOfWork)
{
return handleByMode();
@@ -86,6 +90,7 @@
* Commit a transaction on the database.
*/
+@Override
public Transporter commitTransaction()
{
return handleByMode();
@@ -132,6 +137,7 @@
* Used for closing cursored streams across RMI.
*/
+@Override
public Transporter cursoredStreamClose(Transporter remoteCursoredStreamID) {
return handleByMode();
}
@@ -139,6 +145,7 @@
* Retrieve next page size of objects from the remote cursored stream
*/
+@Override
public Transporter cursoredStreamNextPage(Transporter remoteCursoredStream, int pageSize) {
return handleByMode();
}
@@ -146,6 +153,7 @@
* Return the cursored stream size
*/
+@Override
public Transporter cursoredStreamSize(Transporter remoteCursoredStreamOid) {
return handleByMode();
}
@@ -153,6 +161,7 @@
* Returns a remote cursor stub in a transporter
*/
+@Override
public Transporter cursorSelectObjects(Transporter remoteTransporter)
{
return handleByMode();
@@ -161,6 +170,7 @@
* A remote query after serialization is executed locally.
*/
+@Override
public Transporter executeNamedQuery(Transporter nameTransporter, Transporter classTransporter, Transporter argumentsTransporter)
{
return handleByMode();
@@ -169,6 +179,7 @@
* A remote query after serialization is executed locally.
*/
+@Override
public Transporter executeQuery(Transporter query)
{
return handleByMode();
@@ -177,6 +188,7 @@
* Extract descriptor from the session
*/
+@Override
public Transporter getDescriptor(Transporter theClass)
{
return handleByMode();
@@ -185,6 +197,7 @@
* Extract descriptor from the session
*/
+@Override
public Transporter getDescriptorForAlias(Transporter theClass)
{
return handleByMode();
@@ -194,6 +207,7 @@
* Get the default read-only classes
**/
+@Override
public Transporter getDefaultReadOnlyClasses()
{
return handleByMode();
@@ -229,6 +243,7 @@
* Get the associated session login.
*/
+@Override
public Transporter getLogin()
{
return handleByMode();
@@ -262,6 +277,7 @@
* Get the value returned by remote function call
*/
+@Override
public Transporter getSequenceNumberNamed(Transporter remoteFunctionCall) {
return handleByMode();
}
@@ -290,6 +306,7 @@
{
return handleByMode();
}
+@Override
public Transporter initializeIdentityMapsOnServerSession()
{
return handleByMode();
@@ -298,6 +315,7 @@
* The corresponding original value holder is instantiated.
*/
+@Override
public Transporter instantiateRemoteValueHolderOnServer(Transporter remoteValueHolder)
{
return handleByMode();
@@ -365,6 +383,7 @@
* Rollback a transaction on the database.
*/
+@Override
public Transporter rollbackTransaction()
{
return handleByMode();
@@ -373,6 +392,7 @@
* Moves the cursor to the given row number in the result set
*/
+@Override
public Transporter scrollableCursorAbsolute(Transporter remoteScrollableCursorOid, int rows) {
return handleByMode();
}
@@ -380,6 +400,7 @@
* Moves the cursor to the end of the result set, just after the last row.
*/
+@Override
public Transporter scrollableCursorAfterLast(Transporter remoteScrollableCursorOid){
return handleByMode();
}
@@ -387,6 +408,7 @@
* Moves the cursor to the front of the result set, just before the first row
*/
+@Override
public Transporter scrollableCursorBeforeFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -394,6 +416,7 @@
* Used for closing scrollable cursor across RMI.
*/
+@Override
public Transporter scrollableCursorClose(Transporter remoteScrollableCursorOid) {
return handleByMode();
}
@@ -401,6 +424,7 @@
* Retrieves the current row index number
*/
+@Override
public Transporter scrollableCursorCurrentIndex(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -408,6 +432,7 @@
* Moves the cursor to the first row in the result set
*/
+@Override
public Transporter scrollableCursorFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -415,6 +440,7 @@
* Indicates whether the cursor is after the last row in the result set.
*/
+@Override
public Transporter scrollableCursorIsAfterLast(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -422,6 +448,7 @@
* Indicates whether the cursor is before the first row in the result set.
*/
+@Override
public Transporter scrollableCursorIsBeforeFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -429,6 +456,7 @@
* Indicates whether the cursor is on the first row of the result set.
*/
+@Override
public Transporter scrollableCursorIsFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -436,6 +464,7 @@
* Indicates whether the cursor is on the last row of the result set.
*/
+@Override
public Transporter scrollableCursorIsLast(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -443,6 +472,7 @@
* Moves the cursor to the last row in the result set
*/
+@Override
public Transporter scrollableCursorLast(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -450,6 +480,7 @@
* Retrieve next object from the scrollable cursor
*/
+@Override
public Transporter scrollableCursorNextObject(Transporter scrollableCursorOid) {
return handleByMode();
}
@@ -457,6 +488,7 @@
* Retrieve previous object from the scrollable cursor
*/
+@Override
public Transporter scrollableCursorPreviousObject(Transporter scrollableCursorOid) {
return handleByMode();
}
@@ -464,6 +496,7 @@
* Moves the cursor to the given row number in the result set
*/
+@Override
public Transporter scrollableCursorRelative(Transporter remoteScrollableCursor, int rows) {
return handleByMode();
}
@@ -471,6 +504,7 @@
* Return the cursor size
*/
+@Override
public Transporter scrollableCursorSize(Transporter remoteCursorOid) {
return handleByMode();
}
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHolder.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHolder.java
index 74c20bb..a7742f8 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHolder.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerManagerHolder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,14 +32,17 @@
{
value = initialValue;
}
+ @Override
public void _read (org.omg.CORBA.portable.InputStream i)
{
value = org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManagerHelper.read (i);
}
+ @Override
public org.omg.CORBA.TypeCode _type ()
{
return org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManagerHelper.type ();
}
+ @Override
public void _write (org.omg.CORBA.portable.OutputStream o)
{
org.eclipse.persistence.testing.tests.remote.suncorba.CORBAServerManagerHelper.write (o, value);
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerRunner.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerRunner.java
index 9d5f433..904d07e 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerRunner.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/CORBAServerRunner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
{
this.session = session;
}
+@Override
public void run()
{
CORBAServerManagerController.start(this.session);
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerImplBase.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerImplBase.java
index 6f52446..faae6f3 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerImplBase.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerImplBase.java
@@ -39,13 +39,15 @@
public _CORBAServerManagerImplBase ()
{
}
+ @Override
public String[] _ids ()
{
return __ids;
}
+ @Override
public org.omg.CORBA.portable.OutputStream _invoke (String method,
- org.omg.CORBA.portable.InputStream in,
- org.omg.CORBA.portable.ResponseHandler rh)
+ org.omg.CORBA.portable.InputStream in,
+ org.omg.CORBA.portable.ResponseHandler rh)
{
org.omg.CORBA.portable.OutputStream out = rh.createReply();
java.lang.Integer __method = (java.lang.Integer)_methods.get (method);
diff --git a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerStub.java b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerStub.java
index d27565e..3dc7510 100644
--- a/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerStub.java
+++ b/foundation/org.eclipse.persistence.corba/src/it/java/org/eclipse/persistence/testing/tests/remote/suncorba/_CORBAServerManagerStub.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,10 +40,12 @@
super ();
_set_delegate (delegate);
}
+ @Override
public String[] _ids ()
{
return __ids.clone ();
}
+ @Override
public org.eclipse.persistence.sessions.remote.corba.sun.CORBARemoteSessionController createRemoteSessionController ()
{
org.omg.CORBA.portable.InputStream _in = null;
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/JoinedAttributeTestHelper.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/JoinedAttributeTestHelper.java
index 76ddf96..8d019cb 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/JoinedAttributeTestHelper.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/JoinedAttributeTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -380,7 +380,7 @@
value1 = frm.getRealAttributeValueFromObject(obj1, session);
value2 = frm.getRealAttributeValueFromObject(obj2, session);
if(frm.isCollectionMapping()) {
- Class containerClass = ((CollectionMapping)frm).getContainerPolicy().getContainerClass();
+ Class containerClass = frm.getContainerPolicy().getContainerClass();
if(Collection.class.isAssignableFrom(containerClass)) {
errorMsg += compareCollections((Collection)value1, (Collection)value2, frm.getReferenceDescriptor(), session, processed);
} else if(Map.class.isAssignableFrom(containerClass)) {
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceRegressionTestCase.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceRegressionTestCase.java
index 7289840..3d0e07f 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceRegressionTestCase.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/PerformanceRegressionTestCase.java
@@ -111,7 +111,7 @@
// Query the current version last 5 runs for averaging.
query = new ReadAllQuery(TestResult.class);
result = new ExpressionBuilder();
- query.setSelectionCriteria(result.get("name").equal(((TestCase)test).getName()).and(result.get("loadBuildSummary").get("machine").equal(LoadBuildSystem.getSummary().getMachine())).and(result.get("loadBuildSummary").get("loginChoice").equal(LoadBuildSystem.getSummary().getLoginChoice())).and(result.get("loadBuildSummary").get("toplinkVersion").equal(currentVersion)));
+ query.setSelectionCriteria(result.get("name").equal(test.getName()).and(result.get("loadBuildSummary").get("machine").equal(LoadBuildSystem.getSummary().getMachine())).and(result.get("loadBuildSummary").get("loginChoice").equal(LoadBuildSystem.getSummary().getLoginChoice())).and(result.get("loadBuildSummary").get("toplinkVersion").equal(currentVersion)));
query.addOrdering(result.get("loadBuildSummary").get("timestamp").descending());
query.useCursoredStream(1, 1);
stream = (CursoredStream)session.executeQuery(query);
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/UpdateAllQueryTestHelper.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/UpdateAllQueryTestHelper.java
index 4655f31..fe3e49c 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/UpdateAllQueryTestHelper.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/framework/UpdateAllQueryTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -113,7 +113,7 @@
if(value instanceof Expression) {
valueExpression = ((Expression)(((Expression)value).clone())).getField(targetField);
} else {
- ClassDescriptor targetDescriptor = ((OneToOneMapping)mapping).getReferenceDescriptor();
+ ClassDescriptor targetDescriptor = mapping.getReferenceDescriptor();
Object fieldValue = targetDescriptor.getObjectBuilder().extractValueFromObjectForField(value, targetField, (org.eclipse.persistence.internal.sessions.AbstractSession)mainSession);
valueExpression = rq.getExpressionBuilder().value(fieldValue);
}
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/tests/performance/emulateddb/EmulatedResultSetMetaData.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/tests/performance/emulateddb/EmulatedResultSetMetaData.java
index beacb05..7b7a7da 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/tests/performance/emulateddb/EmulatedResultSetMetaData.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/testing/tests/performance/emulateddb/EmulatedResultSetMetaData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -152,7 +152,7 @@
*/
@Override
public String getColumnName(int column) throws SQLException {
- return ((DatabaseField)((DatabaseRecord)resultSet.getRows().get(0)).getFields().get(column - 1)).getName();
+ return ((DatabaseRecord)resultSet.getRows().get(0)).getFields().get(column - 1).getName();
}
/**
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/ExpressionNode.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/ExpressionNode.java
index 514c982..8d3a604 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/ExpressionNode.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/ExpressionNode.java
@@ -130,7 +130,7 @@
if (getExpression() instanceof ConstantExpression) {
return ((ConstantExpression)getExpression()).getValue().toString();
} else if (getExpression() instanceof QueryKeyExpression) {
- return ((QueryKeyExpression)getExpression()).getName().toString();
+ return getExpression().getName().toString();
} else {
String anOperator =
getOperator(getExpression().getOperator().getSelector());
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/TextAreaOutputStream.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/TextAreaOutputStream.java
index 7addc0a..ca6e890 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/TextAreaOutputStream.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/beans/TextAreaOutputStream.java
@@ -44,8 +44,8 @@
if (shouldAutoScroll()) {
if (getText().getParent() instanceof JViewport) {
int max =
- ((JScrollPane)(((JViewport)getText().getParent()).getParent())).getVerticalScrollBar().getMaximum();
- ((JScrollPane)(((JViewport)getText().getParent()).getParent())).getVerticalScrollBar().setValue(max);
+ ((JScrollPane)(getText().getParent().getParent())).getVerticalScrollBar().getMaximum();
+ ((JScrollPane)(getText().getParent().getParent())).getVerticalScrollBar().setValue(max);
}
}
}
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java
index 48ed7ed..81be234 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java
@@ -157,7 +157,7 @@
policy = m2mMapping.getHistoryPolicy();
if (policy != null) {
String name = m2mMapping.getRelationTableName();
- String histName = (String)policy.getHistoryTableNames().get(0);
+ String histName = policy.getHistoryTableNames().get(0);
if (!generatedTables.contains(histName)) {
generatedTables.add(histName);
TableDefinition def = tableDefinitions.get(name);
@@ -169,7 +169,7 @@
policy = dcMapping.getHistoryPolicy();
if (policy != null) {
String name = dcMapping.getReferenceTableName();
- String histName = (String)policy.getHistoryTableNames().get(0);
+ String histName = policy.getHistoryTableNames().get(0);
if (!generatedTables.contains(histName)) {
generatedTables.add(histName);
TableDefinition def = tableDefinitions.get(name);
diff --git a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/SessionConsolePanel.java b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/SessionConsolePanel.java
index ae14597..2bea446 100644
--- a/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/SessionConsolePanel.java
+++ b/foundation/org.eclipse.persistence.core.test.framework/src/main/java/org/eclipse/persistence/tools/sessionconsole/SessionConsolePanel.java
@@ -3545,8 +3545,8 @@
DatabaseRecord firstRow = (DatabaseRecord) resultRows.firstElement();
String[] columns = new String[firstRow.getFields().size()];
for (int index = 0; index < firstRow.getFields().size(); index++) {
- columns[index] = ((DatabaseField) firstRow.getFields().elementAt(
- index)).getName();
+ columns[index] = firstRow.getFields().elementAt(
+ index).getName();
}
model.setColumnIdentifiers(columns);
for (Enumeration rowsEnumeration = resultRows.elements(); rowsEnumeration
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/JSONExceptionResource.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/JSONExceptionResource.java
index c52d421..dc27d57 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/JSONExceptionResource.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/exceptions/i18n/JSONExceptionResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
/**
* Return the lookup table.
*/
+ @Override
protected Object[][] getContents() {
return contents;
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/expressions/Expression.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/expressions/Expression.java
index 28d5263..4048998 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/expressions/Expression.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/expressions/Expression.java
@@ -705,7 +705,7 @@
}
public Expression between(Expression leftExpression, Expression rightExpression) {
- return between((Object)leftExpression, (Object)rightExpression);
+ return between(leftExpression, (Object)rightExpression);
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/expressions/ExpressionOperator.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/expressions/ExpressionOperator.java
index 6b31aa5..ec3f7c5 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/expressions/ExpressionOperator.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/expressions/ExpressionOperator.java
@@ -704,9 +704,9 @@
} else if ((left instanceof String) && (start instanceof String) && (end instanceof String)) {
return ((((String)left).compareTo(((String)start)) > 0) || (((String)left).compareTo(((String)start)) == 0)) && ((((String)left).compareTo(((String)end)) < 0) || (((String)left).compareTo(((String)end)) == 0));
} else if ((left instanceof java.util.Date) && (start instanceof java.util.Date) && (end instanceof java.util.Date)) {
- return (((java.util.Date)left).after(((java.util.Date)start)) || ((java.util.Date)left).equals((start))) && (((java.util.Date)left).before(((java.util.Date)end)) || ((java.util.Date)left).equals((end)));
+ return (((java.util.Date)left).after(((java.util.Date)start)) || left.equals((start))) && (((java.util.Date)left).before(((java.util.Date)end)) || left.equals((end)));
} else if ((left instanceof java.util.Calendar) && (start instanceof java.util.Calendar) && (end instanceof java.util.Calendar)) {
- return (((java.util.Calendar)left).after(start) || ((java.util.Calendar)left).equals((start))) && (((java.util.Calendar)left).before(end) || ((java.util.Calendar)left).equals((end)));
+ return (((java.util.Calendar)left).after(start) || left.equals((start))) && (((java.util.Calendar)left).before(end) || left.equals((end)));
}
throw QueryException.cannotConformExpression();
@@ -982,9 +982,9 @@
int compareValue = ((String)left).compareTo(((String)right));
return (compareValue < 0) || (compareValue == 0);
} else if ((left instanceof java.util.Date) && (right instanceof java.util.Date)) {
- return ((java.util.Date)left).equals((right)) || ((java.util.Date)left).before(((java.util.Date)right));
+ return left.equals((right)) || ((java.util.Date)left).before(((java.util.Date)right));
} else if ((left instanceof java.util.Calendar) && (right instanceof java.util.Calendar)) {
- return ((java.util.Calendar)left).equals((right)) || ((java.util.Calendar)left).before(right);
+ return left.equals((right)) || ((java.util.Calendar)left).before(right);
}
} else if (this.selector == GreaterThan) {
if ((left == null) || (right == null)) {
@@ -1012,9 +1012,9 @@
int compareValue = ((String)left).compareTo(((String)right));
return (compareValue > 0) || (compareValue == 0);
} else if ((left instanceof java.util.Date) && (right instanceof java.util.Date)) {
- return ((java.util.Date)left).equals((right)) || ((java.util.Date)left).after(((java.util.Date)right));
+ return left.equals((right)) || ((java.util.Date)left).after(((java.util.Date)right));
} else if ((left instanceof java.util.Calendar) && (right instanceof java.util.Calendar)) {
- return ((java.util.Calendar)left).equals((right)) || ((java.util.Calendar)left).after(right);
+ return left.equals((right)) || ((java.util.Calendar)left).after(right);
}
}
// Between
@@ -2202,7 +2202,7 @@
for (final int index : argumentIndices) {
Expression item = (Expression)items.get(index);
if ((this.selector == Ref) || ((this.selector == Deref) && (item.isObjectExpression()))) {
- DatabaseTable alias = ((ObjectExpression)item).aliasForTable(((ObjectExpression)item).getDescriptor().getTables().firstElement());
+ DatabaseTable alias = item.aliasForTable(((ObjectExpression)item).getDescriptor().getTables().firstElement());
printer.printString(alias.getNameDelimited(printer.getPlatform()));
} else if ((this.selector == Count) && (item.isExpressionBuilder())) {
printer.printString("*");
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/indirection/IndirectSet.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/indirection/IndirectSet.java
index 8ff0ac1..3cb18c5 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/indirection/IndirectSet.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/indirection/IndirectSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -317,12 +317,12 @@
try {
if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()){
try {
- cloneMethod = AccessController.doPrivileged(new PrivilegedGetMethod(this.getDelegate().getClass(), "clone", (Class[])null, false));
+ cloneMethod = AccessController.doPrivileged(new PrivilegedGetMethod(this.getDelegate().getClass(), "clone", null, false));
} catch (PrivilegedActionException exception) {
throw QueryException.cloneMethodRequired();
}
} else {
- cloneMethod = PrivilegedAccessHelper.getMethod(this.getDelegate().getClass(), "clone", (Class[])null, false);
+ cloneMethod = PrivilegedAccessHelper.getMethod(this.getDelegate().getClass(), "clone", null, false);
}
} catch (NoSuchMethodException ex) {
throw QueryException.cloneMethodRequired();
@@ -331,7 +331,7 @@
try {
if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()){
try {
- return (Set<E>)AccessController.doPrivileged(new PrivilegedMethodInvoker(cloneMethod, this.getDelegate(), (Object[])null));
+ return (Set<E>)AccessController.doPrivileged(new PrivilegedMethodInvoker(cloneMethod, this.getDelegate(), null));
} catch (PrivilegedActionException exception) {
Exception throwableException = exception.getException();
if (throwableException instanceof IllegalAccessException) {
@@ -343,7 +343,7 @@
}
}
} else {
- return (Set<E>)PrivilegedAccessHelper.invokeMethod(cloneMethod, this.getDelegate(), (Object[])null);
+ return (Set<E>)PrivilegedAccessHelper.invokeMethod(cloneMethod, this.getDelegate(), null);
}
} catch (IllegalAccessException ex1) {
throw QueryException.cloneMethodInaccessible();
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatasourceAccessor.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatasourceAccessor.java
index 23cb9bf..a348908 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatasourceAccessor.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatasourceAccessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -503,7 +503,7 @@
*/
@Override
public void disconnect(AbstractSession session) throws DatabaseException {
- session.log(SessionLog.FINE, SessionLog.CONNECTION, "disconnect", (Object[])null, this);
+ session.log(SessionLog.FINE, SessionLog.CONNECTION, "disconnect", null, this);
if (this.datasourceConnection == null) {
return;
@@ -596,7 +596,7 @@
* Note: Connections that are participating in transactions will not be refreshed.^M
*/
protected void reconnect(AbstractSession session) throws DatabaseException {
- session.log(SessionLog.FINEST, SessionLog.CONNECTION, "reconnecting_to_external_connection_pool", (Object[])null, this);
+ session.log(SessionLog.FINEST, SessionLog.CONNECTION, "reconnecting_to_external_connection_pool", null, this);
session.startOperationProfile(SessionProfiler.ConnectionManagement);
try {
connectInternal(this.login, session);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/ExpressionJavaPrinter.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/ExpressionJavaPrinter.java
index 509bbea..ba290a7 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/ExpressionJavaPrinter.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/expressions/ExpressionJavaPrinter.java
@@ -144,11 +144,11 @@
printString("}");
} else if (object.getClass() == ClassConstants.BIGDECIMAL) {
printString("new java.math.BigDecimal(\"");
- printString(((BigDecimal)object).toString());
+ printString(object.toString());
printString("\")");
} else if (object.getClass() == ClassConstants.BIGINTEGER) {
printString("new java.math.BigInteger(\"");
- printString(((BigInteger)object).toString());
+ printString(object.toString());
printString("\")");
} else {
printString((String)ConversionManager.getDefaultManager().convertObject(object, String.class));
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractModifyAllQueryBuilder.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractModifyAllQueryBuilder.java
index ed2e701..2698221 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractModifyAllQueryBuilder.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractModifyAllQueryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,9 +59,6 @@
this.queryContext = queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -75,9 +72,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
query.setSelectionCriteria(queryContext.buildExpression(expression));
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractObjectLevelReadQueryVisitor.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractObjectLevelReadQueryVisitor.java
index 7dfbb33..88afceb 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractObjectLevelReadQueryVisitor.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractObjectLevelReadQueryVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 IBM and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -98,9 +98,6 @@
this.queryContext = queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
@@ -118,67 +115,43 @@
query.setShouldMaintainCache(false);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
visitAbstractFromClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
visitIdentificationVariable(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
expression.getOrderByItems().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
Expression queryExpression = queryContext.buildExpression(expression);
query.addOrdering(queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
// Select couple flags
visitAbstractSelectClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -196,35 +169,23 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
visitAbstractFromClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
// Select couple flags
visitAbstractSelectClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
// Handle SELECT/FROM/WHERE
visitAbstractSelectStatement(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
@@ -259,9 +220,6 @@
query.addUnionExpression(union);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
query.setSelectionCriteria(queryContext.buildExpression(expression));
@@ -381,33 +339,21 @@
*/
boolean hasCountFunction;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
hasCountFunction = true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
hasCountFunction = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
expression.getSelectExpression().accept(this);
@@ -445,17 +391,11 @@
return queryExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
addNonFetchJoinedAttribute(
@@ -464,17 +404,11 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
expression.getDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
@@ -485,9 +419,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -523,9 +454,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
baseExpression = addNonFetchJoinedAttribute(
@@ -534,9 +462,6 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
expression.getDeclaration().accept(this);
@@ -551,17 +476,11 @@
*/
boolean oneToOneSelected;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
for (org.eclipse.persistence.jpa.jpql.parser.Expression child : expression.children()) {
@@ -572,114 +491,72 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
expression.getConstructorItems().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
oneToOneSelected = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
oneToOneSelected = !queryContext.isRangeIdentificationVariable(expression.getVariableName());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
oneToOneSelected = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
oneToOneSelected = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
DatabaseMapping mapping = queryContext.resolveMapping(expression);
oneToOneSelected = (mapping != null) && !mapping.isDirectToFieldMapping();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
oneToOneSelected = true;
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractRangeDeclaration.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractRangeDeclaration.java
index 15e95ac..d2dd3f9 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractRangeDeclaration.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/AbstractRangeDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,25 +62,16 @@
joins.add(join);
}
- /**
- * {@inheritDoc}
- */
@Override
public RangeVariableDeclaration getBaseExpression() {
return (RangeVariableDeclaration) super.getBaseExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public IdentificationVariableDeclaration getDeclarationExpression() {
return (IdentificationVariableDeclaration) super.getDeclarationExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public List<Join> getJoins() {
if (joins == null) {
@@ -89,9 +80,6 @@
return joins;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasJoins() {
return joins != null;
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/CollectionDeclaration.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/CollectionDeclaration.java
index 1c050ca..1b71110 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/CollectionDeclaration.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/CollectionDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,49 +44,31 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
return queryContext.buildExpression(baseExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionValuedPathExpression getBaseExpression() {
return (CollectionValuedPathExpression) super.getBaseExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionMemberDeclaration getDeclarationExpression() {
return (CollectionMemberDeclaration) super.getDeclarationExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.COLLECTION;
}
- /**
- * {@inheritDoc}
- */
@Override
ClassDescriptor resolveDescriptor() {
return queryContext.resolveDescriptor(baseExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
DatabaseMapping resolveMapping() {
return queryContext.resolveMapping(baseExpression);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ConstructorQueryMappings.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ConstructorQueryMappings.java
index 88234a2..2f05e10 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ConstructorQueryMappings.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ConstructorQueryMappings.java
@@ -151,25 +151,16 @@
this.queryContext = queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
visitPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
visitPathExpression(expression);
@@ -201,9 +192,6 @@
return (DynamicClassLoader) queryContext.getSession().getProperty(PersistenceUnitProperties.CLASSLOADER);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
@@ -214,25 +202,16 @@
expression.getConstructorItems().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
expression.getQueryStatement().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
expression.getSelectClause().accept(this);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/Declaration.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/Declaration.java
index 626e2fb..c3cf782 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/Declaration.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/Declaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -104,17 +104,11 @@
*/
abstract org.eclipse.persistence.expressions.Expression buildQueryExpression();
- /**
- * {@inheritDoc}
- */
@Override
public Expression getBaseExpression() {
return baseExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getDeclarationExpression() {
return declarationExpression;
@@ -132,9 +126,6 @@
return descriptor;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<Join> getJoins() {
return Collections.emptyList();
@@ -174,9 +165,6 @@
return queryExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public final String getVariableName() {
if (identificationVariable == null) {
@@ -185,9 +173,6 @@
return identificationVariable.getVariableName();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasJoins() {
return false;
@@ -211,9 +196,6 @@
*/
abstract DatabaseMapping resolveMapping();
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DeclarationResolver.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DeclarationResolver.java
index 235568a..b98a16b 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DeclarationResolver.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DeclarationResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -452,9 +452,6 @@
*/
JPQLQueryContext queryContext;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
@@ -484,17 +481,11 @@
currentDeclaration.rootPath = rootPath;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -517,9 +508,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
@@ -542,9 +530,6 @@
currentDeclaration.rootPath = rootPath;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
try {
@@ -555,25 +540,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
expression.getDeleteClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
expression.getDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
@@ -590,9 +566,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -608,17 +581,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
expression.getQueryStatement().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -639,33 +606,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
expression.getFromClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
expression.getDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -680,17 +635,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
@@ -702,9 +651,6 @@
declarations.add(declaration);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
try {
@@ -715,9 +661,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
expression.getUpdateClause().accept(this);
@@ -742,9 +685,6 @@
*/
JPQLQueryContext queryContext;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
// Create the path because CollectionValuedPathExpression.toParsedText()
@@ -756,18 +696,12 @@
declaration.rootPath = rootPath.toString();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
expression.getRangeVariableDeclaration().accept(this);
declaration.declarationExpression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -798,42 +732,27 @@
resultVariables = new HashSet<>();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
expression.getQueryStatement().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
IdentificationVariable identificationVariable = (IdentificationVariable) expression.getResultVariable();
resultVariables.add(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
expression.getSelectClause().accept(this);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DeleteQueryVisitor.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DeleteQueryVisitor.java
index 1c0029d..c2bcc9e 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DeleteQueryVisitor.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DeleteQueryVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,17 +41,11 @@
super(queryContext, query);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
expression.getRangeVariableDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DerivedDeclaration.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DerivedDeclaration.java
index 5e374c1..e3a0555 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DerivedDeclaration.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/DerivedDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
@@ -88,25 +85,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.DERIVED;
}
- /**
- * {@inheritDoc}
- */
@Override
ClassDescriptor resolveDescriptor() {
return queryContext.resolveDescriptor(getBaseExpression().getRootObject());
}
- /**
- * {@inheritDoc}
- */
@Override
DatabaseMapping resolveMapping() {
return queryContext.resolveMapping(getBaseExpression().getRootObject());
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/EclipseLinkSemanticValidatorHelper.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/EclipseLinkSemanticValidatorHelper.java
index ede18b8..eebb691 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/EclipseLinkSemanticValidatorHelper.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/EclipseLinkSemanticValidatorHelper.java
@@ -77,9 +77,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void collectAllDeclarationIdentificationVariables(Map<String, List<IdentificationVariable>> identificationVariables) {
@@ -108,25 +105,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void collectLocalDeclarationIdentificationVariables(Map<String, List<IdentificationVariable>> identificationVariables) {
collectLocalDeclarationIdentificationVariables(queryContext, identificationVariables);
}
- /**
- * {@inheritDoc}
- */
@Override
public void disposeSubqueryContext() {
queryContext.disposeSubqueryContext();
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] entityNames() {
@@ -145,9 +133,6 @@
return names.toArray(new String[names.size()]);
}
- /**
- * {@inheritDoc}
- */
@Override
public List<JPQLQueryDeclaration> getAllDeclarations() {
@@ -162,26 +147,17 @@
return declarations;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object[] getConstructors(Object type) {
return (type != null) ? ((Class<?>) type).getDeclaredConstructors() : ExpressionTools.EMPTY_ARRAY;
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public List getDeclarations() {
return queryContext.getDeclarations();
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassDescriptor getEmbeddable(Object type) {
@@ -194,17 +170,11 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassDescriptor getEntityNamed(String entityName) {
return queryContext.getDescriptor(entityName);
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public String[] getEnumConstants(Object type) {
@@ -219,25 +189,16 @@
return names;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return queryContext.getGrammar();
}
- /**
- * {@inheritDoc}
- */
@Override
public Object getManagedType(Expression expression) {
return queryContext.resolveDescriptor(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object getReferenceManagedType(Object mapping) {
@@ -248,9 +209,6 @@
return ((DatabaseMapping) mapping).getReferenceDescriptor();
}
- /**
- * {@inheritDoc}
- */
@Override
public Object getMappingNamed(Object entity, String name) {
@@ -264,9 +222,6 @@
return mapping;
}
- /**
- * {@inheritDoc}
- */
@Override
public Class<?> getMappingType(Object mapping) {
@@ -284,84 +239,54 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public Type[] getMethodParameterTypeDeclarations(Object constructor) {
return ((Constructor<?>) constructor).getGenericParameterTypes();
}
- /**
- * {@inheritDoc}
- */
@Override
public Class<?> getType(Expression expression) {
return queryContext.getType(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object getType(Object typeDeclaration) {
// Not used
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public Class<?> getType(String className) {
return queryContext.getType(className);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object getTypeDeclaration(Expression expression) {
// Not used
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public ITypeHelper getTypeHelper() {
// Not used
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getTypeName(Object type) {
return ((Class<?>) type).getName();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isAssignableTo(Object type1, Object type2) {
return ((Class<?>) type2).isAssignableFrom((Class<?>) type1) ;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isCollectionIdentificationVariable(String variableName) {
return queryContext.isCollectionIdentificationVariable(variableName);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isCollectionMapping(Object mapping) {
@@ -384,17 +309,11 @@
return (mapping instanceof org.eclipse.persistence.mappings.EmbeddableMapping);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEnumType(Object type) {
return (type != null) && ((Class<?>) type).isEnum();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isIdentificationVariableValidInComparison(IdentificationVariable expression) {
@@ -415,17 +334,11 @@
mapping.isAbstractCompositeDirectCollectionMapping();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isManagedTypeResolvable(Object managedType) {
return managedType != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isPropertyMapping(Object mapping) {
@@ -443,9 +356,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRelationshipMapping(Object mapping) {
@@ -465,58 +375,37 @@
return ((QueryKey) mapping).isForeignReferenceQueryKey();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isResultVariable(String variableName) {
return queryContext.isResultVariable(variableName);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTransient(Object mapping) {
return mapping == null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTypeDeclarationAssignableTo(Object typeDeclaration1, Object typeDeclaration2) {
// Not used
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTypeResolvable(Object type) {
return type != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void newSubqueryContext(SimpleSelectStatement expression) {
queryContext.newSubQueryContext(expression, null);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object resolveMapping(Expression expression) {
return queryContext.resolveMappingObject(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object resolveMapping(String variableName, String name) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ExpressionBuilderVisitor.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ExpressionBuilderVisitor.java
index fdd2024..2a83c40 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ExpressionBuilderVisitor.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ExpressionBuilderVisitor.java
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2006, 2019 IBM Corporation. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -398,9 +398,6 @@
return variableNames;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
@@ -413,9 +410,6 @@
// Note: The type will be calculated when traversing the ABS's expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
ClassDescriptor descriptor = queryContext.getDescriptor(expression.getText());
@@ -423,9 +417,6 @@
queryExpression = new ExpressionBuilder(type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
@@ -449,9 +440,6 @@
type[0] = types.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
@@ -475,9 +463,6 @@
// Note: The type will be calculated when traversing the ABS's expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
@@ -496,9 +481,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
@@ -515,17 +497,11 @@
// Note: The type will be calculated when traversing the sub-expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
@@ -544,17 +520,11 @@
type[0] = Double.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
@@ -582,9 +552,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
@@ -643,9 +610,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
@@ -660,9 +624,6 @@
type[0] = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
@@ -701,25 +662,16 @@
type[0] = queryContext.typeResolver().compareCollectionEquivalentTypes(types);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
// Nothing to do, this should be handled by the owning expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
expression.getCollectionValuedPathExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
@@ -762,17 +714,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
visitPathExpression(expression, nullAllowed, expression.pathSize());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
@@ -823,9 +769,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
@@ -848,25 +791,16 @@
type[0] = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
@@ -885,17 +819,11 @@
type[0] = Long.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -938,25 +866,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
@@ -980,9 +899,6 @@
type[0] = types.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
@@ -1005,9 +921,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
ClassDescriptor descriptor = queryContext.getDescriptor(expression.getEntityTypeName());
@@ -1015,9 +928,6 @@
queryExpression = new ConstantExpression(type[0], queryContext.getBaseExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
@@ -1033,9 +943,6 @@
type[0] = Map.Entry.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
@@ -1073,9 +980,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
@@ -1089,17 +993,11 @@
type[0] = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
@@ -1164,33 +1062,21 @@
type[0] = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
expression.getConditionalExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -1234,17 +1120,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
@@ -1258,9 +1138,6 @@
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -1279,9 +1156,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
@@ -1298,9 +1172,6 @@
queryContext.addInputParameter(expression, queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
try {
@@ -1312,17 +1183,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
@@ -1333,9 +1198,6 @@
queryExpression = new MapEntryExpression(queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
@@ -1359,9 +1221,6 @@
queryExpression = new ConstantExpression(value, queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
@@ -1375,9 +1234,6 @@
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
@@ -1408,9 +1264,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
@@ -1438,9 +1291,6 @@
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
@@ -1454,9 +1304,6 @@
type[0] = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
@@ -1474,9 +1321,6 @@
// Note: The type will be calculated when traversing the sub-expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
@@ -1494,9 +1338,6 @@
// Note: The type will be calculated when traversing the sub-expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
@@ -1515,9 +1356,6 @@
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
@@ -1541,9 +1379,6 @@
type[0] = types.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
@@ -1557,9 +1392,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -1579,18 +1411,12 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
queryExpression = null;
type[0] = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
@@ -1610,9 +1436,6 @@
type[0] = actualType;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
@@ -1633,34 +1456,22 @@
queryExpression = new ConstantExpression(number, queryContext.getBaseExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
// Simply traverse the OBJECT's expression
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
expression.getConditionalExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
@@ -1680,17 +1491,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
expression.getOrderByItems().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
@@ -1709,9 +1514,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -1747,9 +1549,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
@@ -1768,9 +1567,6 @@
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -1782,41 +1578,26 @@
// Note: The type will be calculated when traversing the select expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -1828,9 +1609,6 @@
queryExpression = queryExpression.subQuery(subquery);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
@@ -1848,9 +1626,6 @@
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
@@ -1864,25 +1639,16 @@
type[0] = Double.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
expression.getConditionalExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
visitPathExpression(expression, false, expression.pathSize());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
@@ -1894,17 +1660,11 @@
type[0] = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
@@ -1932,9 +1692,6 @@
type[0] = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
@@ -1958,9 +1715,6 @@
type[0] = types.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
@@ -1979,9 +1733,6 @@
type[0] = queryContext.typeResolver().convertSumFunctionType(type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
String tableName = queryContext.literal(expression.getExpression(), LiteralType.STRING_LITERAL);
@@ -1989,17 +1740,11 @@
queryExpression = queryContext.getBaseExpression().getTable(tableName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
@@ -2012,9 +1757,6 @@
queryExpression = queryExpression.treat(entityType.getJavaClass());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
@@ -2060,9 +1802,6 @@
type[0] = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
@@ -2075,49 +1814,31 @@
// Note: The type will be calculated when traversing the select expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
queryExpression = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
@@ -2131,25 +1852,16 @@
type[0] = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
expression.getConditionalExpression().accept(this);
@@ -2201,9 +1913,6 @@
expressions = new ArrayList<>();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
for (org.eclipse.persistence.jpa.jpql.parser.Expression child : expression.children()) {
@@ -2211,17 +1920,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// Can't be added to the list
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
expressions.add(expression);
@@ -2234,9 +1937,6 @@
*/
private class ComparisonExpressionVisitor extends EclipseLinkAnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -2259,9 +1959,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
expression.accept(ExpressionBuilderVisitor.this);
@@ -2274,9 +1971,6 @@
*/
private class InExpressionExpressionBuilder extends EclipseLinkAnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -2291,17 +1985,11 @@
queryExpression = new org.eclipse.persistence.internal.expressions.CollectionExpression(children, queryContext.getBaseExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
expression.accept(ExpressionBuilderVisitor.this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
@@ -2324,9 +2012,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -2346,9 +2031,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -2371,9 +2053,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
@@ -2399,9 +2078,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
@@ -2419,9 +2095,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -2439,9 +2112,7 @@
private class InItemExpressionVisitor extends AnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
+
@Override
public void visit(IdentificationVariable expression) {
ClassDescriptor descriptor = queryContext.getDescriptor(expression.getVariableName());
@@ -2449,9 +2120,7 @@
queryExpression = new ConstantExpression(descriptor.getJavaClass(), queryExpression);
}
- /**
- * {@inheritDoc}
- */
+
@Override
public void visit(CollectionExpression expression) {
@@ -2466,17 +2135,13 @@
queryExpression = new org.eclipse.persistence.internal.expressions.CollectionExpression(children, queryContext.getBaseExpression());
}
- /**
- * {@inheritDoc}
- */
+
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
+
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
expression.accept(ExpressionBuilderVisitor.this);
@@ -2657,17 +2322,11 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
visitPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
@@ -2685,9 +2344,6 @@
localExpression = entryExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -2702,9 +2358,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
@@ -2718,17 +2371,11 @@
descriptor = queryContext.resolveDescriptor(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
visitPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
@@ -2739,9 +2386,6 @@
descriptor = queryContext.resolveDescriptor(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
@@ -2821,17 +2465,11 @@
whenClauses.clear();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/HermesParser.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/HermesParser.java
index 421469f..b3e7440 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/HermesParser.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/HermesParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -157,17 +157,11 @@
return new JPQLException(errorMessage);
}
- /**
- * {@inheritDoc}
- */
@Override
public DatabaseQuery buildQuery(CharSequence jpqlQuery, AbstractSession session) {
return populateQueryImp(jpqlQuery, null, session);
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression buildSelectionCriteria(String entityName,
String selectionCriteria,
@@ -251,9 +245,6 @@
return DefaultEclipseLinkJPQLGrammar.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public void populateQuery(CharSequence jpqlQuery, DatabaseQuery query, AbstractSession session) {
populateQueryImp(jpqlQuery, query, session);
@@ -303,9 +294,6 @@
return ResourceBundle.getBundle(JPQLQueryProblemResourceBundle.class.getName());
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidationLevel(String validationLevel) {
this.validationLevel = validationLevel;
@@ -388,9 +376,6 @@
return new ObjectLevelReadQueryVisitor(queryContext, query);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
@@ -412,17 +397,11 @@
expression.accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
expression.getQueryStatement().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -440,9 +419,6 @@
expression.accept(buildVisitor(query));
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JPQLQueryContext.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JPQLQueryContext.java
index 5683dad..2ad43fa 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JPQLQueryContext.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JPQLQueryContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1006,7 +1006,7 @@
*/
@SuppressWarnings("unchecked")
<T> T newInstance(Class<?> type, Class<?> parameterType, Object parameter) {
- return (T) newInstance(type, new Class[] { parameterType }, new Object[] { parameter });
+ return newInstance(type, new Class[] { parameterType }, new Object[] { parameter });
}
/**
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JPQLQueryHelper.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JPQLQueryHelper.java
index 9fdfb96..9bac2c4 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JPQLQueryHelper.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JPQLQueryHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -189,27 +189,18 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
resolver = new DeclarationResolver(queryContext, null);
collectDescriptors(expression, resolver);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
resolver = new DeclarationResolver(queryContext, null);
collectDescriptors(expression, resolver);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
resolver = new DeclarationResolver(queryContext, resolver);
@@ -217,9 +208,6 @@
resolver = resolver.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
resolver = new DeclarationResolver(queryContext, null);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JoinDeclaration.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JoinDeclaration.java
index b5d77c5..c1bfe01 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JoinDeclaration.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/JoinDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,49 +39,31 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
return queryContext.buildExpression(baseExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public Join getBaseExpression() {
return (Join) super.getBaseExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.UNKNOWN;
}
- /**
- * {@inheritDoc}
- */
@Override
ClassDescriptor resolveDescriptor() {
return queryContext.resolveDescriptor(getBaseExpression().getJoinAssociationPath());
}
- /**
- * {@inheritDoc}
- */
@Override
DatabaseMapping resolveMapping() {
return queryContext.resolveMapping(getBaseExpression().getJoinAssociationPath());
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return baseExpression.toParsedText();
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/NumericTypeComparator.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/NumericTypeComparator.java
index c4f872e..77953a5 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/NumericTypeComparator.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/NumericTypeComparator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,9 +50,6 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int compare(Class<?> type1, Class<?> type2) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ParameterType.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ParameterType.java
index e9c3aa4..d3f61d5 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ParameterType.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ParameterType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
this.queryContext = queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
public Class<?> getType() {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/RangeDeclaration.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/RangeDeclaration.java
index 4ab8574..e1807fa 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/RangeDeclaration.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/RangeDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,9 +58,6 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
void addJoin(Join join) {
super.addJoin(join);
@@ -77,9 +74,6 @@
joinFetches.add(join);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
@@ -131,9 +125,6 @@
return (joinFetches == null) ? Collections.<Join>emptyList() : joinFetches;
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return (type != null) ? Type.CLASS_NAME : Type.RANGE;
@@ -150,9 +141,6 @@
return type != null;
}
- /**
- * {@inheritDoc}
- */
@Override
ClassDescriptor resolveDescriptor() {
@@ -163,9 +151,6 @@
return queryContext.getDescriptor(rootPath);
}
- /**
- * {@inheritDoc}
- */
@Override
DatabaseMapping resolveMapping() {
// A range declaration does not have a mapping, only a descriptor
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReadAllQueryBuilder.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReadAllQueryBuilder.java
index 57aff21..bf9b074 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReadAllQueryBuilder.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReadAllQueryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -78,18 +78,12 @@
this.query = query;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
// Multiple expressions in the select clause => ReportQuery
initializeReportQuery();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
// Does not select an identification variable
@@ -97,9 +91,6 @@
initializeReportQuery();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -125,27 +116,18 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// For from clause only JPQL the full object is always selected, so is ReadAllQuery.
initializeReadAllQuery();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
// Visit the identification variable directly
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
// Make sure to traverse the select expression since
@@ -153,17 +135,11 @@
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
this.selectStatement = expression;
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReadAllQueryVisitor.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReadAllQueryVisitor.java
index 6a6e4ba..080ba68 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReadAllQueryVisitor.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReadAllQueryVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,9 +46,6 @@
super(queryContext, query);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
@@ -91,25 +88,16 @@
orderByItems = new ArrayList<>();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
expression.getOrderByItems().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
orderByItems.add(queryContext.buildExpression(expression));
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReportItemBuilder.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReportItemBuilder.java
index e95d9b0..5ff2854 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReportItemBuilder.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReportItemBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -162,18 +162,12 @@
return constructorExpressionVisitor;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
@@ -186,18 +180,12 @@
addAttribute("plus", queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
// TODO: Anything to do other than the default behavior?
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
String name = queryContext.literal(expression.getExpression(), PATH_EXPRESSION_LAST_PATH);
@@ -205,36 +193,24 @@
addAttribute(name, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute("Case", queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute("Coalesce", queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -246,18 +222,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
@@ -268,9 +238,6 @@
query.endAddingToConstructorItem();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
@@ -286,9 +253,6 @@
addAttribute(name, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -302,9 +266,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
@@ -317,36 +278,24 @@
addAttribute("divide", queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(" MapEntry", queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -391,63 +340,42 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute("Index", queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute("MapKey", queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute("CONSTANT", queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
String name = queryContext.literal(expression.getExpression(), PATH_EXPRESSION_LAST_PATH);
@@ -455,9 +383,6 @@
addAttribute(name, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
String name = queryContext.literal(expression.getExpression(), PATH_EXPRESSION_LAST_PATH);
@@ -465,18 +390,12 @@
addAttribute(name, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
@@ -489,44 +408,29 @@
addAttribute("multiply", queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(NullIfExpression.NULLIF, queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute("CONSTANT", queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -540,25 +444,16 @@
resultVariable = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
visitAbstractSelectClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
visitAbstractSelectClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
@@ -572,18 +467,12 @@
query.addGrouping(queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
@@ -596,35 +485,23 @@
query.dontRetrievePrimaryKeys();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute("CONSTANT", queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
@@ -637,9 +514,6 @@
addAttribute("minus", queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
String name = queryContext.literal(expression.getExpression(), PATH_EXPRESSION_LAST_PATH);
@@ -647,44 +521,29 @@
addAttribute(name, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
Expression queryExpression = queryContext.buildExpression(expression, type);
addAttribute(ExpressionTools.EMPTY_STRING, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
IdentificationVariable identificationVariable = (IdentificationVariable) expression.getExpression();
@@ -711,25 +570,16 @@
*/
private class ConstructorExpressionVisitor extends EclipseLinkAnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
expression.getConstructorItems().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
expression.accept(ReportItemBuilder.this);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReportQueryVisitor.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReportQueryVisitor.java
index be1636d..1f00b96 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReportQueryVisitor.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/ReportQueryVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,26 +53,17 @@
super(queryContext, query);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
GroupByVisitor visitor = new GroupByVisitor();
expression.accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
((ReportQuery) query).setHavingExpression(queryContext.buildExpression(expression));
}
- /**
- * {@inheritDoc}
- */
@Override
void visitAbstractSelectClause(AbstractSelectClause expression) {
@@ -85,9 +76,6 @@
type = builder.type[0];
}
- /**
- * {@inheritDoc}
- */
@Override
void visitAbstractSelectStatement(AbstractSelectStatement expression) {
@@ -102,9 +90,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
void visitIdentificationVariable(IdentificationVariable expression) {
// ReportQuery does not require it
@@ -116,25 +101,16 @@
*/
private class GroupByVisitor extends EclipseLinkAnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
expression.getGroupByItems().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
((ReportQuery) query).addGrouping(queryContext.buildExpression(expression));
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/SubqueryDeclaration.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/SubqueryDeclaration.java
index 95e2da7..acbeb4c 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/SubqueryDeclaration.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/SubqueryDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,6 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
RangeVariableDeclaration declaration = (RangeVariableDeclaration) getBaseExpression();
@@ -49,26 +46,17 @@
return queryContext.getBaseExpression().getAlias(expressoin);
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.SUBQUERY;
}
- /**
- * {@inheritDoc}
- */
@Override
ClassDescriptor resolveDescriptor() {
// A subquery used as a declaration does not have a descriptor
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
DatabaseMapping resolveMapping() {
// Does not resolve to a mapping
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/TableDeclaration.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/TableDeclaration.java
index 40d8714..a8e5dfe 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/TableDeclaration.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/TableDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
TableVariableDeclaration declaration = (TableVariableDeclaration) getBaseExpression();
@@ -52,17 +49,11 @@
return queryContext.getBaseExpression().getTable(tableName);
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.TABLE;
}
- /**
- * {@inheritDoc}
- */
@Override
ClassDescriptor resolveDescriptor() {
// A TableExpression does not resolve to a descriptor,
@@ -70,9 +61,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
DatabaseMapping resolveMapping() {
// A TableExpression does not resolve to a mapping,
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/TypeResolver.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/TypeResolver.java
index 0d610e7..9c431df 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/TypeResolver.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/TypeResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -438,51 +438,33 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
// Visit the child expression in order to create the resolver
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
ClassDescriptor descriptor = queryContext.getDescriptor(expression.getText());
type = descriptor.getJavaClass();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
@@ -495,41 +477,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
type = Double.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
visitCollectionEquivalentExpression(
@@ -538,105 +505,66 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
visitCollectionEquivalentExpression(expression.getExpression(), null);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
expression.getCollectionValuedPathExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
type = resolveMappingType(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
type = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
type = queryContext.getType(expression.getClassName());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
type = Long.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -667,41 +595,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
String entityTypeName = expression.getEntityTypeName();
@@ -709,73 +622,46 @@
type = descriptor.getJavaClass();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
type = Map.Entry.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -806,57 +692,36 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
type = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
type = UNRESOLVABLE_TYPE;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
expression.getJoinAssociationPath().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
expression.getQueryStatement().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
IdentificationVariable identificationVariable = (IdentificationVariable) expression.getExpression();
@@ -866,9 +731,6 @@
type = (Class<?>) mapContainerPolicy.getKeyType();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
@@ -884,41 +746,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
type = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
type = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
type = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
@@ -932,9 +779,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
@@ -948,57 +792,36 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
type = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
type = UNRESOLVABLE_TYPE;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
expression.getFirstExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
@@ -1039,81 +862,51 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
expression.getConditionalExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
type = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
@@ -1131,33 +924,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
expression.getSelectClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
queryContext.newSubQueryContext(expression, null);
@@ -1169,73 +950,46 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
type = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
type = Double.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
type = resolveMappingType(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
type = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
type = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
@@ -1247,97 +1001,61 @@
type = convertSumFunctionType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
expression.getEntityType().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
type = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
type = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
@@ -1359,17 +1077,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
expression.getThenExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
expression.getConditionalExpression().accept(this);
@@ -1461,9 +1173,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
this.expression = expression;
@@ -1476,9 +1185,6 @@
DatabaseMapping mapping;
QueryKey queryKey;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
descriptor = queryContext.getDescriptor(expression.getText());
@@ -1492,9 +1198,6 @@
visitPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
descriptor = queryContext.getDescriptor(expression.getEntityTypeName());
@@ -1547,9 +1250,6 @@
descriptor = mapPolicy.getKeyMapping().getReferenceDescriptor();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
expression.getIdentificationVariable().accept(this);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/UpdateQueryVisitor.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/UpdateQueryVisitor.java
index 031d16a..9b730e4 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/UpdateQueryVisitor.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/jpql/UpdateQueryVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,26 +44,17 @@
super(queryContext, query);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
expression.getRangeVariableDeclaration().accept(this);
expression.getUpdateItems().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
@@ -77,9 +68,6 @@
((UpdateAllQuery) query).addUpdate(leftExpression, rightExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/AggregateNode.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/AggregateNode.java
index d3138fd..1129ccc 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/AggregateNode.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/AggregateNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,7 +36,7 @@
@Override
public String resolveAttribute() {
Node arg = getLeft();
- return arg.isDotNode() ? ((DotNode)arg).resolveAttribute() : null;
+ return arg.isDotNode() ? arg.resolveAttribute() : null;
}
/**
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/DotNode.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/DotNode.java
index 86ea20d..d318568 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/DotNode.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/DotNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -220,7 +220,7 @@
public Class getTypeOfDirectToField(GenerationContext context) {
DatabaseMapping mapping = resolveMapping(context);
if ((mapping != null) && mapping.isDirectToFieldMapping()) {
- return ((AbstractDirectMapping)mapping).getAttributeClassification();
+ return mapping.getAttributeClassification();
}
return null;
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/OrderByNode.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/OrderByNode.java
index 32823f4..7508a5f 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/OrderByNode.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/OrderByNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,7 +48,7 @@
Iterator iter = getOrderByItems().iterator();
while (iter.hasNext()) {
Node nextNode = (Node)iter.next();
- ((ReadAllQuery)theQuery).addOrdering(nextNode.generateExpression(context));
+ theQuery.addOrdering(nextNode.generateExpression(context));
}
}
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/ParseTree.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/ParseTree.java
index ec5df28..ea6058b 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/ParseTree.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/ParseTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -587,7 +587,7 @@
public String toString() {
StringBuilder buffer = new StringBuilder();
buffer.append(getContext().toString());
- return ToStringLocalization.buildMessage("context", (Object[])null) + " " + buffer.toString();
+ return ToStringLocalization.buildMessage("context", null) + " " + buffer.toString();
}
/**
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/TypeHelperImpl.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/TypeHelperImpl.java
index 89b0238..357419e 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/TypeHelperImpl.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/jpa/parsing/TypeHelperImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -99,7 +99,7 @@
Object type = null;
DatabaseMapping mapping = resolveAttributeMapping(ownerClass, attribute);
if (mapping.isCollectionMapping()){
- ContainerPolicy cp = ((CollectionMapping)mapping).getContainerPolicy();
+ ContainerPolicy cp = mapping.getContainerPolicy();
type = cp.getKeyType();
}
return type;
@@ -249,7 +249,7 @@
// of an embedded. This makes sure that any property or field
// access of the embedded uses the correct mapping information and
// not the shell of the descriptors as stored by the session.
- type = ((AggregateCollectionMapping)mapping).getReferenceDescriptor();
+ type = mapping.getReferenceDescriptor();
} else if (mapping.isForeignReferenceMapping()) {
ClassDescriptor descriptor = mapping.getReferenceDescriptor();
type = descriptor == null ? null : descriptor.getJavaClass();
@@ -258,7 +258,7 @@
// of an embedded. This makes sure that any property or field
// access of the embedded uses the correct mapping information and
// not the shell of the descriptors as stored by the session.
- type = ((AggregateMapping)mapping).getReferenceDescriptor();
+ type = mapping.getReferenceDescriptor();
} else {
type = mapping.getAttributeAccessor().getAttributeClass();
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/VectorUtils.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/VectorUtils.java
index f28234a..36bdf56 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/VectorUtils.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/VectorUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -183,18 +183,22 @@
super(vector);
}
+ @Override
public E set(int index, E element) {
throw new UnsupportedOperationException();
}
+ @Override
public void add(int index, E element) {
throw new UnsupportedOperationException();
}
+ @Override
public E remove(int index) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(int index, Collection<? extends E> c) {
throw new UnsupportedOperationException();
}
@@ -204,31 +208,41 @@
return Collections.unmodifiableList(super.subList(fromIndex, toIndex));
}
+ @Override
public ListIterator<E> listIterator(final int index) {
return new ListIterator<E>() {
private final ListIterator<? extends E> i
= listIterator(index);
+ @Override
public boolean hasNext() {return i.hasNext();}
+ @Override
public E next() {return i.next();}
+ @Override
public boolean hasPrevious() {return i.hasPrevious();}
+ @Override
public E previous() {return i.previous();}
+ @Override
public int nextIndex() {return i.nextIndex();}
+ @Override
public int previousIndex() {return i.previousIndex();}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
+ @Override
public void set(E e) {
throw new UnsupportedOperationException();
}
+ @Override
public void add(E e) {
throw new UnsupportedOperationException();
}
@@ -240,6 +254,7 @@
};
}
+ @Override
public ListIterator<E> listIterator() {return listIterator(0);}
@Override
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLCompositeObjectMappingNodeValue.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLCompositeObjectMappingNodeValue.java
index 09138dd..d385653 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLCompositeObjectMappingNodeValue.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLCompositeObjectMappingNodeValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -209,7 +209,7 @@
marshalRecord.node(next, marshalRecord.getNamespaceResolver());
return true;
} else if (nodeType == Node.TEXT_NODE) {
- marshalRecord.characters(((Text) next).getNodeValue());
+ marshalRecord.characters(next.getNodeValue());
return true;
}
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java
index 44ef2fe..ac0ff57 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/XMLConversionManager.java
@@ -471,7 +471,7 @@
if(Double.NEGATIVE_INFINITY == ((Double)sourceObject)){
return Constants.NEGATIVE_INFINITY;
}
- return ((Double)sourceObject).toString();
+ return sourceObject.toString();
}
if(sourceObject instanceof Float){
if(Float.POSITIVE_INFINITY == ((Float)sourceObject)){
@@ -480,7 +480,7 @@
if(Float.NEGATIVE_INFINITY == ((Float)sourceObject)){
return Constants.NEGATIVE_INFINITY;
}
- return ((Float)sourceObject).toString();
+ return sourceObject.toString();
}
// Bug 21561562 - use plain, non-scientific notation for BigDecimal->String conversion
if (sourceObject instanceof java.math.BigDecimal) {
@@ -533,7 +533,7 @@
if(Double.NEGATIVE_INFINITY == ((Double)sourceObject)){
return Constants.NEGATIVE_INFINITY;
}
- return ((Double)sourceObject).toString();
+ return sourceObject.toString();
}
if(sourceObject instanceof Float){
if(Float.POSITIVE_INFINITY == ((Float)sourceObject)){
@@ -542,7 +542,7 @@
if(Float.NEGATIVE_INFINITY == ((Float)sourceObject)){
return Constants.NEGATIVE_INFINITY;
}
- return ((Float)sourceObject).toString();
+ return sourceObject.toString();
}
// Bug 21561562 - use plain, non-scientific notation for BigDecimal->String conversion
if (sourceObject instanceof java.math.BigDecimal) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DOMReader.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DOMReader.java
index c0b9046..147d0be 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DOMReader.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DOMReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -283,10 +283,10 @@
}
while(nextChild != null) {
if(nextChild.getNodeType() == Node.TEXT_NODE) {
- char[] value = ((Text)nextChild).getNodeValue().toCharArray();
+ char[] value = nextChild.getNodeValue().toCharArray();
contentHandler.characters(value, 0, value.length);
} else if(nextChild.getNodeType() == Node.COMMENT_NODE) {
- char[] value = ((Comment)nextChild).getNodeValue().toCharArray();
+ char[] value = nextChild.getNodeValue().toCharArray();
if (lexicalHandler != null) {
lexicalHandler.comment(value, 0, value.length);
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DomToXMLEventWriter.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DomToXMLEventWriter.java
index 8a07d73..1c0fefd 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DomToXMLEventWriter.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DomToXMLEventWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,7 +62,7 @@
}
}
} else if(currentNode.getNodeType() == Node.TEXT_NODE) {
- xew.add(xmlEventFactory.createCharacters(((Text)currentNode).getNodeValue()));
+ xew.add(xmlEventFactory.createCharacters(currentNode.getNodeValue()));
}
if(dom.getNodeType() == Node.DOCUMENT_NODE) {
xew.add(xmlEventFactory.createEndDocument());
@@ -160,7 +160,7 @@
for(int i = 0; i < childNodes.getLength(); i++) {
Node next = childNodes.item(i);
if(next.getNodeType() == Node.TEXT_NODE) {
- xew.add(xmlEventFactory.createCharacters(((Text)next).getNodeValue()));
+ xew.add(xmlEventFactory.createCharacters(next.getNodeValue()));
} else if(next.getNodeType() == Node.CDATA_SECTION_NODE) {
xew.add(xmlEventFactory.createCData(next.getNodeValue()));
} else if(next.getNodeType() == Node.COMMENT_NODE) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DomToXMLStreamWriter.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DomToXMLStreamWriter.java
index 409e7ca..47d131b 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DomToXMLStreamWriter.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/DomToXMLStreamWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,7 +53,7 @@
}
}
} else if(currentNode.getNodeType() == Node.TEXT_NODE) {
- xsw.writeCharacters(((Text)currentNode).getNodeValue());
+ xsw.writeCharacters(currentNode.getNodeValue());
}
if(dom.getNodeType() == Node.DOCUMENT_NODE) {
xsw.writeEndDocument();
@@ -155,7 +155,7 @@
for(int i = 0; i < childNodes.getLength(); i++) {
Node next = childNodes.item(i);
if(next.getNodeType() == Node.TEXT_NODE) {
- xsw.writeCharacters(((Text)next).getNodeValue());
+ xsw.writeCharacters(next.getNodeValue());
} else if(next.getNodeType() == Node.CDATA_SECTION_NODE) {
xsw.writeCData(next.getNodeValue());
} else if(next.getNodeType() == Node.COMMENT_NODE) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/json/JsonStructureReader.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/json/JsonStructureReader.java
index 2ba8167..231c3c4 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/json/JsonStructureReader.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/oxm/record/json/JsonStructureReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -512,6 +512,7 @@
.getContentHandler() instanceof UnmarshalRecord;
}
+ @Override
public boolean isNullRepresentedByXsiNil(AbstractNullPolicy nullPolicy) {
return true;
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/queries/ContainerPolicy.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/queries/ContainerPolicy.java
index 776b6a2..d448954 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/queries/ContainerPolicy.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/queries/ContainerPolicy.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -525,7 +525,7 @@
// CR4172 compare the keys from the back up to the
// clone not from the original to the clone.
- if (((UnitOfWorkImpl)session).isClassReadOnly(firstObject.getClass())) {
+ if (session.isClassReadOnly(firstObject.getClass())) {
backUpVersion = firstObject;
} else {
backUpVersion = ((UnitOfWorkImpl)session).getBackupClone(firstObject, referenceDescriptor);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/queries/MapContainerPolicy.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/queries/MapContainerPolicy.java
index 16675ad..520e4d0 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/queries/MapContainerPolicy.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/queries/MapContainerPolicy.java
@@ -283,7 +283,7 @@
*/
@Override
public boolean compareKeys(Object sourceValue, AbstractSession session) {
- if (((UnitOfWorkImpl)session).isClassReadOnly(sourceValue.getClass())) {
+ if (session.isClassReadOnly(sourceValue.getClass())) {
return true;
}
Object backUpVersion = ((UnitOfWorkImpl)session).getBackupClone(sourceValue, getElementDescriptor());
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/sessions/AbstractSession.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/sessions/AbstractSession.java
index 5a0ec05..b5fb3f1 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/sessions/AbstractSession.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/sessions/AbstractSession.java
@@ -4664,7 +4664,7 @@
if (!shouldLog(level, category)) {
return;
}
- log(level, category, message, (Object[])null);
+ log(level, category, message, null);
}
/**
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/logging/AbstractSessionLog.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/logging/AbstractSessionLog.java
index eb36815..a9c98b8 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/logging/AbstractSessionLog.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/logging/AbstractSessionLog.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2018 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -981,7 +981,7 @@
*/
@Override
public void severe(String message) {
- log(SEVERE, message, (Object[])null);
+ log(SEVERE, message, null);
}
/**
@@ -994,7 +994,7 @@
*/
@Override
public void warning(String message) {
- log(WARNING, message, (Object[])null);
+ log(WARNING, message, null);
}
/**
@@ -1007,7 +1007,7 @@
*/
@Override
public void info(String message) {
- log(INFO, message, (Object[])null);
+ log(INFO, message, null);
}
/**
@@ -1020,7 +1020,7 @@
*/
@Override
public void config(String message) {
- log(CONFIG, message, (Object[])null);
+ log(CONFIG, message, null);
}
/**
@@ -1033,7 +1033,7 @@
*/
@Override
public void fine(String message) {
- log(FINE, message, (Object[])null);
+ log(FINE, message, null);
}
/**
@@ -1046,7 +1046,7 @@
*/
@Override
public void finer(String message) {
- log(FINER, message, (Object[])null);
+ log(FINER, message, null);
}
/**
@@ -1059,7 +1059,7 @@
*/
@Override
public void finest(String message) {
- log(FINEST, message, (Object[])null);
+ log(FINEST, message, null);
}
/**
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/mappings/DirectCollectionMapping.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/mappings/DirectCollectionMapping.java
index efcf3ad..75637db 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/mappings/DirectCollectionMapping.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/mappings/DirectCollectionMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -2481,7 +2481,7 @@
}
boolean shouldRepairOrder = false;
- if((List)changeRecord.getLatestCollection() instanceof IndirectList) {
+ if(changeRecord.getLatestCollection() instanceof IndirectList) {
shouldRepairOrder = ((IndirectList)changeRecord.getLatestCollection()).isListOrderBrokenInDb();
}
if(shouldRepairOrder) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/mappings/DirectMapMapping.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/mappings/DirectMapMapping.java
index ffa427e..8fad0ff 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/mappings/DirectMapMapping.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/mappings/DirectMapMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -558,7 +558,7 @@
// Next iterate over the changes and add them to the container
for (Iterator i = removeObjects.keySet().iterator(); i.hasNext();) {
Object keyToRemove = i.next();
- containerPolicy.removeFrom(keyToRemove, (Object)null, valueOfTarget, session);
+ containerPolicy.removeFrom(keyToRemove, null, valueOfTarget, session);
}
for (Iterator i = addObjects.keySet().iterator(); i.hasNext();) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/XMLField.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/XMLField.java
index 8fd9611..4dac300 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/XMLField.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/XMLField.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -960,6 +960,7 @@
*
* @param nestedArray flag.
*/
+ @Override
public void setNestedArray(boolean nestedArray) {
this.nestedArray = nestedArray;
}
@@ -969,6 +970,7 @@
*
* @return True if content is nested array.
*/
+ @Override
public boolean isNestedArray() {
return this.nestedArray;
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLAbstractAnyMapping.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLAbstractAnyMapping.java
index 2d5670d..1f41c52 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLAbstractAnyMapping.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLAbstractAnyMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -147,9 +147,9 @@
*/
protected XMLRoot buildXMLRootForText(Node node, QName schemaTypeQName, XMLConverter converter, AbstractSession session, DOMRecord record) {
XMLRoot rootValue = null;
- Node textchild = ((Element) node).getFirstChild();
+ Node textchild = node.getFirstChild();
if ((textchild != null) && (textchild.getNodeType() == Node.TEXT_NODE)) {
- String stringValue = ((Text) textchild).getNodeValue();
+ String stringValue = textchild.getNodeValue();
if ((stringValue != null) && stringValue.length() > 0) {
Object convertedValue = stringValue;
if (schemaTypeQName != null) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLChoiceCollectionMapping.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLChoiceCollectionMapping.java
index 7192c67..f180055 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLChoiceCollectionMapping.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLChoiceCollectionMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -342,7 +342,7 @@
}
}
}
- ((DOMRecord)row).put(getFields(), nestedRows);
+ row.put(getFields(), nestedRows);
}
private XMLField getFieldForName(String localName, String namespaceUri) {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLCompositeCollectionMapping.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLCompositeCollectionMapping.java
index 06b0431..54b4b33 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLCompositeCollectionMapping.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLCompositeCollectionMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -548,7 +548,7 @@
//simple case
objectToAdd = convertToSimpleTypeIfPresent(objectToAdd, nestedRow,executionSession);
} else {
- NodeList children =((Element) ((DOMRecord)nestedRow).getDOM()).getChildNodes();
+ NodeList children = ((DOMRecord)nestedRow).getDOM().getChildNodes();
for(int i=0; i< children.getLength(); i++){
Node nextNode = children.item(i);
if(nextNode.getNodeType() == nextNode.ELEMENT_NODE){
@@ -604,7 +604,7 @@
Node textchild = theElement.getFirstChild();
if ((textchild != null) && (textchild.getNodeType() == Node.TEXT_NODE)) {
- stringValue = ((Text) textchild).getNodeValue();
+ stringValue = textchild.getNodeValue();
if(stringValue != null && getKeepAsElementPolicy() != UnmarshalKeepAsElementPolicy.KEEP_UNKNOWN_AS_ELEMENT && getKeepAsElementPolicy()!=UnmarshalKeepAsElementPolicy.KEEP_ALL_AS_ELEMENT){
objectToAdd = stringValue;
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLCompositeObjectMapping.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLCompositeObjectMapping.java
index 22ee6b4..26ce16a 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLCompositeObjectMapping.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/mappings/XMLCompositeObjectMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -535,7 +535,7 @@
toReturn = convertToSimpleTypeIfPresent(toReturn, nestedRow, executionSession);
return toReturn;
} else {
- NodeList children =((Element) nestedRow.getDOM()).getChildNodes();
+ NodeList children = nestedRow.getDOM().getChildNodes();
for(int i=0, childrenLength=children.getLength(); i<childrenLength ; i++){
Node nextNode = children.item(i);
if(nextNode.getNodeType() == nextNode.ELEMENT_NODE){
@@ -592,10 +592,10 @@
}
private Object convertToSimpleTypeIfPresent(Object toReturn, XMLRecord nestedRow, AbstractSession executionSession){
- Node textchild = ((Element) nestedRow.getDOM()).getFirstChild();
+ Node textchild = nestedRow.getDOM().getFirstChild();
String stringValue = null;
if ((textchild != null) && (textchild.getNodeType() == Node.TEXT_NODE)) {
- stringValue = ((Text) textchild).getNodeValue();
+ stringValue = textchild.getNodeValue();
if(stringValue != null && getKeepAsElementPolicy() != UnmarshalKeepAsElementPolicy.KEEP_UNKNOWN_AS_ELEMENT && getKeepAsElementPolicy()!=UnmarshalKeepAsElementPolicy.KEEP_ALL_AS_ELEMENT){
toReturn = stringValue;
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/DB2ZPlatform.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/DB2ZPlatform.java
index a61450b..1fcbb3b 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/DB2ZPlatform.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/DB2ZPlatform.java
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2015, 2020 IBM Corporation. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -250,7 +250,7 @@
//TODO find shouldUseGetSetNString() support for DB2/Z
methodName = "setJccStringAtName";
methodArgs = new Class[] {String.class, String.class};
- parameters = new Object[] {name, (String) parameter};
+ parameters = new Object[] {name, parameter};
}
} else if (parameter instanceof Number) {
Number number = (Number) parameter;
@@ -265,7 +265,7 @@
} else if (number instanceof BigDecimal) {
methodName = "setJccBigDecimalAtName";
methodArgs = new Class[] {String.class, BigDecimal.class};
- parameters = new Object[] {name, (BigDecimal) number};
+ parameters = new Object[] {name, number};
} else if (number instanceof Double) {
methodName = "setJccDoubleAtName";
methodArgs = new Class[] {String.class, double.class};
@@ -295,7 +295,7 @@
} else if (parameter instanceof java.sql.Date){
methodName = "setJccDateAtName";
methodArgs = new Class[] {String.class, java.sql.Date.class};
- parameters = new Object[] {name, (java.sql.Date)parameter};
+ parameters = new Object[] {name, parameter};
} else if (parameter instanceof java.time.LocalDate){
// Convert to java.sql.Date
methodName = "setJccDateAtName";
@@ -304,7 +304,7 @@
} else if (parameter instanceof java.sql.Timestamp){
methodName = "setJccTimestampAtName";
methodArgs = new Class[] {String.class, java.sql.Timestamp.class};
- parameters = new Object[] {name, (java.sql.Timestamp)parameter};
+ parameters = new Object[] {name, parameter};
} else if (parameter instanceof java.time.LocalDateTime){
// Convert to java.sql.Timestamp
methodName = "setJccTimestampAtName";
@@ -318,7 +318,7 @@
} else if (parameter instanceof java.sql.Time){
methodName = "setJccTimeAtName";
methodArgs = new Class[] {String.class, java.sql.Time.class};
- parameters = new Object[] {name, (java.sql.Time)parameter};
+ parameters = new Object[] {name, parameter};
} else if (parameter instanceof java.time.LocalTime){
java.time.LocalTime lt = (java.time.LocalTime) parameter;
java.sql.Timestamp ts = java.sql.Timestamp.valueOf(java.time.LocalDateTime.of(java.time.LocalDate.ofEpochDay(0), lt));
@@ -351,7 +351,7 @@
} else {
methodName = "setJccBytesAtName";
methodArgs = new Class[] {String.class, byte[].class};
- parameters = new Object[] {name, (byte[])parameter};
+ parameters = new Object[] {name, parameter};
}
}
// Next process types that need conversion.
@@ -374,15 +374,15 @@
} else if (parameter instanceof Character[]) {
methodName = "setJccStringAtName";
methodArgs = new Class[] {String.class, String.class};
- parameters = new Object[] {name, (String)convertObject(parameter, ClassConstants.STRING)};
+ parameters = new Object[] {name, convertObject(parameter, ClassConstants.STRING)};
} else if (parameter instanceof Byte[]) {
methodName = "setJccBytesAtName";
methodArgs = new Class[] {String.class, byte[].class};
- parameters = new Object[] {name, (byte[])convertObject(parameter, ClassConstants.APBYTE)};
+ parameters = new Object[] {name, convertObject(parameter, ClassConstants.APBYTE)};
} else if (parameter instanceof java.sql.SQLXML) {
methodName = "setJccSQLXMLAtName";
methodArgs = new Class[] {String.class, java.sql.SQLXML.class};
- parameters = new Object[] {name, (java.sql.SQLXML) parameter};
+ parameters = new Object[] {name, parameter};
} else if (parameter instanceof BindCallCustomParameter) {
((BindCallCustomParameter)(parameter)).set(this, statement, name, session);
} else if (typeConverters != null && typeConverters.containsKey(parameter.getClass())){
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/Oracle10Platform.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/Oracle10Platform.java
index 5559938..9240742 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/Oracle10Platform.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/Oracle10Platform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -34,6 +34,7 @@
* @param max
* @return
*/
+ @Override
protected String buildFirstRowsHint(int max){
//bug 374136: override setting the FIRST_ROWS hint as this is not needed on Oracle10g
return "";
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/Oracle9Platform.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/Oracle9Platform.java
index bf4d795..f235dd0 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/Oracle9Platform.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/Oracle9Platform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -33,6 +33,7 @@
* @param max
* @return
*/
+ @Override
protected String buildFirstRowsHint(int max){
return HINT_START + '(' + max + ')'+ HINT_END;
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/OraclePlatform.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/OraclePlatform.java
index 3503476..8a54cd8 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/OraclePlatform.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/OraclePlatform.java
@@ -1224,8 +1224,9 @@
* @param suppressLogging whether to suppress logging during query execution
* @return value of {@code true} if given table exists or {@code false} otherwise
*/
+ @Override
public boolean checkTableExists(final DatabaseSessionImpl session,
- final TableDefinition table, final boolean suppressLogging) {
+ final TableDefinition table, final boolean suppressLogging) {
try {
session.setLoggingOff(suppressLogging);
final Vector result = (Vector)session.executeQuery(getTableExistsQuery(table));
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/server/wls/WebLogic_10_Platform.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/server/wls/WebLogic_10_Platform.java
index 1524b64..1a50444 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/server/wls/WebLogic_10_Platform.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/server/wls/WebLogic_10_Platform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -324,7 +324,7 @@
if(classLoaderOrString instanceof ClassLoader) {
// If we are running a version of WebLogic 10.3 that does not support ExecuteThreadRuntime (from 10.3+) then use the ClassLoader
- String jpaModuleNameRoot = ((ClassLoader)classLoaderOrString).toString();
+ String jpaModuleNameRoot = classLoaderOrString.toString();
if(null != jpaModuleNameRoot) {
int startIndex = jpaModuleNameRoot.indexOf(
WLS_CLASSLOADER_APPLICATION_PU_SEARCH_STRING_PREFIX);
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sequencing/Sequence.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sequencing/Sequence.java
index bb04b9d..04643b8 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sequencing/Sequence.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/sequencing/Sequence.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -327,10 +327,10 @@
protected void verifyPlatform(Platform otherPlatform) {
if (getDatasourcePlatform() != otherPlatform) {
String hashCode1 = Integer.toString(System.identityHashCode(getDatasourcePlatform()));
- String name1 = ((DatasourcePlatform)getDatasourcePlatform()).toString() + '(' + hashCode1 + ')';
+ String name1 = getDatasourcePlatform().toString() + '(' + hashCode1 + ')';
String hashCode2 = Integer.toString(System.identityHashCode(otherPlatform));
- String name2 = ((DatasourcePlatform)otherPlatform).toString() + '(' + hashCode2 + ')';
+ String name2 = otherPlatform.toString() + '(' + hashCode2 + ')';
throw ValidationException.sequenceCannotBeConnectedToTwoPlatforms(getName(), name1, name2);
}
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/tools/schemaframework/StoredProcedureGenerator.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/tools/schemaframework/StoredProcedureGenerator.java
index 335f9b2..b234673 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/tools/schemaframework/StoredProcedureGenerator.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/tools/schemaframework/StoredProcedureGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -568,9 +568,9 @@
Class type = this.getFieldType(dataType);
String typeName = (String)dataRow.get("TYPE_NAME");
if ((type != null) || (typeName == null) || (typeName.length() == 0)) {
- definition.addArgument(prefixArgToken + (String)dataRow.get("COLUMN_NAME"), type, ((Number)dataRow.get("COLUMN_SIZE")).intValue());
+ definition.addArgument(prefixArgToken + dataRow.get("COLUMN_NAME"), type, ((Number)dataRow.get("COLUMN_SIZE")).intValue());
} else {
- definition.addArgument(prefixArgToken + (String)dataRow.get("COLUMN_NAME"), typeName);
+ definition.addArgument(prefixArgToken + dataRow.get("COLUMN_NAME"), typeName);
}
}
diff --git a/foundation/org.eclipse.persistence.extension/src/main/java/org/eclipse/persistence/logging/slf4j/SLF4JLogger.java b/foundation/org.eclipse.persistence.extension/src/main/java/org/eclipse/persistence/logging/slf4j/SLF4JLogger.java
index 6da1a04..51a73ef 100644
--- a/foundation/org.eclipse.persistence.extension/src/main/java/org/eclipse/persistence/logging/slf4j/SLF4JLogger.java
+++ b/foundation/org.eclipse.persistence.extension/src/main/java/org/eclipse/persistence/logging/slf4j/SLF4JLogger.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -248,9 +248,6 @@
return logLevels[category.getId()].shouldLog((byte)level);
}
- /**
- * {@inheritDoc}
- */
@Override
public void log(final SessionLogEntry logEntry) {
if (logEntry == null) {
diff --git a/foundation/org.eclipse.persistence.extension/src/test/java/org/eclipse/persistence/testing/tests/logging/slf4j/SLF4JLoggerHelper.java b/foundation/org.eclipse.persistence.extension/src/test/java/org/eclipse/persistence/testing/tests/logging/slf4j/SLF4JLoggerHelper.java
index 0dcf098..2639eae 100644
--- a/foundation/org.eclipse.persistence.extension/src/test/java/org/eclipse/persistence/testing/tests/logging/slf4j/SLF4JLoggerHelper.java
+++ b/foundation/org.eclipse.persistence.extension/src/test/java/org/eclipse/persistence/testing/tests/logging/slf4j/SLF4JLoggerHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -69,7 +69,7 @@
*/
private SessionLogEntry initLogEntry(
final LogCategory category, final LogLevel level) {
- final SessionLogEntry logEntry = new SessionLogEntry((AbstractSession)session);
+ final SessionLogEntry logEntry = new SessionLogEntry(session);
logEntry.setLevel(level.getId());
logEntry.setNameSpace(category.getName());
return logEntry;
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/models/employee/eis/xmlfile/NormalHoursNSTransformer.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/models/employee/eis/xmlfile/NormalHoursNSTransformer.java
index aa9fe85..d05c784 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/models/employee/eis/xmlfile/NormalHoursNSTransformer.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/models/employee/eis/xmlfile/NormalHoursNSTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,12 +38,14 @@
endTimeField = new XMLField("myns:END_TIME/text()");
}
+ @Override
public void initialize(AbstractTransformationMapping mapping) {
nsResolver = ((org.eclipse.persistence.eis.EISDescriptor)mapping.getDescriptor()).getNamespaceResolver();
startTimeField.setNamespaceResolver(nsResolver);
endTimeField.setNamespaceResolver(nsResolver);
}
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session) {
Employee employee = (Employee)instance;
if (fieldName.equalsIgnoreCase("myns:START_TIME/text()")) {
@@ -54,6 +56,7 @@
return null;
}
+ @Override
public Object buildAttributeValue(Record row, Object object, Session session) {
Time[] hours = new Time[2];
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/models/employee/eis/xmlfile/NormalHoursTransformer.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/models/employee/eis/xmlfile/NormalHoursTransformer.java
index e7f24a3..ab264f1 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/models/employee/eis/xmlfile/NormalHoursTransformer.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/models/employee/eis/xmlfile/NormalHoursTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,9 +26,11 @@
public NormalHoursTransformer() {
}
+ @Override
public void initialize(AbstractTransformationMapping mapping) {
}
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session) {
Employee employee = (Employee)instance;
if (fieldName.equalsIgnoreCase("START_TIME/text()")) {
@@ -39,6 +41,7 @@
return null;
}
+ @Override
public Object buildAttributeValue(Record row, Object object, Session session) {
Time[] hours = new Time[2];
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/OXTestCase.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/OXTestCase.java
index 477a4f7..f19efa1 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/OXTestCase.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/OXTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -231,6 +231,7 @@
}
}
+ @Override
public String getName() {
String longClassName = this.getClass().getName();
String shortClassName = longClassName.substring(longClassName.lastIndexOf(".") + 1, longClassName.length() - 1);
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/EISMappingTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/EISMappingTestCases.java
index d786c02..0da8eb1 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/EISMappingTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/EISMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,7 +90,7 @@
protected void setProject(Project project) {
if (!(metadata == Metadata.JAVA)) {
- String directorySetting = (String)((EISLogin)project.getDatasourceLogin()).getProperty("directory");
+ String directorySetting = (String) project.getDatasourceLogin().getProperty("directory");
StringWriter stringWriter = new StringWriter();
new XMLProjectWriter().write(project, stringWriter);
log("DEPLOYMENT XML: " + stringWriter.toString());
@@ -102,7 +102,7 @@
Class nextClass = (Class)keysIterator.next();
EISDescriptor next = (EISDescriptor)descriptors.get(nextClass);
for (int i = 0; i < next.getMappings().size(); i++) {
- DatabaseMapping nextMapping = (DatabaseMapping)next.getMappings().get(i);
+ DatabaseMapping nextMapping = next.getMappings().get(i);
if (nextMapping instanceof EISOneToOneMapping) {
String attrName = nextMapping.getAttributeName();
Call oldMappingCall = ((EISOneToOneMapping)nextMapping).getSelectionQuery().getDatasourceCall();
@@ -121,13 +121,14 @@
newProject.getDescriptor(nextClass).getQueryManager().setUpdateCall(next.getQueryManager().getUpdateCall());
}
- ((EISLogin)newProject.getDatasourceLogin()).setProperty("directory", directorySetting);
+ newProject.getDatasourceLogin().setProperty("directory", directorySetting);
session = newProject.createDatabaseSession();
} else {
session = project.createDatabaseSession();
}
}
+ @Override
public void setUp() {
try {
connection = connect();
@@ -139,7 +140,7 @@
}
public Connection connect() throws ResourceException {
- connectionFactory = (XMLFileConnectionFactory)new XMLFileConnectionFactory();
+ connectionFactory = new XMLFileConnectionFactory();
connection = connectionFactory.getConnection();
if (useLogging) {
@@ -150,6 +151,7 @@
return connection;
}
+ @Override
public void tearDown() {
try {
connection.close();
@@ -212,8 +214,8 @@
if (session.isConnected()) {
session.logout();
}
- String directory = (String)((EISLogin)session.getDatasourceLogin()).getProperty("directory");
- ((EISLogin)session.getDatasourceLogin()).setProperty("directory", directory + "/reading");
+ String directory = (String) session.getDatasourceLogin().getProperty("directory");
+ session.getDatasourceLogin().setProperty("directory", directory + "/reading");
session.login();
}
@@ -222,8 +224,8 @@
if (session.isConnected()) {
session.logout();
}
- String directory = (String)((EISLogin)session.getDatasourceLogin()).getProperty("directory");
- ((EISLogin)session.getDatasourceLogin()).setProperty("directory", directory + "/writing");
+ String directory = (String) session.getDatasourceLogin().getProperty("directory");
+ session.getDatasourceLogin().setProperty("directory", directory + "/writing");
session.login();
}
@@ -308,7 +310,7 @@
uow.commit();
session.getIdentityMapAccessor().initializeAllIdentityMaps();
- Vector afterDeleteObjects = (Vector)session.readAllObjects(getSourceClass());
+ Vector afterDeleteObjects = session.readAllObjects(getSourceClass());
this.assertEquals("Objects were not all deleted", 0, afterDeleteObjects.size());
log("****After commit deletes:");
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/arraylist/ArrayListTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/arraylist/ArrayListTestCases.java
index dde2593..b3f00be 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/arraylist/ArrayListTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/arraylist/ArrayListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new ArrayListProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -71,6 +72,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -79,15 +81,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
index fa5976d..8657a54 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new NestedOwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Company company = new Company();
company.setName("SomeCompany");
@@ -78,6 +79,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -86,15 +88,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Company.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/ownedtoexternalroot/OwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/ownedtoexternalroot/OwnedToExternalRootTestCases.java
index 425252c..4b5c425 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/ownedtoexternalroot/OwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/ownedtoexternalroot/OwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new OwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.setId(10);
@@ -74,6 +75,7 @@
return list;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -82,15 +84,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Team.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/roottoroot/RootToRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/roottoroot/RootToRootTestCases.java
index b3c3764..cab3e12 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/roottoroot/RootToRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/compositekey/roottoroot/RootToRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new RootToRootProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -73,6 +74,7 @@
//return employee1;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -81,16 +83,19 @@
return classes;
}
+@Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/IndirectionTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/IndirectionTestCases.java
index 5769e5b..b6f642a 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/IndirectionTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/IndirectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(new IndirectionProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -77,6 +78,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -85,15 +87,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/arraylist/IndirectionArrayListTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/arraylist/IndirectionArrayListTestCases.java
index c0f3062..9a80860 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/arraylist/IndirectionArrayListTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/arraylist/IndirectionArrayListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new IndirectionArrayListProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -70,6 +71,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -78,16 +80,19 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/map/IndirectionMapTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/map/IndirectionMapTestCases.java
index 3427b39..d9339a3 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/map/IndirectionMapTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/indirection/map/IndirectionMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new IndirectionMapProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -74,6 +75,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -82,15 +84,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/map/MapTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/map/MapTestCases.java
index bedbbee..66ff887 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/map/MapTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/map/MapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new MapProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -74,6 +75,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -82,15 +84,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/nestedforeignkey/NestedForeignKeyTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/nestedforeignkey/NestedForeignKeyTestCases.java
index a93259b..e43e1b7 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/nestedforeignkey/NestedForeignKeyTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/nestedforeignkey/NestedForeignKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new NestedForeignKeyProject());
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.setId(10);
@@ -75,6 +76,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -83,15 +85,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Team.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
index 67b3bf4..59d54cc 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new NestedOwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Company company = new Company();
company.setName("SomeCompany");
@@ -79,6 +80,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -87,14 +89,17 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Company.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/ownedtoexternalroot/OwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/ownedtoexternalroot/OwnedToExternalRootTestCases.java
index d4becf4..6492484 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/ownedtoexternalroot/OwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/ownedtoexternalroot/OwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setProject(new OwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.setId(10);
@@ -76,6 +77,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -84,15 +86,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Team.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/roottoroot/RootToRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/roottoroot/RootToRootTestCases.java
index c807662..2f8a9bc 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/roottoroot/RootToRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedgroupingelement/roottoroot/RootToRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setProject(new RootToRootProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -73,6 +74,7 @@
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -81,15 +83,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
index db13e39..5f6c0f1 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new NestedOwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Company company = new Company();
company.setName("SomeCompany");
@@ -78,6 +79,7 @@
return objects; }
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -86,15 +88,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Company.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/arraylist/NoGroupingElementArrayListTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/arraylist/NoGroupingElementArrayListTestCases.java
index 3c1f924..32f96e0 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/arraylist/NoGroupingElementArrayListTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/arraylist/NoGroupingElementArrayListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new NoGroupingElementArrayListProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -70,6 +71,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -79,16 +81,19 @@
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/NoGroupingElementIndirectionTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/NoGroupingElementIndirectionTestCases.java
index 443fdbd..b58b0c0 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/NoGroupingElementIndirectionTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/NoGroupingElementIndirectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setProject(new NoGroupingElementIndirectionProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -74,6 +75,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -82,15 +84,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/arraylist/NoGroupingElementIndirectionArrayListTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/arraylist/NoGroupingElementIndirectionArrayListTestCases.java
index d8074bd..41265b4 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/arraylist/NoGroupingElementIndirectionArrayListTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/arraylist/NoGroupingElementIndirectionArrayListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new NoGroupingElementIndirectionArrayListProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -70,6 +71,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -78,16 +80,19 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/map/NoGroupingElementIndirectionMapTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/map/NoGroupingElementIndirectionMapTestCases.java
index ed5b9e4..e5649ec 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/map/NoGroupingElementIndirectionMapTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/indirection/map/NoGroupingElementIndirectionMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new NoGroupingElementIndirectionMapProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -73,6 +74,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -81,16 +83,19 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/map/NoGroupingElementMapTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/map/NoGroupingElementMapTestCases.java
index 8dccc71..b5027cb 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/map/NoGroupingElementMapTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/map/NoGroupingElementMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new NoGroupingElementMapProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -73,6 +74,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -81,16 +83,19 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
index 617d55c..40118a2 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new NestedOwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Company company = new Company();
company.setName("SomeCompany");
@@ -79,6 +80,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -87,15 +89,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Company.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/ownedtoexternalroot/OwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/ownedtoexternalroot/OwnedToExternalRootTestCases.java
index e558024..ae42d8b 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/ownedtoexternalroot/OwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/ownedtoexternalroot/OwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new OwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.setId(10);
@@ -74,6 +75,7 @@
return objects; }
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -82,14 +84,17 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Team.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/roottoroot/RootToRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/roottoroot/RootToRootTestCases.java
index 8202de6..a10d223 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/roottoroot/RootToRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/nogroupingelement/roottoroot/RootToRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new RootToRootProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -71,6 +72,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -79,16 +81,19 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
index 1eec809..5032a79 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new OwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.setId(10);
@@ -75,6 +76,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -83,14 +85,17 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Team.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/roottoroot/RootToRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/roottoroot/RootToRootTestCases.java
index 94c5c08..a6f88e8 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/roottoroot/RootToRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyonsource/eis/roottoroot/RootToRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setProject(new RootToRootProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -72,6 +73,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -80,15 +82,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/Employee.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/Employee.java
index 7986ef2..8b3e8ba 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/Employee.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,7 +64,7 @@
returnString += "Projects: ";
for(int i=0; i<projects.size(); i++)
{
- returnString += ((Project)projects.elementAt(i)).toString() + " ";
+ returnString += projects.elementAt(i).toString() + " ";
}
}
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
index 4c405a0..0a9a5e5 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setProject(new NestedOwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
ArrayList objects = new ArrayList();
@@ -89,6 +90,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses() {
ArrayList classes = new ArrayList();
classes.add(Company.class);
@@ -96,14 +98,17 @@
return classes;
}
+ @Override
protected Class getSourceClass() {
return Company.class;
}
+ @Override
protected String getTestDocument() {
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables() {
// Drop tables
XQueryInteraction interaction = new XQueryInteraction();
@@ -126,6 +131,7 @@
session.executeNonSelectingCall(interaction);
}
+ @Override
public void testXMLDocumentToObject() throws Exception {
updateProjectForReading();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
index a4672f8..e24a9b5 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setProject(new OwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.setId(10);
@@ -79,6 +80,7 @@
}
+ @Override
protected ArrayList getRootClasses() {
ArrayList classes = new ArrayList();
classes.add(Team.class);
@@ -86,14 +88,17 @@
return classes;
}
+ @Override
protected Class getSourceClass() {
return Team.class;
}
+ @Override
protected String getTestDocument() {
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables() {
// Drop tables
XQueryInteraction interaction = new XQueryInteraction();
@@ -116,6 +121,7 @@
session.executeNonSelectingCall(interaction);
}
+ @Override
public void testXMLDocumentToObject() throws Exception {
updateProjectForReading();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/roottoroot/RootToRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/roottoroot/RootToRootTestCases.java
index d7162c9..8567d21 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/roottoroot/RootToRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetomany/keyontarget/eis/roottoroot/RootToRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setProject(new RootToRootProject());
}
+ @Override
protected Object getControlObject() {
ArrayList objects = new ArrayList();
@@ -87,6 +88,7 @@
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -95,15 +97,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
@@ -129,7 +134,9 @@
// Override the following tests so they are not run
// TODO: debug and attempt to resolve the test failures
+ @Override
public void testObjectToXMLDocumentUOW() throws Exception {}
+ @Override
public void testObjectToXMLDocument() throws Exception {}
}
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/compositekey/CompositeKeyTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/compositekey/CompositeKeyTestCases.java
index b6f4f36..de26eae 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/compositekey/CompositeKeyTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/compositekey/CompositeKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new CompositeKeyProject());
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.setId(10);
@@ -72,6 +73,7 @@
return list;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -80,15 +82,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Team.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
index be0c3b6..1d1ea69 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new NestedOwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Company company = new Company();
company.setName("SomeCompany");
@@ -81,6 +82,7 @@
return objects; }
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -89,14 +91,17 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Company.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nointeraction/NoInteractionTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nointeraction/NoInteractionTestCases.java
index 0cd6faf..c7f20cb 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nointeraction/NoInteractionTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nointeraction/NoInteractionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setProject(new NoInteractionProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -68,6 +69,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -76,14 +78,17 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nullkey/NullKeyTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nullkey/NullKeyTestCases.java
index 13a8e46..fd7e6b3 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nullkey/NullKeyTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/nullkey/NullKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new NullKeyProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -69,6 +70,7 @@
return list;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -77,15 +79,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
index e2be47e..f62b7b8 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new OwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.setId(10);
@@ -73,6 +74,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -81,14 +83,17 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Team.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/roottoroot/RootToRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/roottoroot/RootToRootTestCases.java
index 7777c7e..2f807ca 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/roottoroot/RootToRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyonsource/eis/roottoroot/RootToRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setProject(new RootToRootProject());
}
+ @Override
protected Object getControlObject() {
Project project1 = new Project();
@@ -68,6 +69,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -76,14 +78,17 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
index 14533c4..0c8294c 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/nestedownedtoexternalroot/NestedOwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setProject(new NestedOwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Company company = new Company();
company.setName("SomeCompany");
@@ -79,6 +80,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses() {
ArrayList classes = new ArrayList();
classes.add(Company.class);
@@ -86,14 +88,17 @@
return classes;
}
+ @Override
protected Class getSourceClass() {
return Company.class;
}
+ @Override
protected String getTestDocument() {
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables() {
// Drop tables
XQueryInteraction interaction = new XQueryInteraction();
@@ -116,6 +121,7 @@
session.executeNonSelectingCall(interaction);
}
+ @Override
public void testXMLDocumentToObject() throws Exception {
updateProjectForReading();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/nullkey/NullKeyTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/nullkey/NullKeyTestCases.java
index c31c36e..ad74359 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/nullkey/NullKeyTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/nullkey/NullKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(new NullKeyProject());
}
+ @Override
protected Object getControlObject() {
ArrayList objects = new ArrayList();
@@ -69,6 +70,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -77,14 +79,17 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
index b9406d7..b68c16a 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/ownedtoexternalroot/OwnedToExternalRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setProject(new OwnedToExternalRootProject());
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.setId(10);
@@ -79,6 +80,7 @@
return objects;
}
+ @Override
protected ArrayList getRootClasses() {
ArrayList classes = new ArrayList();
classes.add(Team.class);
@@ -86,14 +88,17 @@
return classes;
}
+ @Override
protected Class getSourceClass() {
return Team.class;
}
+ @Override
protected String getTestDocument() {
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables() {
// Drop tables
XQueryInteraction interaction = new XQueryInteraction();
@@ -116,6 +121,7 @@
session.executeNonSelectingCall(interaction);
}
+ @Override
public void testXMLDocumentToObject() throws Exception {
updateProjectForReading();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/roottoroot/RootToRootTestCases.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/roottoroot/RootToRootTestCases.java
index 118427f..e4408e0 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/roottoroot/RootToRootTestCases.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/oxm/mappings/onetoone/keyontarget/eis/roottoroot/RootToRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setProject(new RootToRootProject());
}
+ @Override
protected Object getControlObject() {
ArrayList objects = new ArrayList();
@@ -85,6 +86,7 @@
}
+ @Override
protected ArrayList getRootClasses()
{
ArrayList classes = new ArrayList();
@@ -93,15 +95,18 @@
return classes;
}
+ @Override
protected Class getSourceClass(){
return Employee.class;
}
+ @Override
protected String getTestDocument()
{
return XML_TEST_RESOURCE;
}
+ @Override
protected void createTables()
{
// Drop tables
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/BasicReadWriteTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/BasicReadWriteTest.java
index d710760..f81060a 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/BasicReadWriteTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/BasicReadWriteTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
return "This test will take a database row, write its contents to a byte array and then " + "read the contents back into another database row, then compare the results to assure " + "the two rows are equal";
}
+ @Override
protected void test() {
RecordMetaData recordMetaData = CobolTestModel.getConversionRecord();
row = CobolTestModel.getConversionRow();
@@ -49,6 +50,7 @@
}
}
+ @Override
protected void verify() throws TestException {
if (!CobolTestModel.compareCobolRows(row, resultRow)) {
TestErrorException exception = new TestErrorException("The rows do not match.");
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/ComplexPicStatementTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/ComplexPicStatementTest.java
index 2da10cd..5cea87f 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/ComplexPicStatementTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/ComplexPicStatementTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
return "This test will parse a record which contains complex picture statements.";
}
+ @Override
protected void test() {
ByteArrayInputStream inputStream = new ByteArrayInputStream(CobolTestModel.getComplexPicStatementCopyBookString().getBytes());
CopyBookParser parser = new CopyBookParser();
@@ -37,6 +38,7 @@
}
}
+ @Override
protected void verify() throws TestException {
RecordMetaData record = (RecordMetaData)records.firstElement();
if (!CobolTestModel.compareCompositeObjects(record, CobolTestModel.getComplexPicStatementRecord())) {
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/DeepNestedParseTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/DeepNestedParseTest.java
index 86c5e48..c66b8ef 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/DeepNestedParseTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/DeepNestedParseTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
return "This test will parse a record which is nested very deeply.";
}
+ @Override
protected void test() {
ByteArrayInputStream inputStream = new ByteArrayInputStream(CobolTestModel.getDeepNestedCopyBookString().getBytes());
CopyBookParser parser = new CopyBookParser();
@@ -41,6 +42,7 @@
}
}
+ @Override
protected void verify() throws TestException {
RecordMetaData record = (RecordMetaData)records.firstElement();
if (!CobolTestModel.compareCompositeObjects(record, CobolTestModel.getDeepNestedRecord())) {
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/FillerNameTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/FillerNameTest.java
index 90b85f4..ef679d5 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/FillerNameTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/FillerNameTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
return "This test will parse a record which contains a record with no name and assure it replaces it with filler";
}
+ @Override
protected void test() {
ByteArrayInputStream inputStream = new ByteArrayInputStream(CobolTestModel.getFillerCopyBookString().getBytes());
CopyBookParser parser = new CopyBookParser();
@@ -37,6 +38,7 @@
}
}
+ @Override
protected void verify() throws TestException {
RecordMetaData record = (RecordMetaData)records.firstElement();
if (!compareFillerRecords(record, CobolTestModel.getFillerRecord())) {
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/MultipleRecordParseTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/MultipleRecordParseTest.java
index e8ca151..7f5517e 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/MultipleRecordParseTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/MultipleRecordParseTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
return "This test will parse a stream containing multiple records and extraneous information.";
}
+ @Override
protected void test() {
ByteArrayInputStream inputStream = new ByteArrayInputStream(CobolTestModel.getMultipleRecordString().getBytes());
CopyBookParser parser = new CopyBookParser();
@@ -37,6 +38,7 @@
}
}
+ @Override
protected void verify() {
Enumeration recordsEnum = records.elements();
Enumeration recordsEnum2 = CobolTestModel.getMultipleRecords().elements();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/OccursDependsOnParseTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/OccursDependsOnParseTest.java
index 77c6b1a..0ddb7ac 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/OccursDependsOnParseTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/OccursDependsOnParseTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
return "This test will parse a record which contains a field with an occurs statement, and a depends on statement.";
}
+ @Override
protected void test() {
ByteArrayInputStream inputStream = new ByteArrayInputStream(CobolTestModel.getOccursDependsCopyBookString().getBytes());
CopyBookParser parser = new CopyBookParser();
@@ -41,6 +42,7 @@
}
}
+ @Override
protected void verify() throws TestException {
RecordMetaData record = (RecordMetaData)records.firstElement();
if (!CobolTestModel.compareCompositeObjects(record, CobolTestModel.getOccursDependsRecord())) {
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/RedefineConverterTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/RedefineConverterTest.java
index 786e3af..7fad27a 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/RedefineConverterTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/RedefineConverterTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
return "This test will take a database row, write its contents to a byte array and then " + "read the contents back into another database row, then compare the results to assure " + "the two rows are equal";
}
+ @Override
protected void test() {
RecordMetaData recordMetaData = CobolTestModel.getConversionRecord();
row = CobolTestModel.getConversionRow();
@@ -51,6 +52,7 @@
}
}
+ @Override
protected void verify() throws TestException {
if (!CobolTestModel.compareCobolRows(row, resultRow)) {
TestErrorException exception = new TestErrorException("The rows do not match.");
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/RedefinesParsingTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/RedefinesParsingTest.java
index 74d2579..9c09195 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/RedefinesParsingTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/RedefinesParsingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
return "This test will parse a record which contains fields with redefines.";
}
+ @Override
protected void test() {
ByteArrayInputStream inputStream = new ByteArrayInputStream(CobolTestModel.getRedefinesCopyBookString().getBytes());
CopyBookParser parser = new CopyBookParser();
@@ -41,6 +42,7 @@
}
}
+ @Override
protected void verify() throws TestException {
RecordMetaData record = (RecordMetaData)records.firstElement();
if (!CobolTestModel.compareCompositeObjects(record, CobolTestModel.getRedefinesRecord())) {
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/SimpleCobolParsingTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/SimpleCobolParsingTest.java
index b5c8ff2..2450fb0 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/SimpleCobolParsingTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/cobol/SimpleCobolParsingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
return "This test parses a simple Cobol Copybook, and checks that the parser builds the " + "appropriate hierarchical record field structure.";
}
+ @Override
protected void test() {
ByteArrayInputStream inputStream = new ByteArrayInputStream(CobolTestModel.getSimpleCopyBookString().getBytes());
CopyBookParser parser = new CopyBookParser();
@@ -41,6 +42,7 @@
}
}
+ @Override
protected void verify() throws TestException {
RecordMetaData record = (RecordMetaData)records.firstElement();
if (!CobolTestModel.compareCompositeObjects(record, CobolTestModel.getSimpleRecord())) {
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/ConnectTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/ConnectTest.java
index 1acae12..ff29c2f 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/ConnectTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/ConnectTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setDescription("This tests connecting TopLink EIS to the XML file connector.");
}
+ @Override
public void test() throws Exception {
testDatabaseSession();
testServerSession();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/DirectConnectTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/DirectConnectTest.java
index 900a4f5..45a8d35 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/DirectConnectTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/DirectConnectTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
this.setDescription("Test conecting directly through the emulated xml file adapter");
}
+ @Override
public void test() throws Exception {
Connection connection = connect();
connection.close();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/DirectInteractionTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/DirectInteractionTest.java
index 0dfe9b6..f06f774 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/DirectInteractionTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/DirectInteractionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setDescription("Testing interaction XML data");
}
+ @Override
public void test() throws Exception {
connection = connect();
recordFactory = connectionFactory.getRecordFactory();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeBasicTestModel.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeBasicTestModel.java
index dabd54e..7007118 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeBasicTestModel.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeBasicTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,10 +26,12 @@
setDescription("This model tests reading/writing/deleting JCA XFA using the employee demo.");
}
+ @Override
public void addRequiredSystems() {
addRequiredSystem(new EmployeeSystem());
}
+ @Override
public void addTests() {
addTest(getReadObjectTestSuite());
addTest(getUpdateObjectTestSuite());
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeNSBasicTestModel.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeNSBasicTestModel.java
index 2135e90..4afbf68 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeNSBasicTestModel.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeNSBasicTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
super();
}
+ @Override
public void addRequiredSystems() {
addRequiredSystem(new EmployeeNSSystem());
}
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeNSSystem.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeNSSystem.java
index c9a09bc..fafba5d 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeNSSystem.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeNSSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
project = XMLProjectReader.read("org/eclipse/persistence/testing/models/employee/eis/xmlfile/employee-ns-project.xml", getClass().getClassLoader());
}
+ @Override
public void addDescriptors(DatabaseSession session) {
if (project == null) {
project = XMLProjectReader.read("org/eclipse/persistence/testing/models/employee/eis/xmlfile/employee-ns-project.xml", getClass().getClassLoader());
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeSystem.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeSystem.java
index d30a42c..b9be897 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeSystem.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/EmployeeSystem.java
@@ -48,6 +48,7 @@
project = XMLProjectReader.read("org/eclipse/persistence/testing/models/employee/eis/xmlfile/employee-project.xml", getClass().getClassLoader());
}
+ @Override
public void addDescriptors(DatabaseSession session) {
if (project == null) {
project = XMLProjectReader.read("org/eclipse/persistence/testing/models/employee/eis/xmlfile/employee-project.xml", getClass().getClassLoader());
@@ -56,6 +57,7 @@
session.addDescriptors(project);
}
+ @Override
public void createTables(DatabaseSession session) {
// Drop tables
XQueryInteraction interaction = new XQueryInteraction();
@@ -113,6 +115,7 @@
* This method will instantiate all of the example instances and insert them into the database
* using the given session.
*/
+ @Override
public void populate(DatabaseSession session) {
EmployeePopulator system = new EmployeePopulator();
UnitOfWork unitOfWork = session.acquireUnitOfWork();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/ReadWriteTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/ReadWriteTest.java
index 0f0df01..23a3289 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/ReadWriteTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/ReadWriteTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setDescription("Testing reading and writing the order model.");
}
+ @Override
public void setup() {
// Reset the databse (delete xml file).
XMLInteraction deleteCall = new XMLInteraction();
@@ -42,6 +43,7 @@
getSession().executeNonSelectingCall(deleteCall);
}
+ @Override
public void test() throws Exception {
DatabaseSession session = (DatabaseSession)getSession();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/UnitOfWorkTest.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/UnitOfWorkTest.java
index 6b97dc4..eb9d7ad 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/UnitOfWorkTest.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/UnitOfWorkTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setDescription("Testing unit of work with the XML file adapter.");
}
+ @Override
public void setup() {
// Reset the databse (delete xml file).
XMLInteraction deleteCall = new XMLInteraction();
@@ -42,6 +43,7 @@
getSession().executeNonSelectingCall(deleteCall);
}
+ @Override
public void test() throws Exception {
Session session = getSession();
session.getIdentityMapAccessor().initializeIdentityMaps();
diff --git a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/XMLFileTestModel.java b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/XMLFileTestModel.java
index 138ab83..3df0fe4 100644
--- a/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/XMLFileTestModel.java
+++ b/foundation/org.eclipse.persistence.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/xmlfile/XMLFileTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setDescription("Test TopLink EIS with an emulated xml file adapter.");
}
+ @Override
public void addTests() {
TestSuite directSuite = new TestSuite();
directSuite.setName("DirectTestSuite");
@@ -49,6 +50,7 @@
}
+ @Override
public void setup() {
oldSession = getSession();
DatabaseSession session = XMLProjectReader.read("org/eclipse/persistence/testing/models/order/eis/xmlfile/order-project.xml", getClass().getClassLoader()).createDatabaseSession();
@@ -62,6 +64,7 @@
}
+ @Override
public void reset() {
getDatabaseSession().logout();
getExecutor().setSession(oldSession);
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/eis/adapters/jms/JMSPlatform.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/eis/adapters/jms/JMSPlatform.java
index a682918..4ec8daa 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/eis/adapters/jms/JMSPlatform.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/eis/adapters/jms/JMSPlatform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -151,12 +151,12 @@
// set the send destination URL - if one exists
property = (String)interaction.getProperty(DESTINATION_URL);
if (property != null) {
- ((CciJMSSendReceiveInteractionSpec)jmsSpec).setDestinationURL(property);
+ jmsSpec.setDestinationURL(property);
} else {
// if no JNDI lookup, set the send destination - if one exists
property = (String)interaction.getProperty(DESTINATION);
if (property != null) {
- ((CciJMSSendReceiveInteractionSpec)jmsSpec).setDestination(property);
+ jmsSpec.setDestination(property);
} else {
// need to have either the destination or JNDI lookup defined
throw EISException.propertiesNotSet(DESTINATION_URL, DESTINATION);
diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/nosql/adapters/mongo/MongoPlatform.java b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/nosql/adapters/mongo/MongoPlatform.java
index 52b5837..022f7c8 100644
--- a/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/nosql/adapters/mongo/MongoPlatform.java
+++ b/foundation/org.eclipse.persistence.nosql/src/main/java/org/eclipse/persistence/nosql/adapters/mongo/MongoPlatform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -468,11 +468,11 @@
|| ((QueryKeyExpression)queryKeyExpression.getBaseExpression()).getMapping().isAbstractCompositeDirectCollectionMapping())) {
queryKeyExpression = (QueryKeyExpression)queryKeyExpression.getBaseExpression();
if (queryKeyExpression.getMapping().isAbstractCompositeObjectMapping()) {
- name = ((AbstractCompositeObjectMapping)queryKeyExpression.getMapping()).getField().getName() + "." + name;
+ name = queryKeyExpression.getMapping().getField().getName() + "." + name;
} else if (queryKeyExpression.getMapping().isAbstractCompositeCollectionMapping()) {
- name = ((AbstractCompositeCollectionMapping)queryKeyExpression.getMapping()).getField().getName() + "." + name;
+ name = queryKeyExpression.getMapping().getField().getName() + "." + name;
} else if (queryKeyExpression.getMapping().isAbstractCompositeDirectCollectionMapping()) {
- name = ((AbstractCompositeDirectCollectionMapping)queryKeyExpression.getMapping()).getField().getName() + "." + name;
+ name = queryKeyExpression.getMapping().getField().getName() + "." + name;
}
}
DatabaseField field = new DatabaseField();
diff --git a/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/aq/OrderQueueTest.java b/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/aq/OrderQueueTest.java
index fe8ba41..c67fdf4 100644
--- a/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/aq/OrderQueueTest.java
+++ b/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/eis/aq/OrderQueueTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -109,6 +109,7 @@
/**
* Thread main execution method.
*/
+ @Override
public void run() {
final DatabaseSession threadSession = SessionHelper.createDatabaseSession(AQTestSuite.project);
while (!done) {
diff --git a/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/nosql/EntityManagerHelper.java b/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/nosql/EntityManagerHelper.java
index 051045f..e074e68 100644
--- a/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/nosql/EntityManagerHelper.java
+++ b/foundation/org.eclipse.persistence.oracle.nosql/src/it/java/org/eclipse/persistence/testing/tests/nosql/EntityManagerHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -89,10 +89,10 @@
LOG.log(SessionLog.WARNING, String.format(
"ServerPlatform is unknown, using default EntityManagerFactory to create EntityManager"));
return JUnitTestCase.getEntityManagerFactory(puName, emProperties, descriptors)
- .createEntityManager((SynchronizationType)null, emProperties); }
+ .createEntityManager(null, emProperties); }
} else {
return JUnitTestCase.getEntityManagerFactory(puName, emProperties, descriptors)
- .createEntityManager((SynchronizationType)null, emProperties);
+ .createEntityManager(null, emProperties);
}
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/framework/oracle/OracleDBPlatformHelper.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/framework/oracle/OracleDBPlatformHelper.java
index b6c2780..4300885 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/framework/oracle/OracleDBPlatformHelper.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/framework/oracle/OracleDBPlatformHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,10 +20,12 @@
public class OracleDBPlatformHelper extends org.eclipse.persistence.testing.framework.OracleDBPlatformHelper{
+ @Override
public OraclePlatform getOracle8Platform(){
return new Oracle8Platform();
}
+ @Override
public OraclePlatform getOracle9Platform(){
return new Oracle9Platform();
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/models/jpa/customfeatures/XmlDataCustomizer.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/models/jpa/customfeatures/XmlDataCustomizer.java
index 3b28b15..29a7405 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/models/jpa/customfeatures/XmlDataCustomizer.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/models/jpa/customfeatures/XmlDataCustomizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
public class XmlDataCustomizer implements DescriptorCustomizer {
+ @Override
public void customize(final ClassDescriptor descriptor) throws Exception{
descriptor.removeMappingForAttributeName("resume_xml");
DirectToXMLTypeMapping mapping1 = new DirectToXMLTypeMapping();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/OracleTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/OracleTestModel.java
index bde0b7a..f3a3fd1 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/OracleTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/OracleTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
addTests();
}
+ @Override
public void addTests() {
if (!getTests().isEmpty()) {
return;
@@ -71,6 +72,7 @@
// Sort the tests alphabetically.
Collections.sort(this.getTests(), new Comparator() {
+ @Override
public int compare(Object left, Object right) {
return Helper.getShortClassName(left.getClass()).compareTo(Helper.getShortClassName(right.getClass()));
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/ConversionManagerOracleTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/ConversionManagerOracleTestModel.java
index ccbab1a..0c4aad7 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/ConversionManagerOracleTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/ConversionManagerOracleTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,10 +23,12 @@
setDescription("This suite tests Oracle-specific conversions through direct field mapping.");
}
+ @Override
public void addForcedRequiredSystems() {
addForcedRequiredSystem(new ConversionManagerSystem());
}
+ @Override
public void addTests() {
addTest(getSupportedTypesTestSuite());
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedFromAClassForOracle9Test.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedFromAClassForOracle9Test.java
index 887df62..dc9bb65 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedFromAClassForOracle9Test.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedFromAClassForOracle9Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setDescription("Test getDataTypesConvertedFrom() in Oracle9Platform.");
}
+ @Override
public void setup() {
if(!getSession().getPlatform().isOracle()) {
throw new TestWarningException("This test requires Oracle database");
@@ -32,6 +33,7 @@
cm = getSession().getPlatform();
}
+ @Override
protected boolean isChar(Class aClass) {
return super.isChar(aClass) || aClass == Oracle9Platform.NCHAR || aClass == Oracle9Platform.NSTRING ||
aClass == Oracle9Platform.NCLOB;
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedFromAClassTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedFromAClassTest.java
index 728a2a2..02982c1 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedFromAClassTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedFromAClassTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,10 +39,12 @@
setDescription("Test getDataTypesConvertedFrom() in ConversionManager.");
}
+ @Override
public void setup() {
cm = ConversionManager.getDefaultManager();
}
+ @Override
public void test() {
Vector vec;
int x;
@@ -80,6 +82,7 @@
}
}
+ @Override
public void verify() {
if (exception1 != null) {
throw (new TestErrorException(exception1.toString()));
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedToAClassForOracle9Test.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedToAClassForOracle9Test.java
index 5494924..bd791b0 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedToAClassForOracle9Test.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedToAClassForOracle9Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setDescription("Test getDataTypesConvertedTo() in Oracle9Platform.");
}
+ @Override
public void setup() {
if(!getSession().getPlatform().isOracle()) {
throw new TestWarningException("This test requires Oracle database");
@@ -44,6 +45,7 @@
cm = getSession().getPlatform();
}
+ @Override
protected boolean isChar(Class aClass) {
return super.isChar(aClass) || aClass == Oracle9Platform.NCHAR || aClass == Oracle9Platform.NSTRING ||
aClass == Oracle9Platform.NCLOB;
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedToAClassTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedToAClassTest.java
index a61b79a..5204352 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedToAClassTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/conversion/DataTypesConvertedToAClassTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,10 +41,12 @@
setDescription("Test getDataTypesConvertedTo() in ConversionManager.");
}
+ @Override
public void setup() {
cm = ConversionManager.getDefaultManager();
}
+ @Override
public void test() {
Vector vec;
int x;
@@ -84,6 +86,7 @@
}
}
+ @Override
public void verify() {
if (exception1 != null) {
throw (new TestErrorException(exception1.toString()));
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/CacheInvalidationMessageListener.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/CacheInvalidationMessageListener.java
index 294efd0..c1c8f34 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/CacheInvalidationMessageListener.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/CacheInvalidationMessageListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
super(session, connection, timeToWait);
}
+ @Override
public void onMessage(javax.jms.Message message) {
try {
invalidator.invalidateObject(session, message);
@@ -36,6 +37,7 @@
}
}
+ @Override
public void askToStopAfter(int numMessagesExpected, long timeDead) throws InterruptedException {
try {
super.askToStopAfter(numMessagesExpected, timeDead);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/CacheInvalidationRunnable.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/CacheInvalidationRunnable.java
index d49f672..7e67e4e 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/CacheInvalidationRunnable.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/CacheInvalidationRunnable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
this.messageConsumer = messageConsumer;
}
+ @Override
public void run() {
lock = new Lock();
try {
@@ -77,6 +78,7 @@
}
}
+ @Override
public void askToStopAfter(int numMessagesExpected, long timeDead) throws InterruptedException {
super.askToStopAfter(numMessagesExpected, timeDead);
try {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationAdapter.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationAdapter.java
index 1c5745a..d2d7808 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationAdapter.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
this.useMultipleConsumers = useMultipleConsumers;
}
+ @Override
public boolean isOriginalSetupRequired() {
return false;
}
@@ -48,6 +49,7 @@
boolean useMultipleConsumers;
Hashtable tableNamesToPkFields = new Hashtable();
+ @Override
public void updateProject(Project project, Session session) {
Iterator it = project.getDescriptors().values().iterator();
while (it.hasNext()) {
@@ -65,6 +67,7 @@
}
}
+ @Override
public void updateDatabase(Session session) {
if (!session.getPlatform().isOracle()) {
throw new TestWarningException("Currently supports Oracle platform only");
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationInternalTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationInternalTestModel.java
index 3c295ac..66f28c9 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationInternalTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationInternalTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,11 +65,13 @@
this.aqPassword = aqPassword;
}
+ @Override
public void addTests() {
addTest(new DbChangeNotificationTest(aqUser, aqPassword, queueName, useMultipleConsumers, false));
addTest(new DbChangeNotificationTest(aqUser, aqPassword, queueName, useMultipleConsumers, true));
}
+ @Override
public void addRequiredSystems() {
setupUser();
@@ -107,6 +109,7 @@
}
}
+ @Override
public void reset() {
getExecutor().removeConfigureSystem(new TestSystemAdapted());
if (oldSession != getSession()) {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationTest.java
index aa44ef5..be81b0b 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/dbchangenotification/DbChangeNotificationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,6 +68,7 @@
setName(getName() + uses + type);
}
+ @Override
protected void setup() throws Exception {
javax.jms.TopicConnectionFactory topicConnectionFactory = null;
javax.jms.QueueConnectionFactory queueConnectionFactory = null;
@@ -126,6 +127,7 @@
Thread.sleep(1000);
}
+ @Override
protected void test() throws Exception {
int[] numMessagesExpected = new int[n];
int numUpdated;
@@ -180,6 +182,7 @@
}
}
+ @Override
protected void verify() throws Exception {
Thread.sleep(1000);
// 1 ********************************************************
@@ -255,6 +258,7 @@
}
}
+ @Override
public void reset() throws Exception {
// disable sending notification messages - set appId to null
getSession().executeNonSelectingCall(new SQLCall("BEGIN NOTIFY_SET_APPID; END;"));
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSRCMDistributedServer.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSRCMDistributedServer.java
index b21b5df..21e1b15 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSRCMDistributedServer.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSRCMDistributedServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,10 +26,12 @@
/**
* This method starts the server and makes the dispatcher available
*/
+ @Override
public void run() {
JMSSetupHelper.getHelper().startCacheSynchronization((org.eclipse.persistence.internal.sessions.AbstractSession)session, false);
}
+ @Override
public void stopServer() {
JMSSetupHelper.getHelper().stopCacheSynchronization((org.eclipse.persistence.internal.sessions.AbstractSession)session);
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSRCMDistributedServersModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSRCMDistributedServersModel.java
index ea7c4a9..400c4b9 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSRCMDistributedServersModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSRCMDistributedServersModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
grant execute on dbms_aqjms_internal to aquser
connect aquser/aquser
*/
+ @Override
public void setup() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("Supports Oracle platform only: uses Oracle AQ");
@@ -57,10 +58,12 @@
/**
* Factory method for a DistributedServer.
*/
+ @Override
public DistributedServer createDistributedServer(Session session) {
return new JMSRCMDistributedServer((DatabaseSession)session);
}
+ @Override
protected JMSSetupHelper getHelper() {
return JMSSetupHelper.getHelper();
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSSetupHelper.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSSetupHelper.java
index 6c0a1a4..57f499b 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSSetupHelper.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/distributedservers/rcm/jms/JMSSetupHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
// however in Oc4jJGroups case the only (local and external) connection is not removed
// unless message sending fails.
+ @Override
public boolean isLocalConnectionRemovedOnListeningError() {
return true;
}
@@ -64,6 +65,7 @@
// Returns errorCode of RemoteCommandManagerException thrown in case
// creation of localConnection has failed.
+ @Override
public int getRcmExceptionErrorCodeOnFailureToCreateLocalConnection() {
return RemoteCommandManagerException.ERROR_CREATING_LOCAL_JMS_CONNECTION;
}
@@ -71,6 +73,7 @@
// JMSTopicTransportManager has separate connection for sending (external) and receiving (local) messages.
// Oc4jJGroups uses a single connection for both sending and receiving messages.
+ @Override
public boolean isLocalConnectionAlsoExternalConnection() {
return false;
}
@@ -99,6 +102,7 @@
// returns array of two objects: the first is factory, the second is topic
+ @Override
protected Object[] internalCreateFactory() throws Exception {
updateDbSettings();
if (oracleDataSource != null) {
@@ -125,14 +129,17 @@
return new Object[] { topicConnectionFactory, topic };
}
+ @Override
protected void internalStartFactory() throws Exception {
startInDb();
}
+ @Override
protected void internalStopFactory() throws Exception {
stopInDb();
}
+ @Override
protected void internalDestroyFactory() throws Exception {
try {
stopInDb();
@@ -148,6 +155,7 @@
}
}
+ @Override
protected void createTransportManager(RemoteCommandManager rcm) {
JMSTopicTransportManager tm = new JMSTopicTransportManager(rcm);
Properties props = new Properties();
@@ -220,6 +228,7 @@
// Sends an arbitrary message to speed up shut down of listening threads.
+ @Override
protected void sendMessageToStopListenerThreads() throws Exception {
Context context = new InitialContext(CONTEXT_PROPERTIES);
TopicConnectionFactory topicConnectionFactory = (TopicConnectionFactory)context.lookup(this.factoryJndiName);
@@ -235,6 +244,7 @@
}
}
+ @Override
protected void createExternalConnection(AbstractSession session) {
((JMSTopicTransportManager)session.getCommandManager().getTransportManager()).createExternalConnection();
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/proxyauthentication/ProxyAuthenticationServerTestSuite.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/proxyauthentication/ProxyAuthenticationServerTestSuite.java
index 76844fd..8aa09f8 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/proxyauthentication/ProxyAuthenticationServerTestSuite.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/proxyauthentication/ProxyAuthenticationServerTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -406,7 +406,7 @@
try {
beginTransaction_proxy(em);
// read
- employeeRead = (Employee)em.find(Employee.class, employee.getId());
+ employeeRead = em.find(Employee.class, employee.getId());
if (employeeRead != null) {
// clean-up
em.remove(employeeRead);
@@ -486,7 +486,7 @@
System.out.println("Currently only WLS 10.3.4 and later is known to fully support Oracle Proxy Authentication in both JTA and Non Jta cases.");
return;
}
- if(((DatabaseLogin)serverSession.getReadConnectionPool().getLogin()).shouldUseExternalTransactionController()) {
+ if(serverSession.getReadConnectionPool().getLogin().shouldUseExternalTransactionController()) {
throw new RuntimeException("Test problem: non jta data source is required");
}
System.out.println("====testNonJtaDataSource begin");
@@ -624,6 +624,7 @@
return WebLogicPlatform.class.isAssignableFrom(serverSession.getServerPlatform().getClass()) && Helper.compareVersions(getServerSession(PROXY_PU).getServerPlatform().getServerNameAndVersion(), "10.3.4") >= 0;
}
+ @Override
protected Properties getServerProperties(){
String proxy_user=System.getProperty("proxy.user.name");
Properties p = new Properties();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/proxyauthentication/ProxyAuthenticationTestSuite.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/proxyauthentication/ProxyAuthenticationTestSuite.java
index b4caa4d..60b81b3 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/proxyauthentication/ProxyAuthenticationTestSuite.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/proxyauthentication/ProxyAuthenticationTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,6 +66,7 @@
// writeUser is set by an event risen by ModifyQuery.
private static String writeUser;
public static class Listener extends SessionEventAdapter {
+ @Override
public void outputParametersDetected(SessionEvent event) {
writeUser = (String)((Map)event.getResult()).get("OUT");
}
@@ -97,6 +98,7 @@
super(name);
}
+ @Override
public String getPersistenceUnitName() {
return PU_NAME;
}
@@ -127,6 +129,7 @@
return suite;
}
+ @Override
public void setUp() {
// runs for the first time - setup user names and properties used by the tests.
if(setupErrorMsg == null) {
@@ -155,6 +158,7 @@
}
}
+ @Override
public void tearDown() {
// clean-up
if(setupErrorMsg.length() > 0) {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/Image.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/Image.java
index 30d60a5..7226bb8 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/Image.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/Image.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
private Byte[] picture;
private String script;
+ @Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBDeleteTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBDeleteTest.java
index 86ad3b8..5a58b3c 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBDeleteTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBDeleteTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setDescription("This case tests the BLOB/CLOB delete with size less or bigger than 4k and checks if it was deleted properly");
}
+ @Override
protected void setup() {
getAbstractSession().beginTransaction();
//insert the object into database during the setup (assume the brand new object)
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBImageModelProject.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBImageModelProject.java
index c52f158..dc6ba1d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBImageModelProject.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBImageModelProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
addDescriptor(buildImageDescriptor());
}
+ @Override
public void applyLogin() {
DatabaseLogin login = new DatabaseLogin();
setLogin(login);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBImageModelSystem.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBImageModelSystem.java
index 169715e..93a7a11 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBImageModelSystem.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBImageModelSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
project = new LOBImageModelProject();
}
+ @Override
public void addDescriptors(DatabaseSession session) {
if (project == null) {
project = new LOBImageModelProject();
@@ -37,6 +38,7 @@
session.addDescriptors(project);
}
+ @Override
public void createTables(DatabaseSession session) {
new LOBImageModelTableCreator().replaceTables(session);
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBInsertTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBInsertTest.java
index 9b3109a..13bd510 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBInsertTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBInsertTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
}
}
+ @Override
public String getName() {
String strOriginal = "";
if (((Image)originalObject).getPicture() != null && ((Image)originalObject).getScript() != null) {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBSessionBrokerTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBSessionBrokerTestModel.java
index cefb0fe..eb741a6 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBSessionBrokerTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBSessionBrokerTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
setDescription("This suite tests TopLink LOB support with Oracle thin driver and SessionBroker.");
}
+ @Override
public void addRequiredSystems() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("WARNING: This model is not supposed to be run on databases other than Oracle.");
@@ -34,6 +35,7 @@
addRequiredSystem(new LOBImageModelSystem());
}
+ @Override
public void addTests() {
addTest(getLOBInsertTestSuite());
addTest(getLOBUpdateTestSuite());
@@ -56,6 +58,7 @@
return suite;
}
+ @Override
public void setup() {
if (!((AbstractSession)getSession()).isBroker()) {
SessionBroker broker = new SessionBroker();
@@ -67,6 +70,7 @@
}
}
+ @Override
public void reset() {
if (((AbstractSession)getSession()).isBroker()) {
SessionBroker broker = (SessionBroker)getSession();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBTestModel.java
index 63bd067..2ad412f 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
setDescription("This suite tests TopLink LOB support with Oracle thin driver.");
}
+ @Override
public void addRequiredSystems() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("WARNING: This model is not supposed to be run on databases other than Oracle.");
@@ -68,6 +69,7 @@
addRequiredSystem(new LOBImageModelSystem());
}
+ @Override
public void addTests() {
addTest(getLOBInsertTestSuite());
addTest(getLOBUpdateTestSuite());
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBTestWrapper.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBTestWrapper.java
index 59fc3f3..47aee93 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBTestWrapper.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBTestWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setName(getName() + " platform forced to "+(shouldUseLocatorForLOBWrite ? "use" : "NOT use")+" lob locators)");
}
+ @Override
protected void setup() throws Throwable {
DatabasePlatform platform = getSession().getPlatform();
if (!platform.isOracle()) {
@@ -65,6 +66,7 @@
super.setup();
}
+ @Override
public void reset() throws Throwable {
super.reset();
DatabasePlatform platform = getSession().getPlatform();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBUpdateTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBUpdateTest.java
index b3bfd23..4191d3c 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBUpdateTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/lob/LOBUpdateTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setDescription("This case tests the BLOB/CLOB update with size less or bigger than 4k and checks if it was updated properly");
}
+ @Override
protected void changeObject() {
//Bug#3128838 Test Byte[] support
Image image = (Image)workingCopy;
@@ -57,6 +58,7 @@
image.setCommentary(ImageSimulator.initCharArrayBase(size * 2));
}
+ @Override
public String getName() {
String strUpdated = "Updated " + size + ", " + 2 * size;
String strOriginal = "Original " + ((Image)originalObjectNotInDB).getPicture().length + ", " + ((Image)originalObjectNotInDB).getScript().length();
@@ -67,6 +69,7 @@
return str;
}
+ @Override
protected void setup() {
// Create originalObject and insert it into db - it will be deleted in reset()
try {
@@ -82,6 +85,7 @@
super.setup();
}
+ @Override
public void reset() {
if (originalObject != null) {
super.reset();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/BaseNcharTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/BaseNcharTest.java
index 92c5aa3..ddc2523 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/BaseNcharTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/BaseNcharTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
return (Oracle9Platform)getSession().getPlatform();
}
+ @Override
protected void setup() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("This test case works on Oracle only");
@@ -55,6 +56,7 @@
}
}
+ @Override
protected void verify() {
if (object == null) {
throw new TestException("object is missing");
@@ -166,6 +168,7 @@
}
}
+ @Override
public void reset() {
if (object != null) {
UnitOfWork uow = getSession().acquireUnitOfWork();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/CharNcharProject.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/CharNcharProject.java
index 872791b..4e2840c 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/CharNcharProject.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/CharNcharProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
addDescriptor(buildCharNcharDescriptor());
}
+ @Override
public void applyLogin() {
DatabaseLogin login = new DatabaseLogin();
setLogin(login);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/InsertNcharTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/InsertNcharTest.java
index 1be0755..4536835 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/InsertNcharTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/InsertNcharTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
setDescription("Tests inserting NCHAR, NVARCHAR2, NCLOB into Oracle database.");
}
+ @Override
protected void test() {
char ch = 'a';
char nCh = '\u0410';
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/InsertNullNcharTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/InsertNullNcharTest.java
index 1e73423..c583ef2 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/InsertNullNcharTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/InsertNullNcharTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
setDescription("Tests inserting null NCHAR, NVARCHAR2, NCLOB into Oracle database.");
}
+ @Override
protected void test() {
object = new CharNchar();
controlObject = new CharNchar(object);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/NcharTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/NcharTestModel.java
index 4cfb999..0b316a8 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/NcharTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/NcharTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setDescription("This model tests TopLink NCHAR, NVARCHAR2, NCLOB support with Oracle.");
}
+ @Override
public void addRequiredSystems() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("WARNING: This model is not supposed to be run on databases other than Oracle.");
@@ -37,6 +38,7 @@
addRequiredSystem(new NcharTestSystem());
}
+ @Override
public void addTests() {
addTest(getTestSuite());
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/NcharTestSystem.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/NcharTestSystem.java
index 1946f3b..db19345 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/NcharTestSystem.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/NcharTestSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
project = new CharNcharProject();
}
+ @Override
public void addDescriptors(DatabaseSession session) {
if (project == null) {
project = new CharNcharProject();
@@ -38,6 +39,7 @@
session.addDescriptors(project);
}
+ @Override
public void createTables(DatabaseSession session) {
new CharNcharTableCreator().replaceTables(session);
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/ReadNcharTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/ReadNcharTest.java
index 06a9085..2f4749a 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/ReadNcharTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/ReadNcharTest.java
@@ -29,6 +29,7 @@
setDescription("Tests reading NCHAR, NVARCHAR2, NCLOB from Oracle database.");
}
+ @Override
@SuppressWarnings("deprecation")
protected void setup() {
super.setup();
@@ -155,6 +156,7 @@
((AbstractSession)getSession()).getAccessor().decrementCallCount();
}
+ @Override
protected void test() {
ExpressionBuilder builder = new ExpressionBuilder();
Expression exp = (builder.get("id").equal(controlObject.getId()));
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/UpdateNcharTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/UpdateNcharTest.java
index b1f9c5d..d3c3d8d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/UpdateNcharTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/UpdateNcharTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
setDescription("Tests updating NCHAR, NVARCHAR2, NCLOB in Oracle database.");
}
+ @Override
protected void test() {
char ch = 'a';
char nCh = '\u0410';
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/UpdateNullNcharTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/UpdateNullNcharTest.java
index 355e203..27c3a8f 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/UpdateNullNcharTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nchar/UpdateNullNcharTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
setDescription("Tests updating by null NCHAR, NVARCHAR2, NCLOB in Oracle database.");
}
+ @Override
protected void test() {
char ch = 'a';
char nCh = '\u0410';
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni10TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni10TestSet.java
index f282f91..29ed809 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni10TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni10TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -84,7 +84,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni10", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni1TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni1TestSet.java
index 43d3fc3..f08d257 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni1TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni1TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,7 +83,7 @@
query.addArgument("X", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni1", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni2TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni2TestSet.java
index d4bbf3a..9c29c06 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni2TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni2TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,7 +83,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni2", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni3TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni3TestSet.java
index 3298928..24ff4e4 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni3TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni3TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,7 +83,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni3", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni4TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni4TestSet.java
index a896e99..2577acf 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni4TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni4TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,7 +83,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni4", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni5TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni5TestSet.java
index d8efb13..247374c 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni5TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni5TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,7 +83,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni5", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni6TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni6TestSet.java
index fd65068..4d0ccf7 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni6TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni6TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,7 +83,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni6", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni7TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni7TestSet.java
index cb5c7dc..1c3fce9 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni7TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni7TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,7 +83,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni7", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni8TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni8TestSet.java
index e4710a3..801fb32 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni8TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni8TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -84,7 +84,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni8", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni9TestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni9TestSet.java
index d5e154d..b6bede5 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni9TestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/Ni9TestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -84,7 +84,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Ni9", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiNiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiNiTestSet.java
index 2f8aad0..03f4196 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiNiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiNiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,7 +88,7 @@
query.addArgument("Z", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("NijiNi", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiTestSet.java
index a427ea8..90d1157 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -86,7 +86,7 @@
query.addArgument("Y", String.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Niji", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijijiNiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijijiNiTestSet.java
index 371fed9..c01be4e 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijijiNiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijijiNiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,7 +91,7 @@
query.addArgument("AA", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("NijijiNi", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijioNijioTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijioNijioTestSet.java
index fff1147..1b09a5e 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijioNijioTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijioNijioTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -92,7 +92,7 @@
query.addArgument("AA", String.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("NijioNijio", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiojiNiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiojiNiTestSet.java
index 60b32d2..35aab06 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiojiNiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NijiojiNiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -92,7 +92,7 @@
query.addArgument("AA", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("NijiojiNi", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NoTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NoTestSet.java
index 1555c15..05e573f 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NoTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NoTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,7 +80,7 @@
DataModifyQuery query = new DataModifyQuery();
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("No", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojiNoTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojiNoTestSet.java
index e05096f..16cf942 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojiNoTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojiNoTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,7 +88,7 @@
query.addArgument("Y", String.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("NojiNo", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojiTestSet.java
index 06086a3..be27a9d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,7 +88,7 @@
query.setCall(call);
query.addArgument("Y", String.class);
project.getDescriptor(Empty.class).getQueryManager().addQuery("Noji", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojijioNoTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojijioNoTestSet.java
index 4576d13..1efedbc 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojijioNoTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/NojijioNoTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,7 +90,7 @@
query.addArgument("Z", String.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("NojijioNo", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiNijiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiNijiTestSet.java
index 8893080..8b81e8a 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiNijiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiNijiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,7 +91,7 @@
query.addArgument("AA", BigDecimal.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("jiNiNiji", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiTestSet.java
index 106a4c1..4cd7d75 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -86,7 +86,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("jiNi", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNijiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNijiTestSet.java
index 36a9b36..cc7fec0 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNijiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNijiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -89,7 +89,7 @@
query.addArgument("Z", BigDecimal.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("jiNiji", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNioTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNioTestSet.java
index 4d816ec..e417dfd 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNioTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNioTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,7 +88,7 @@
query.setCall(call);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("jiNio", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiojiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiojiTestSet.java
index 7141b83..85aa465 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiojiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNiojiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,7 +91,7 @@
query.addArgument("Z", BigDecimal.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("jiNioji", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNoTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNoTestSet.java
index dbd752d..6743141 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNoTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNoTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -86,7 +86,7 @@
query.addArgument("X", String.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("jiNo", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNojiTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNojiTestSet.java
index 06bd957..9f9d4ff 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNojiTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/jiNojiTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -89,7 +89,7 @@
query.addArgument("Z", BigDecimal.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("jiNoji", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijiNoTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijiNoTestSet.java
index 39eef8f..7cb497d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijiNoTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijiNoTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,7 +90,7 @@
query.addArgument("Z", BigDecimal.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("joNijiNo", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijijoTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijijoTestSet.java
index 0d54f00..d562bcc 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijijoTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijijoTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,7 +90,7 @@
query.addArgument("Z", BigDecimal.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("joNijiNo", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijioTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijioTestSet.java
index 0db4d09..937a763 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijioTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijioTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -89,7 +89,7 @@
query.addArgument("Z", String.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("joNijio", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijoTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijoTestSet.java
index 89e0a2b..b4f74e9 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijoTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/nonJDBC/joNijoTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,7 +88,7 @@
query.addArgument("Y", Integer.class);
query.setCall(call);
project.getDescriptor(Empty.class).getQueryManager().addQuery("joNijo", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/OutputRowSessionEventAdapter.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/OutputRowSessionEventAdapter.java
index 449cae9..5a5fa6a 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/OutputRowSessionEventAdapter.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/OutputRowSessionEventAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
Object eventResult = null;
+ @Override
public void outputParametersDetected(SessionEvent event) {
eventResult = event.getResult();
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInOutTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInOutTestSet.java
index 04d4e75..8905e6f 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInOutTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInOutTestSet.java
@@ -102,7 +102,7 @@
query.setCall(call);
project.getDescriptor(PLSQLEmployeeType.class).getQueryManager().addQuery("PLSQLrecordInOut", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInTestSet.java
index 8ae745d..a634a5c 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordInTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -10,7 +10,7 @@
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
*/
-// Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
package org.eclipse.persistence.testing.tests.plsqlrecord;
@@ -98,7 +98,7 @@
query.setCall(call);
project.getDescriptor(PLSQLEmployeeType.class).getQueryManager().addQuery("PLSQLrecordIn", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordOutTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordOutTestSet.java
index d9006de..a643753 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordOutTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordOutTestSet.java
@@ -92,7 +92,7 @@
query.setCall(call);
project.getDescriptor(PLSQLEmployeeType.class).getQueryManager().addQuery("PLSQLrecordOut", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInOutTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInOutTestSet.java
index 048656d..aabe12d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInOutTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInOutTestSet.java
@@ -103,7 +103,7 @@
project.getDescriptor(PLSQLEmployeeType.class).getQueryManager().
addQuery("PLSQLrecordWithCompatibleTypeInOut", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
@@ -277,7 +277,7 @@
};
Struct struct = null;
try {
- struct = ((Oracle8Platform)s.getPlatform()).createStruct(
+ struct = s.getPlatform().createStruct(
"EMP_TYPE", attributes, ((DatabaseSessionImpl)s).getAccessor().getConnection());
}
catch (SQLException e1) {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInTestSet.java
index 584863a..fd94cce 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeInTestSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -10,7 +10,7 @@
* SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
*/
-// Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
package org.eclipse.persistence.testing.tests.plsqlrecord;
@@ -98,7 +98,7 @@
project.getDescriptor(PLSQLEmployeeType.class).getQueryManager().
addQuery("PLSQLrecordWithCompatibleTypeIn", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
@@ -269,7 +269,7 @@
};
Struct struct = null;
try {
- struct = ((Oracle8Platform)s.getPlatform()).createStruct(
+ struct = s.getPlatform().createStruct(
"EMP_TYPE", attributes, ((DatabaseSessionImpl)s).getAccessor().getConnection());
}
catch (SQLException e) {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeOutTestSet.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeOutTestSet.java
index 317c212..41d1148 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeOutTestSet.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/plsqlrecord/PLSQLrecordWithCompatibleTypeOutTestSet.java
@@ -95,7 +95,7 @@
project.getDescriptor(PLSQLEmployeeType.class).getQueryManager().
addQuery("PLSQLrecordWithCompatibleTypeOut", query);
- Project projectToXml = (Project)project.clone();
+ Project projectToXml = project.clone();
// trim off login 'cause it changes under test - this way, a comparison
// can be done to a control document
projectToXml.setDatasourceLogin(null);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ExternalConnectionPoolTestCase.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ExternalConnectionPoolTestCase.java
index ddcf96f..4e3647d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ExternalConnectionPoolTestCase.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ExternalConnectionPoolTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,11 +50,13 @@
setName(getName() + suffix);
}
+ @Override
protected void proxySetup() {
if (useEvent) {
// Use this approach if ClientSession created with default connection policy:
// cs = serverSession.acquireClientSession();
listener = new SessionEventAdapter() {
+ @Override
public void postAcquireClientSession(SessionEvent event) {
ClientSession cs = (ClientSession)event.getSession();
ConnectionPolicy policy = (ConnectionPolicy)cs.getConnectionPolicy().clone();
@@ -92,6 +94,7 @@
}
}
+ @Override
public void reset() {
super.reset();
String proxyUser = proxyProperties.getProperty("PROXY_USER_NAME");
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/MainLoginTestCase.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/MainLoginTestCase.java
index 7b38e4a..9337fc2 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/MainLoginTestCase.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/MainLoginTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,12 +35,14 @@
super(proxyProperties);
}
+ @Override
protected void proxySetup() {
originalWriteProperties = (Properties)getServerSession().getLogin().getProperties().clone();
originalReadProperties = (Properties)((DatabaseLogin)getServerSession().getReadConnectionPool().getLogin()).getProperties().clone();
// To handle preLogin event relog the session
getServerSession().logout();
listener = new SessionEventAdapter() {
+ @Override
public void preLogin(SessionEvent event) {
ServerSession ss = (ServerSession)event.getSession();
addProxyPropertiesToLogin(ss.getLogin());
@@ -55,6 +57,7 @@
getServerSession().getEventManager().getListeners().remove(listener);
}
+ @Override
public void reset() {
super.reset();
// restore the original properties
@@ -66,6 +69,7 @@
// both read and write connections are expected to use proxy user
+ @Override
protected String readConnectionSchemaExpected() {
return writeConnectionSchemaExpected();
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/NonPooledConnectionTestCase.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/NonPooledConnectionTestCase.java
index 41df7ea..c407e11 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/NonPooledConnectionTestCase.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/NonPooledConnectionTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,11 +50,13 @@
setName(getName() + suffix);
}
+ @Override
protected void proxySetup() {
if (useEvent) {
// Use this approach if ClientSession created with default connection policy:
// cs = serverSession.acquireClientSession();
listener = new SessionEventAdapter() {
+ @Override
public void postAcquireClientSession(SessionEvent event) {
ClientSession cs = (ClientSession)event.getSession();
ConnectionPolicy policy = cs.getConnectionPolicy(); //.clone();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/OCIProxyTestHelper.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/OCIProxyTestHelper.java
index 36a24e3..fe5378f 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/OCIProxyTestHelper.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/OCIProxyTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
// PROXY_USER_PASSWORD = OracleOCIConnectionPool.PROXY_PASSWORD;
}
+ @Override
public JNDIConnector createProxyConnector(Session session) throws SQLException {
// Note that OCI client is required.
// Logical name of the pool. This needs to be one in the tnsnames.ora configuration file.
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/PooledConnectionTestCase.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/PooledConnectionTestCase.java
index 2b5f6d0..eb5f150 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/PooledConnectionTestCase.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/PooledConnectionTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,10 +40,12 @@
class Listener extends SessionEventAdapter {
HashSet clientSessions = new HashSet();
+ @Override
public void postAcquireClientSession(SessionEvent event) {
clientSessions.add(event.getSession());
}
+ @Override
public void postAcquireConnection(SessionEvent event) {
org.eclipse.persistence.internal.databaseaccess.DatasourceAccessor dsAccessor = (org.eclipse.persistence.internal.databaseaccess.DatasourceAccessor)event.getResult();
Iterator it = clientSessions.iterator();
@@ -56,6 +58,7 @@
}
}
+ @Override
public void preReleaseClientSession(SessionEvent event) {
clientSessions.remove(event.getSession());
}
@@ -66,6 +69,7 @@
super(proxyProperties);
}
+ @Override
protected void proxySetup() {
listener = new Listener();
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ProxyAuthenticationConnectionTestCase.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ProxyAuthenticationConnectionTestCase.java
index 3b2b085..e784849 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ProxyAuthenticationConnectionTestCase.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ProxyAuthenticationConnectionTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
protected void proxySetup() {
}
+ @Override
public void setup() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("Supports Oracle platform only");
@@ -60,6 +61,7 @@
}
}
+ @Override
public void test() {
ClientSession cs;
if (connectionPolicy == null) {
@@ -85,6 +87,7 @@
cs.release();
}
+ @Override
public void verify() {
String readConnectionSchemaExpected = readConnectionSchemaExpected();
if (!readConnectionSchema.equals(readConnectionSchemaExpected)) {
@@ -105,6 +108,7 @@
return getServerSession().getLogin().getUserName();
}
+ @Override
public void reset() {
if (listener != null) {
getSession().getEventManager().removeListener(listener);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ProxyAuthenticationOCITestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ProxyAuthenticationOCITestModel.java
index 997c1ec..b520826 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ProxyAuthenticationOCITestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/oci/ProxyAuthenticationOCITestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
protected String proxyTestHelperClassName;
protected ProxyTestHelper proxyTestHelper;
+ @Override
public void addTests() {
Properties prop = proxyTestHelper.createProxyProperties(proxyUser);
// Properties prop = proxyTestHelper.createProxyProperties(proxyUser, proxyPassword);
@@ -60,6 +61,7 @@
addTest(new MainLoginTestCase(prop));
}
+ @Override
public void addRequiredSystems() {
setupUser();
@@ -131,6 +133,7 @@
}
}
+ @Override
public void reset() {
if (oldSession != getExecutor().getSession()) {
((DatabaseSession)getSession()).logout();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/thin/ProxyAuthenticationConnectionCustomizerTestCase.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/thin/ProxyAuthenticationConnectionCustomizerTestCase.java
index 91d0cca..ff2e9f5 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/thin/ProxyAuthenticationConnectionCustomizerTestCase.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/thin/ProxyAuthenticationConnectionCustomizerTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,6 +63,7 @@
private String writeUser;
class Listener extends SessionEventAdapter {
+ @Override
public void outputParametersDetected(SessionEvent event) {
writeUser = (String)((Map)event.getResult()).get("OUT");
}
@@ -153,6 +154,7 @@
}
}
+ @Override
public void setup() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("Supports Oracle platform only");
@@ -180,6 +182,7 @@
return user;
}
+ @Override
public void test() {
if(this.shouldUseDatabaseSession) {
testDatabaseSession();
@@ -260,12 +263,14 @@
}
}
+ @Override
public void verify() {
if(errorMsg.length() > 0) {
throw new TestErrorException(errorMsg);
}
}
+ @Override
public void reset() {
getSession().getEventManager().removeListener(listener);
getExecutor().setSession(exchanger.returnOriginalSession());
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/thin/ProxyAuthenticationCustomizerTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/thin/ProxyAuthenticationCustomizerTestModel.java
index be3517d..0d22341 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/thin/ProxyAuthenticationCustomizerTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/proxyauthentication/thin/ProxyAuthenticationCustomizerTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
}
}
+ @Override
public void setup() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("Supports Oracle platform only");
@@ -52,6 +53,7 @@
}
}
+ @Override
public void addTests() {
Map proxyProperties = ProxyAuthenticationUsersAndProperties.proxyProperties;
Map proxyProperties2 = ProxyAuthenticationUsersAndProperties.proxyProperties2;
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarDaylightSavingsTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarDaylightSavingsTest.java
index 406e738..65a7573 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarDaylightSavingsTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarDaylightSavingsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -152,6 +152,7 @@
return tests;
}
+ @Override
public void setup() {
if (!(getSession().getPlatform() instanceof Oracle9Platform)) {
throw new TestWarningException("Test is only supported on Oracle9 platform and above, as TIMESTAMPTZ is used");
@@ -183,6 +184,7 @@
sqlTracker = new QuerySQLTracker(getSession());
}
+ @Override
public void test() {
// write myself out to the database
UnitOfWork uow = getSession().acquireUnitOfWork();
@@ -203,6 +205,7 @@
result = (CalendarDaylightSavingsTest)getSession().executeQuery(query);
}
+ @Override
public void verify() {
final String TZR = "TZR";
final String TZR_TZD = "TZR TZD";
@@ -232,6 +235,7 @@
}
}
+ @Override
public void reset() {
// Compatibility for Oracle 9 and above is checked in the setup() method
Oracle9Platform platform = (Oracle9Platform) getSession().getPlatform();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarToTSTZWithBindingTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarToTSTZWithBindingTest.java
index f71c9f8..0b2763f 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarToTSTZWithBindingTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarToTSTZWithBindingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -140,6 +140,7 @@
return tests;
}
+ @Override
public void setup() {
if (!(getSession().getPlatform() instanceof Oracle9Platform)) {
throw new TestWarningException("Test is only supported on Oracle9 platform and above, as TIMESTAMPTZ is used");
@@ -158,6 +159,7 @@
uow.commit();
}
+ @Override
public void test() {
// read data back from database literally in order to check contents of database rather than the driver's TIMESTAMPTZ
String sql = "select TEST_ID, to_char(TSTZ_DATA,'MM/DD/YYYY hh24:mi:ss TZR') as TSTZ_DATA FROM " + commonDescriptor().getTableName() + " where TEST_ID = " + getTestId();
@@ -167,6 +169,7 @@
}
}
+ @Override
public void verify() throws Exception {
String expectedResult = getOriginalCalendarString();
if (this.result == null) {
@@ -179,6 +182,7 @@
}
}
+ @Override
public void reset() {
// Compatibility for Oracle 9 and above is checked in the setup() method
Oracle9Platform platform = (Oracle9Platform) getSession().getPlatform();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarToTSTZWithoutSessionTZTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarToTSTZWithoutSessionTZTest.java
index 9b91636..9f33a1d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarToTSTZWithoutSessionTZTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/CalendarToTSTZWithoutSessionTZTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -100,6 +100,7 @@
return tests;
}
+ @Override
protected void verify(WriteTypeObjectTest testCase) throws TestException
{
try {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/OracleTIMESTAMPTypeTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/OracleTIMESTAMPTypeTestModel.java
index 982efff..9abb19a 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/OracleTIMESTAMPTypeTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/OracleTIMESTAMPTypeTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,10 +47,12 @@
}
}
+ @Override
public void addRequiredSystems() {
addRequiredSystem(new OracleTIMESTAMPTypeTestSystem());
}
+ @Override
public void addTests() {
if (getSession().getPlatform() instanceof Oracle9Platform) {
Oracle9Platform platform = (Oracle9Platform)getSession().getPlatform();
@@ -267,6 +269,7 @@
return suite;
}
+ @Override
public void setup() {
DatabaseSession session = (DatabaseSession)getSession();
if (useAccessors) {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/OracleTIMESTAMPTypeTestSystem.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/OracleTIMESTAMPTypeTestSystem.java
index 0e41697..fa827ea 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/OracleTIMESTAMPTypeTestSystem.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/OracleTIMESTAMPTypeTestSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public class OracleTIMESTAMPTypeTestSystem extends TestSystem {
+ @Override
public void createTables(DatabaseSession session) {
SchemaManager schemaManager = new SchemaManager(session);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/SerializationOfValueHolderWithTIMESTAMPTZTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/SerializationOfValueHolderWithTIMESTAMPTZTest.java
index 92632ea..ec8f363 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/SerializationOfValueHolderWithTIMESTAMPTZTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/SerializationOfValueHolderWithTIMESTAMPTZTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
public SerializationOfValueHolderWithTIMESTAMPTZTest() {
}
+ @Override
public void setup() {
UnitOfWork uow = getSession().acquireUnitOfWork();
uow.registerObject(TIMESTAMPTZOwner.example1());
@@ -44,6 +45,7 @@
getAbstractSession().beginTransaction();
}
+ @Override
public void reset() {
if (getAbstractSession().isInTransaction()) {
getAbstractSession().rollbackTransaction();
@@ -51,6 +53,7 @@
}
}
+ @Override
public void test() {
getSession().getIdentityMapAccessor().initializeIdentityMaps();
try {
@@ -77,6 +80,7 @@
}
}
+ @Override
public void verify() {
if (ex != null) {
if (ex.toString().startsWith("java.io.NotSerializableException: oracle.sql.TIMESTAMPTZ")) {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/TIMESTAMPTester.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/TIMESTAMPTester.java
index 8bbf55c..d459599 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/TIMESTAMPTester.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/TIMESTAMPTester.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -165,6 +165,7 @@
this.sessionTimeZone = timeZone;
}
+ @Override
protected void setup(Session session) {
super.setup(session);
}
@@ -363,6 +364,7 @@
return TimeZone.getDefault().getID().equals(this.sessionTimeZone) || !isLtzTimestampInGmt;
}
+ @Override
protected void test(WriteTypeObjectTest testCase) {
try {
if(this.sessionTimeZone != null) {
@@ -374,6 +376,7 @@
super.test(testCase);
}
+ @Override
protected void verify(WriteTypeObjectTest testCase) throws TestException {
try {
super.verify(testCase);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/TIMESTAMPTypeConversionTester.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/TIMESTAMPTypeConversionTester.java
index 68d0126..7e6c4f5 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/TIMESTAMPTypeConversionTester.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/types/TIMESTAMPTypeConversionTester.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -299,6 +299,7 @@
// tsToTSTZ, utilDateToTSTZ and timeToTSTZ work no matter what session time zone is.
// Converter makes a difference - Timestamp (Date, Time) object is converted to Calendar first,
// which finally converted to TIMESTAMPTZ.
+ @Override
boolean doesTimestampTZWork() {
return true;
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/TestServerPlatform.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/TestServerPlatform.java
index cf91235..af470a1 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/TestServerPlatform.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/TestServerPlatform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,10 +31,12 @@
this.disableJTA();
}
+ @Override
public String getServerNameAndVersion() {
return null;
}
+ @Override
public Class getExternalTransactionControllerClass() {
return null;
}
@@ -42,10 +44,12 @@
public void launchContainerThread(Thread thread) {
}
+ @Override
public org.eclipse.persistence.logging.SessionLog getServerLog() {
return new DefaultSessionLog();
}
+ @Override
public java.sql.Connection unwrapConnection(java.sql.Connection connection){
if(connection instanceof TestOracleConnection){
Connection conn = ((TestOracleConnection)connection).getPhysicalConnection();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionBaseTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionBaseTestModel.java
index 4d0d0f6..4d8d3c4 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionBaseTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionBaseTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
protected ServerPlatform originalServerPlatform;
protected boolean originalShouldUseExternalConnectionPooling;
+ @Override
public void reset(){
DatabaseSession session = (DatabaseSession)getSession();
session.logout();
@@ -44,6 +45,7 @@
session.login();
}
+ @Override
public void setup() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("WARNING: This model is not supposed to be run on databases other than Oracle.");
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionCustomSQLTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionCustomSQLTestModel.java
index cb54454..f23963d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionCustomSQLTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionCustomSQLTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
/**
* Revert the descriptors back to their old state.
*/
+ @Override
public void reset() {
DatabaseSession session = (DatabaseSession)getSession();
session.logout();
@@ -52,6 +53,7 @@
super.reset();
}
+ @Override
public void setup(){
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("WARNING: This model is not supposed to be run on databases other than Oracle.");
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionInsuranceObjectRelationalTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionInsuranceObjectRelationalTestModel.java
index a7553ad..a311acf 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionInsuranceObjectRelationalTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionInsuranceObjectRelationalTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
setDescription("This model tests oracle.sql.ARRAY and oracle.sql.ARRAY using unwrapped connection.");
}
+ @Override
public void addTests(){
//Add objectRelationTestModel to test Array, Struct type
addTest(new org.eclipse.persistence.testing.tests.insurance.InsuranceObjectRelationalTestModel());
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionLOBTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionLOBTestModel.java
index 2659ac1..a583b7b 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionLOBTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionLOBTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
setDescription("This model tests LOB type using unwrapped connection.");
}
+ @Override
public void addTests(){
addTest(new org.eclipse.persistence.testing.tests.lob.LOBTestModel());
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionNativeBatchWritingTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionNativeBatchWritingTestModel.java
index 77e645b..e2ff1d4 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionNativeBatchWritingTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionNativeBatchWritingTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
setDescription("This model tests NativeBatchWriting using unwrapped connection.");
}
+ @Override
public void addTests(){
addTest(new org.eclipse.persistence.testing.tests.feature.NativeBatchWritingTestModel());
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionNchartTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionNchartTestModel.java
index d042bb3..c6c1928 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionNchartTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionNchartTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
setDescription("This model tests NCHAR,NVARCHAR2,NCLOB with database using unwrapped connection.");
}
+ @Override
public void addTests(){
//Adding Nchar TestModel
addTest(new org.eclipse.persistence.testing.tests.nchar.NcharTestModel());
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionTypeTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionTypeTestModel.java
index 8106fde..2c0e9bc 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionTypeTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionTypeTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
setDescription("This model tests TIMESTAMPZ type etc. using unwrapped connection.");
}
+ @Override
public void addTests(){
addTest(new org.eclipse.persistence.testing.tests.types.OracleTIMESTAMPTypeTestModelWithAccessors());
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionTypeWithoutAccessorsTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionTypeWithoutAccessorsTestModel.java
index 13694e2..8f3b5e7 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionTypeWithoutAccessorsTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionTypeWithoutAccessorsTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
setDescription("This model tests TIMESTAMPZ type etc. using unwrapped connection.");
}
+ @Override
public void addTests(){
addTest(new org.eclipse.persistence.testing.tests.types.OracleTIMESTAMPTypeTestModelWithOutAccessors());
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionXDBTestModel.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionXDBTestModel.java
index 4f5dac8..16dbf96 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionXDBTestModel.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/unwrappedconnection/UnwrapConnectionXDBTestModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
setDescription("This model tests XML Type using unwrapped connection.");
}
+ @Override
public void addTests(){
addTest(new org.eclipse.persistence.testing.tests.xdb.XDBTestModel());
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ExistsNodeWithJoinTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ExistsNodeWithJoinTest.java
index cbbc1fa..cb6e2ad 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ExistsNodeWithJoinTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ExistsNodeWithJoinTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,19 +25,23 @@
setDescription("Tests the use of the existsNode() function as well as testing use of XMLType in a join");
}
+ @Override
public void setup() {
if (!(getSession().getPlatform() instanceof Oracle9Platform)) {
throw new TestWarningException("This test is intended for the Oracle9Platform");
}
}
+ @Override
public void reset() {
}
+ @Override
public void test() {
employee = (Employee_XML)getSession().readObject(Employee_XML.class, new ExpressionBuilder().get("manager").get("resume").existsNode("//education/degree").greaterThan(0));
}
+ @Override
public void verify() {
if ((employee == null) || !employee.firstName.equals("Frank")) {
throw new TestErrorException("Wrong Employee returned:" + employee);
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ExtractValueTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ExtractValueTest.java
index 0de50a7..26b5f5b 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ExtractValueTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ExtractValueTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,19 +25,23 @@
setDescription("Tests the use of the extractVale function");
}
+ @Override
public void setup() {
if (!(getSession().getPlatform() instanceof Oracle9Platform)) {
throw new TestWarningException("This test is intended for the Oracle 9 platform");
}
}
+ @Override
public void reset() {
}
+ @Override
public void test() {
employee = (Employee_XML)getSession().readObject(Employee_XML.class, new ExpressionBuilder().get("resume").extractValue("/resume/first-name/text()").equal("Bob"));
}
+ @Override
public void verify() {
if ((employee == null) || !(employee.firstName.equals("Bob"))) {
throw new TestErrorException("Wrong or No Employee returned");
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/GetNumberValTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/GetNumberValTest.java
index 71cabe4..8d3a18d 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/GetNumberValTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/GetNumberValTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,19 +25,23 @@
setDescription("Tests the use of the getNumberVal() function");
}
+ @Override
public void setup() {
if (!(getSession().getPlatform() instanceof Oracle9Platform)) {
throw new TestWarningException("This test is intended for the Oracle 9 Platform");
}
}
+ @Override
public void reset() {
}
+ @Override
public void test() {
employee = (Employee_XML)getSession().readObject(Employee_XML.class, new ExpressionBuilder().get("resume").extractXml("/resume/age/text()").getNumberVal().equal(27));
}
+ @Override
public void verify() {
if ((employee == null) || !(employee.firstName.equals("Frank"))) {
throw new TestErrorException("Wrong or No Employee returned");
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/InsertWithNullTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/InsertWithNullTest.java
index d01d8a7..ab1d7be 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/InsertWithNullTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/InsertWithNullTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,12 +23,15 @@
setDescription("Tests inserting an object with NULL XMLType fields.");
}
+ @Override
public void setup() {
}
+ @Override
public void reset() {
}
+ @Override
public void test() {
Employee_XML emp = new Employee_XML();
emp.firstName = "Fred";
@@ -40,6 +43,7 @@
uow.commit();
}
+ @Override
public void verify() {
}
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/RemoteSessionTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/RemoteSessionTest.java
index 1adc11d..c94585e 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/RemoteSessionTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/RemoteSessionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,10 +27,11 @@
public RemoteSessionTest() {
}
+ @Override
public void setup() {
//sneakily using some existing code
RMIRemoteModel remote = new RMIRemoteModel();
- DatabaseSession dbSession = ((org.eclipse.persistence.sessions.Project)getSession().getProject().clone()).createDatabaseSession();
+ DatabaseSession dbSession = getSession().getProject().clone().createDatabaseSession();
dbSession.setSessionLog(getSession().getSessionLog());
dbSession.login();
RMIServerManagerController.start(dbSession);
@@ -38,9 +39,11 @@
remoteSession = (DistributedSession)connection.createRemoteSession();
}
+ @Override
public void reset() {
}
+ @Override
public void test() {
Employee_XML emp = new Employee_XML();
emp.firstName = "Matt";
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ReportQueryTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ReportQueryTest.java
index 1cdde98..1d43a4e 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ReportQueryTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/ReportQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,12 +27,15 @@
setDescription("Tests using a report query to return element values from an XMLType field");
}
+ @Override
public void setup() {
}
+ @Override
public void reset() {
}
+ @Override
public void test() {
ExpressionBuilder builder = new ExpressionBuilder();
ReportQuery rq = new ReportQuery(Employee_XML.class, builder);
@@ -41,6 +44,7 @@
results = (Vector)getSession().executeQuery(rq);
}
+ @Override
public void verify() {
ReportQueryResult first = (ReportQueryResult)results.firstElement();
if (!(first.get("degree").equals("BCS"))) {
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/SessionBrokerTestCase.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/SessionBrokerTestCase.java
index 0a5e917..cb0c2c5 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/SessionBrokerTestCase.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/SessionBrokerTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setDescription("Tests reading an writing XML through a SessionBroker");
}
+ @Override
public void setup() {
Session session = getSession();
@@ -33,9 +34,11 @@
broker.registerSession("session1", session);
}
+ @Override
public void reset() {
}
+ @Override
public void test() {
Employee_XML emp = new Employee_XML();
emp.firstName = "Matt";
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/StoredFunctionXMLTypeTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/StoredFunctionXMLTypeTest.java
index 298f168..9247514 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/StoredFunctionXMLTypeTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/StoredFunctionXMLTypeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
public class StoredFunctionXMLTypeTest extends TestCase {
public static String charsToIgnore = " \n\t";
+ @Override
public void test() throws Exception {
// 12.1 works with both OracleTypes.OPAQUE and Types.SQLXML
// 11.2.0.3 - only with OracleTypes.OPAQUE
@@ -40,7 +41,7 @@
// see the stored function definition in XMLTypeEmployeeSystem
StoredFunctionCall call = new StoredFunctionCall(sqlType, "XMLTYPE", String.class);
call.setProcedureName("STOREDFUNCTION_XMLTYPE");
- if (sqlType == OracleTypes.OPAQUE && (getAbstractSession().isClientSession() || ((DatabaseLogin)getAbstractSession().getDatasourceLogin()).shouldUseExternalConnectionPooling())) {
+ if (sqlType == OracleTypes.OPAQUE && (getAbstractSession().isClientSession() || getAbstractSession().getDatasourceLogin().shouldUseExternalConnectionPooling())) {
// UnwrapConnectionXDBTestModel uses external connection pooling. In this case transaction is required to keep the same connection open until the string is extracted.
getAbstractSession().beginTransaction();
}
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/UpdateDocumentTest.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/UpdateDocumentTest.java
index c7efd58..735f89b 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/UpdateDocumentTest.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/UpdateDocumentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,12 +26,14 @@
setDescription("Tests updating an XMLType instance");
}
+ @Override
public void setup() {
if (!(getSession().getPlatform() instanceof Oracle9Platform)) {
throw new TestWarningException("This test is intended for the Oracle 9 Platform");
}
}
+ @Override
public void test() {
UnitOfWork uow = getSession().acquireUnitOfWork();
Employee_XML emp = (Employee_XML)uow.readObject(Employee_XML.class, new ExpressionBuilder().get("firstName").equal("Frank"));
@@ -47,6 +49,7 @@
uow.commit();
}
+ @Override
public void verify() {
getSession().getIdentityMapAccessor().initializeAllIdentityMaps();
Employee_XML emp = (Employee_XML)getSession().readObject(Employee_XML.class, new ExpressionBuilder().get("firstName").equal("Frank"));
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/XDBTestModelMWIntegration.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/XDBTestModelMWIntegration.java
index 9535aac..32c3873 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/XDBTestModelMWIntegration.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/XDBTestModelMWIntegration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,10 +25,12 @@
setDescription("Tests Oracle XDB Specific features");
}
+ @Override
public void addTests() {
addTest(getXDBTestSuite());
}
+ @Override
public void reset() {
this.getSession().getLogin().setPlatform(oldPlatform);
getDatabaseSession().logout();
@@ -49,6 +51,7 @@
return testSuite;
}
+ @Override
public void addForcedRequiredSystems() {
addForcedRequiredSystem(new XMLTypeEmployeeSystemXML());
oldPlatform = getSession().getPlatform();
diff --git a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/XMLTypeEmployeeSystem.java b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/XMLTypeEmployeeSystem.java
index 089bd86..a1846ad 100644
--- a/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/XMLTypeEmployeeSystem.java
+++ b/foundation/org.eclipse.persistence.oracle.test/src/it/java/org/eclipse/persistence/testing/tests/xdb/XMLTypeEmployeeSystem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
project = new Employee_XMLProject();
}
+ @Override
public void addDescriptors(DatabaseSession session) {
if (project == null) {
project = new Employee_XMLProject();
@@ -31,6 +32,7 @@
session.addDescriptors(project);
}
+ @Override
public void createTables(DatabaseSession session) {
SchemaManager schemaManager = new SchemaManager(session);
@@ -49,6 +51,7 @@
session.executeQuery(query);
}
+ @Override
public void populate(DatabaseSession session) {
PopulationManager manager = PopulationManager.getDefaultManager();
diff --git a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/framework/server/SpringPlatform.java b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/framework/server/SpringPlatform.java
index c11528d..d234b47 100644
--- a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/framework/server/SpringPlatform.java
+++ b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/framework/server/SpringPlatform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
* otherwise weaving will not work.
* TODO: Spring needs to fix this or something.
*/
+ @Override
public void initialize() {
getContext("default");
getContext("fieldaccess");
@@ -49,6 +50,7 @@
/**
* Return if the Spring transaction is active.
*/
+ @Override
public boolean isTransactionActive() {
return (this.status != null);
}
@@ -56,6 +58,7 @@
/**
* Return if the Spring transaction is roll back only.
*/
+ @Override
public boolean getRollbackOnly() {
return (this.status != null) && (this.status.isRollbackOnly());
}
@@ -63,6 +66,7 @@
/**
* Start a new Spring transaction.
*/
+ @Override
public void beginTransaction() {
if (this.status != null) {
rollbackTransaction();
@@ -74,6 +78,7 @@
/**
* Commit the existing Spring transaction.
*/
+ @Override
public void commitTransaction() {
try {
getTransactionManager().commit(this.status);
@@ -85,6 +90,7 @@
/**
* Roll back the existing Spring transaction.
*/
+ @Override
public void rollbackTransaction() {
try {
getTransactionManager().rollback(this.status);
@@ -100,6 +106,7 @@
/**
* Mark the existing Spring transaction for rollback.
*/
+ @Override
public void setTransactionForRollback() {
if (this.status != null) {
this.status.setRollbackOnly();
@@ -109,6 +116,7 @@
/**
* Is the platform Oracle?
*/
+ @Override
public boolean isOc4j() {
return false;
}
@@ -116,6 +124,7 @@
/**
* Is the platform Weblogic?
*/
+ @Override
public boolean isWeblogic() {
return false;
}
@@ -123,6 +132,7 @@
/**
* Is the platform JBoss?
*/
+ @Override
public boolean isJBoss() {
return false;
}
@@ -130,6 +140,7 @@
/**
* Is the platform clustered?
*/
+ @Override
public boolean isClustered() {
return false;
}
@@ -137,6 +148,7 @@
/**
* Is the platform Spring?
*/
+ @Override
public boolean isSpring() {
return true;
}
@@ -144,12 +156,14 @@
/**
* Managed entity managers do not need to be closed.
*/
+ @Override
public void closeEntityManager(EntityManager entityManager) {
}
/**
* Return the managed EntityManager for the persistence unit.
*/
+ @Override
public EntityManager getEntityManager(String persistenceUnit) {
this.persistenceUnit = persistenceUnit;
return (EntityManager)getContext().getBean("entityManager");
@@ -160,6 +174,7 @@
/**
* Return the managed EntityManagerFactory for the persistence unit.
*/
+ @Override
public EntityManagerFactory getEntityManagerFactory(String persistenceUnit) {
this.persistenceUnit = persistenceUnit;
return (EntityManagerFactory)getContext().getBean("entityManagerFactory");
@@ -187,6 +202,7 @@
/**
* Join the transaction if required
*/
+ @Override
public void joinTransaction(EntityManager em) {
//bug 405308:a shared EM will throw an exception if joinTransaction is called on it.
}
diff --git a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/EntityManagerTransactionWrapper.java b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/EntityManagerTransactionWrapper.java
index f5180fc..74fc9e3 100644
--- a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/EntityManagerTransactionWrapper.java
+++ b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/EntityManagerTransactionWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,18 +27,21 @@
super(emf);
}
+ @Override
public void persist(Object obj) {
em.getTransaction().begin();
em.persist(obj);
em.getTransaction().commit();
}
+ @Override
public void remove(Object obj) {
em.getTransaction().begin();
em.remove(obj);
em.getTransaction().commit();
}
+ @Override
public void flush() {
em.getTransaction().begin();
em.flush();
@@ -46,6 +49,7 @@
}
+ @Override
public int executeNativeQuery(String string) {
em.getTransaction().begin();
int count = em.createNativeQuery(string).executeUpdate();
diff --git a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/EntityManagerTransactionalWrapper.java b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/EntityManagerTransactionalWrapper.java
index 399c29b..8101780 100644
--- a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/EntityManagerTransactionalWrapper.java
+++ b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/EntityManagerTransactionalWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,18 +35,22 @@
this.em = entityManager;
}
+ @Override
public void persist(Object obj) {
em.persist(obj);
}
+ @Override
public void remove(Object obj) {
em.remove(obj);
}
+ @Override
public void flush() {
em.flush();
}
+ @Override
public int executeNativeQuery(String string) {
return em.createNativeQuery(string).executeUpdate();
}
diff --git a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/SpringJunitTestCase.java b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/SpringJunitTestCase.java
index 9a6a717..0baa23c 100644
--- a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/SpringJunitTestCase.java
+++ b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/SpringJunitTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,7 +63,7 @@
assertTrue(((Address)em.find(address)).getStreet().equals("First St."));
em.remove(truck);
- assertTrue(((Truck)em.find(truck)) == null);
+ assertTrue(em.find(truck) == null);
assertTrue(((Route)em.find(route)).getAverageTimeMins() == 155);
assertTrue(((Address)em.find(address)).getStreet().equals("First St."));
} finally {
diff --git a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestContainerEMF.java b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestContainerEMF.java
index b30ed07..e66ece2 100644
--- a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestContainerEMF.java
+++ b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestContainerEMF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
private EntityManagerFactory emf;
private EntityManagerWrapper em;
+ @Override
public void setUp() {
context = new ClassPathXmlApplicationContext("appContext_ContainerEMF.xml");
emf = (EntityManagerFactory)context.getBean("entityManagerFactory");
@@ -38,10 +39,12 @@
super.setEntityManager(em);
}
+ @Override
public void tearDown(){
context.close();
}
+ @Override
public void testDataExceptionTranslation(){
//Not tested in this class; direction instantiation of emf does not support exception translation
}
diff --git a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestContainerEMFtransactional.java b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestContainerEMFtransactional.java
index 5504980..36a1084 100644
--- a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestContainerEMFtransactional.java
+++ b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestContainerEMFtransactional.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,12 +28,14 @@
private ClassPathXmlApplicationContext context;
private EntityManagerWrapper em;
+ @Override
public void setUp() {
context = new ClassPathXmlApplicationContext("appContext_ContainerEMFtransactional.xml");
em = (EntityManagerWrapper) context.getBean("transactionalEM");
super.setEntityManager(em);
}
+ @Override
public void tearDown(){
context.close();
}
diff --git a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestLocalEMF.java b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestLocalEMF.java
index 2dc67f8..281d968 100644
--- a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestLocalEMF.java
+++ b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestLocalEMF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
private EntityManagerWrapper em;
+ @Override
public void setUp() {
context = new ClassPathXmlApplicationContext("appContext_LocalEMF.xml");
emf = (EntityManagerFactory)context.getBean("entityManagerFactory");
@@ -38,10 +39,12 @@
super.setEntityManager(em);
}
+ @Override
public void tearDown() {
context.close();
}
+ @Override
public void testDataExceptionTranslation(){
//Not tested in this class; direction instantiation of emf does not support exception translation
}
diff --git a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestLocalEMFtransactional.java b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestLocalEMFtransactional.java
index 992a877..b5a5e3b 100644
--- a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestLocalEMFtransactional.java
+++ b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/TestLocalEMFtransactional.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,12 +28,14 @@
private ClassPathXmlApplicationContext context;
private EntityManagerWrapper em;
+ @Override
public void setUp() {
context = new ClassPathXmlApplicationContext("appContext_LocalEMFtransactional.xml");
em = (EntityManagerWrapper) context.getBean("transactionalEM");
super.setEntityManager(em);
}
+ @Override
public void tearDown(){
context.close();
}
diff --git a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/dao/SpringAbstractJpaTestsCase.java b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/dao/SpringAbstractJpaTestsCase.java
index a60d73d..bb31b5a 100644
--- a/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/dao/SpringAbstractJpaTestsCase.java
+++ b/jpa/eclipselink.jpa.spring.test/src/it/java/org/eclipse/persistence/testing/tests/jpa/spring/dao/SpringAbstractJpaTestsCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,7 +70,7 @@
assertTrue(((Address)dao.find(address)).getStreet().equals("First St."));
dao.remove(truck);
- assertTrue(((Truck)dao.find(truck)) == null);
+ assertTrue(dao.find(truck) == null);
assertTrue(((Route)dao.find(route)).getAverageTimeMins() == 155);
assertTrue(((Address)dao.find(address)).getStreet().equals("First St."));
}catch (Exception e) {
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/connwrapper/ConnectionWrapper.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/connwrapper/ConnectionWrapper.java
index a1a7fc8..debf0a9 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/connwrapper/ConnectionWrapper.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/connwrapper/ConnectionWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2018 IBM Corporation and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -115,6 +115,7 @@
/*
* The following methods implement Connection interface
*/
+ @Override
public Statement createStatement() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -122,6 +123,7 @@
return conn.createStatement();
}
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -129,6 +131,7 @@
return conn.prepareStatement(sql);
}
+ @Override
public CallableStatement prepareCall(String sql) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -136,6 +139,7 @@
return conn.prepareCall(sql);
}
+ @Override
public String nativeSQL(String sql) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -143,6 +147,7 @@
return conn.nativeSQL(sql);
}
+ @Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -150,6 +155,7 @@
conn.setAutoCommit(autoCommit);
}
+ @Override
public boolean getAutoCommit() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -157,6 +163,7 @@
return conn.getAutoCommit();
}
+ @Override
public void commit() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -164,6 +171,7 @@
conn.commit();
}
+ @Override
public void rollback() throws SQLException {
conn.rollback();
if(broken) {
@@ -171,6 +179,7 @@
}
}
+ @Override
public void close() throws SQLException {
conn.close();
if(broken) {
@@ -178,6 +187,7 @@
}
}
+ @Override
public boolean isClosed() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -185,10 +195,12 @@
return conn.isClosed();
}
+ @Override
public DatabaseMetaData getMetaData() throws SQLException {
return conn.getMetaData();
}
+ @Override
public void setReadOnly(boolean readOnly) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -196,6 +208,7 @@
conn.setReadOnly(readOnly);
}
+ @Override
public boolean isReadOnly() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -203,6 +216,7 @@
return conn.isReadOnly();
}
+ @Override
public void setCatalog(String catalog) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -210,6 +224,7 @@
conn.setCatalog(catalog);
}
+ @Override
public String getCatalog() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -217,6 +232,7 @@
return conn.getCatalog();
}
+ @Override
public void setTransactionIsolation(int level) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -224,6 +240,7 @@
conn.setTransactionIsolation(level);
}
+ @Override
public int getTransactionIsolation() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -231,6 +248,7 @@
return conn.getTransactionIsolation();
}
+ @Override
public SQLWarning getWarnings() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -238,6 +256,7 @@
return conn.getWarnings();
}
+ @Override
public void clearWarnings() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -245,6 +264,7 @@
conn.clearWarnings();
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -252,8 +272,9 @@
return conn.createStatement(resultSetType, resultSetConcurrency);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency)
+ int resultSetConcurrency)
throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -261,14 +282,16 @@
return conn.prepareStatement(sql, resultSetType, resultSetConcurrency);
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency) throws SQLException {
+ int resultSetConcurrency) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
}
return conn.prepareCall(sql, resultSetType, resultSetConcurrency);
}
+ @Override
public java.util.Map<String,Class<?>> getTypeMap() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -276,6 +299,7 @@
return conn.getTypeMap();
}
+ @Override
public void setTypeMap(java.util.Map<String,Class<?>> map) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -283,6 +307,7 @@
conn.setTypeMap(map);
}
+ @Override
public void setHoldability(int holdability) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -290,6 +315,7 @@
conn.setHoldability(holdability);
}
+ @Override
public int getHoldability() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -297,6 +323,7 @@
return conn.getHoldability();
}
+ @Override
public Savepoint setSavepoint() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -304,6 +331,7 @@
return conn.setSavepoint();
}
+ @Override
public Savepoint setSavepoint(String name) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -311,6 +339,7 @@
return conn.setSavepoint(name);
}
+ @Override
public void rollback(Savepoint savepoint) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -318,6 +347,7 @@
conn.rollback();
}
+ @Override
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -325,16 +355,18 @@
conn.releaseSavepoint(savepoint);
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldability) throws SQLException {
+ int resultSetHoldability) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
}
return conn.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency, int resultSetHoldability)
+ int resultSetConcurrency, int resultSetHoldability)
throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -342,15 +374,17 @@
return conn.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldability) throws SQLException {
+ int resultSetConcurrency,
+ int resultSetHoldability) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
}
return conn.prepareCall(sql, resultSetType, resultSetConcurrency);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -358,6 +392,7 @@
return conn.prepareStatement(sql, autoGeneratedKeys);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int columnIndexes[]) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -365,6 +400,7 @@
return conn.prepareStatement(sql, columnIndexes);
}
+ @Override
public PreparedStatement prepareStatement(String sql, String columnNames[]) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -374,65 +410,83 @@
// 236070: Methods introduced in JDK 1.6 (stolen from EmulatedConnection).
// Those *must* be no-op as long as this code should compile under jdk 1.5
+ @Override
public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
return null;
}
+ @Override
public Blob createBlob() throws SQLException {
return null;
}
+ @Override
public Clob createClob() throws SQLException {
return null;
}
+ @Override
public NClob createNClob() throws SQLException {
return null;
}
+ @Override
public SQLXML createSQLXML() throws SQLException {
return null;
}
+ @Override
public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
return null;
}
+ @Override
public Properties getClientInfo() throws SQLException {
return null;
}
+ @Override
public String getClientInfo(String name) throws SQLException {
return null;
}
+ @Override
public boolean isValid(int timeout) throws SQLException {
return false;
}
+ @Override
public void setClientInfo(String name, String value) {
}
+ @Override
public void setClientInfo(Properties properties) {
}
// From java.sql.Wrapper
+ @Override
public boolean isWrapperFor(Class<?> iFace) throws SQLException {
return false;
}
+ @Override
public <T> T unwrap(Class<T> iFace) throws SQLException {
return iFace.cast(this);
}
+ @Override
public int getNetworkTimeout(){return 0;}
+ @Override
public void setNetworkTimeout(Executor executor, int milliseconds){}
+ @Override
public void abort(Executor executor){}
+ @Override
public String getSchema(){return null;}
+ @Override
public void setSchema(String schema){}
}
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/connwrapper/DriverWrapper.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/connwrapper/DriverWrapper.java
index 8a13d84..8975ba6 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/connwrapper/DriverWrapper.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/connwrapper/DriverWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2018 IBM Corporation and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -223,6 +223,7 @@
/*
* The following methods implement Driver interface
*/
+ @Override
public Connection connect(String url, java.util.Properties info) throws SQLException {
if(driverBroken) {
throw new SQLException(getDriverBrokenExceptionString());
@@ -243,6 +244,7 @@
}
}
+ @Override
public boolean acceptsURL(String url) throws SQLException {
if(driverName != null) {
if(driverBroken) {
@@ -256,6 +258,7 @@
}
}
+ @Override
public DriverPropertyInfo[] getPropertyInfo(String url, java.util.Properties info) throws SQLException {
if(driverBroken) {
throw new SQLException(getDriverBrokenExceptionString());
@@ -263,17 +266,21 @@
return getDriver().getPropertyInfo(url, info);
}
+ @Override
public int getMajorVersion() {
return getDriver().getMajorVersion();
}
+ @Override
public int getMinorVersion() {
return getDriver().getMinorVersion();
}
+ @Override
public boolean jdbcCompliant() {
return getDriver().jdbcCompliant();
}
+ @Override
public Logger getParentLogger() {return null;}
}
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/converter/TestAutoApplyConverter.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/converter/TestAutoApplyConverter.java
index 857c727..e690b7c 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/converter/TestAutoApplyConverter.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/converter/TestAutoApplyConverter.java
@@ -565,8 +565,8 @@
EntityManager em = emfAutoApplyConverters.createEntityManager();
long id = System.currentTimeMillis();
- Long valueConvert = Long.valueOf((long) 42);
- Long valueNoConvert = Long.valueOf((long) 100);
+ Long valueConvert = Long.valueOf(42);
+ Long valueNoConvert = Long.valueOf(100);
try {
LongToStringAutoApplyConverter.reset();
ConvertEntityLW2S entity = new ConvertEntityLW2S(id, valueConvert, valueNoConvert);
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/basic/TestBasicPersistence.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/basic/TestBasicPersistence.java
index adcef20..9f9242d 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/basic/TestBasicPersistence.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/basic/TestBasicPersistence.java
@@ -509,25 +509,34 @@
this.text = text;
}
+ @Override
public Connection getConnection() throws SQLException {
RuntimeException exception = new RuntimeException(text);
throw exception;
}
+ @Override
public Connection getConnection(String username, String password) throws SQLException {
return getConnection();
}
//rest are ignored
+ @Override
public java.io.PrintWriter getLogWriter() throws SQLException {
return null;
}
+ @Override
public void setLogWriter(java.io.PrintWriter out) throws SQLException{}
+ @Override
public void setLoginTimeout(int seconds) throws SQLException{}
+ @Override
public int getLoginTimeout() throws SQLException { return 1; }
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException { return null; }
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException { return false; }
+ @Override
public Logger getParentLogger() { return null; }
}
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/cachedeadlock/MainThread.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/cachedeadlock/MainThread.java
index f897978..29afd7d 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/cachedeadlock/MainThread.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/cachedeadlock/MainThread.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
queryDetail.setParameter("id", ID);
}
+ @Override
public void run() {
CacheDeadLockDetectionMaster resultsMaster = queryMaster.getSingleResult();
CacheDeadLockDetectionDetail resultsDetail = queryDetail.getSingleResult();
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/oraclefeatures/OracleLOBLocatorSessionCustomizer.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/oraclefeatures/OracleLOBLocatorSessionCustomizer.java
index 28e14a3..a148ea2 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/oraclefeatures/OracleLOBLocatorSessionCustomizer.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/oraclefeatures/OracleLOBLocatorSessionCustomizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -37,6 +37,7 @@
* PUBLIC:
* This Event is raised after the session logs in.
*/
+ @Override
public void postLogin(SessionEvent event) {
Session session = event.getSession();
Platform dbPlatform = session.getDatasourcePlatform();
diff --git a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/sequence/TestSequenceStartAtNextValue.java b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/sequence/TestSequenceStartAtNextValue.java
index ce6f4dc..83c9156 100644
--- a/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/sequence/TestSequenceStartAtNextValue.java
+++ b/jpa/eclipselink.jpa.test.jse/src/it/java/org/eclipse/persistence/jpa/test/sequence/TestSequenceStartAtNextValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -60,10 +60,10 @@
//Expect (nextVal + size), not (nextVal + size) - size
Assert.assertEquals("Expected " + seqNum + " == " + nextVal + " + " + seq.getPreallocationSize() + "(Size)", nextVal + seq.getPreallocationSize(), seqNum);
} else {
- Assert.fail((DatasourcePlatform)seq.getDatasourcePlatform() + " does support SequenceObjects, but SelectQuery is null.");
+ Assert.fail(seq.getDatasourcePlatform() + " does support SequenceObjects, but SelectQuery is null.");
}
} else {
- System.out.println((DatasourcePlatform)seq.getDatasourcePlatform() + " does not support SequenceObjects. Test is not valid.");
+ System.out.println(seq.getDatasourcePlatform() + " does not support SequenceObjects. Test is not valid.");
}
} else {
Assert.fail("Expected sequence for " + SequenceEntity.class + " to be of type QuerySequence, but was " + seq);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java
index 7f1d418..52423b2 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -184,7 +184,7 @@
if (isOnServer()) {
return getServerPlatform().getEntityManagerFactory(persistenceUnitName);
} else {
- EntityManagerFactory emfNamedPersistenceUnit = (EntityManagerFactory) emfNamedPersistenceUnits
+ EntityManagerFactory emfNamedPersistenceUnit = emfNamedPersistenceUnits
.get(persistenceUnitName);
if (emfNamedPersistenceUnit == null) {
emfNamedPersistenceUnit = Persistence.createEntityManagerFactory(persistenceUnitName, properties);
@@ -207,7 +207,7 @@
}
public static void closeEntityManagerFactory(String persistenceUnitName) {
- EntityManagerFactory emfNamedPersistenceUnit = (EntityManagerFactory) emfNamedPersistenceUnits.get(persistenceUnitName);
+ EntityManagerFactory emfNamedPersistenceUnit = emfNamedPersistenceUnits.get(persistenceUnitName);
if (emfNamedPersistenceUnit != null) {
if (emfNamedPersistenceUnit.isOpen()) {
emfNamedPersistenceUnit.close();
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/server/JEEPlatform.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/server/JEEPlatform.java
index b5ce950..63fa976 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/server/JEEPlatform.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/server/JEEPlatform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -37,6 +37,7 @@
/**
* Return if the JTA transaction is active.
*/
+ @Override
public boolean isTransactionActive() {
try {
return getUserTransaction().getStatus() != Status.STATUS_NO_TRANSACTION;
@@ -48,6 +49,7 @@
/**
* Return if the JTA transaction is roll back only.
*/
+ @Override
public boolean getRollbackOnly() {
try {
return getUserTransaction().getStatus() != Status.STATUS_ACTIVE;
@@ -59,6 +61,7 @@
/**
* Start a new JTA transaction.
*/
+ @Override
public void beginTransaction() {
try {
getUserTransaction().begin();
@@ -70,6 +73,7 @@
/**
* Commit the existing JTA transaction.
*/
+ @Override
public void commitTransaction() {
try {
getUserTransaction().commit();
@@ -81,6 +85,7 @@
/**
* Roll back the existing JTA transaction.
*/
+ @Override
public void rollbackTransaction() {
try {
getUserTransaction().rollback();
@@ -100,6 +105,7 @@
/**
* Mark the existing JTA transaction for rollback.
*/
+ @Override
public void setTransactionForRollback() {
try {
getUserTransaction().setRollbackOnly();
@@ -111,6 +117,7 @@
/**
* Is the platform Oracle?
*/
+ @Override
public boolean isOc4j() {
return false;
}
@@ -118,6 +125,7 @@
/**
* Is the platform Weblogic?
*/
+ @Override
public boolean isWeblogic() {
return false;
}
@@ -125,6 +133,7 @@
/**
* Is the platform JBoss?
*/
+ @Override
public boolean isJBoss() {
return false;
}
@@ -132,6 +141,7 @@
/**
* Is the platform clustered?
*/
+ @Override
public boolean isClustered() {
return false;
}
@@ -139,6 +149,7 @@
/**
* Return the managed EntityManager for the persistence unit.
*/
+ @Override
public EntityManager getEntityManager(String persistenceUnit) {
if (entityManager != null) {
return entityManager;
@@ -154,6 +165,7 @@
/**
* Return the managed EntityManagerFactory for the persistence unit.
*/
+ @Override
public EntityManagerFactory getEntityManagerFactory(String persistenceUnit) {
if (entityManagerFactory != null) {
return entityManagerFactory;
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/AbstractBaseTest.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/AbstractBaseTest.java
index 9fc3f29..558251d 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/AbstractBaseTest.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/AbstractBaseTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -651,7 +651,7 @@
if (ServerInfoHolder.isOnServer()) {
return getServerPlatform().getEntityManagerFactory(persistenceUnitName);
} else {
- EntityManagerFactory emfNamedPersistenceUnit = (EntityManagerFactory) emfNamedPersistenceUnits.get(persistenceUnitName);
+ EntityManagerFactory emfNamedPersistenceUnit = emfNamedPersistenceUnits.get(persistenceUnitName);
if (emfNamedPersistenceUnit == null) {
emfNamedPersistenceUnit = Persistence.createEntityManagerFactory(persistenceUnitName, properties);
emfNamedPersistenceUnits.put(persistenceUnitName, emfNamedPersistenceUnit);
@@ -669,7 +669,7 @@
}
public static void closeEntityManagerFactory(String persistenceUnitName) {
- EntityManagerFactory emfNamedPersistenceUnit = (EntityManagerFactory) emfNamedPersistenceUnits.get(persistenceUnitName);
+ EntityManagerFactory emfNamedPersistenceUnit = emfNamedPersistenceUnits.get(persistenceUnitName);
if (emfNamedPersistenceUnit != null) {
if (emfNamedPersistenceUnit.isOpen()) {
emfNamedPersistenceUnit.close();
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/PooledDataSource.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/PooledDataSource.java
index bad9c2d..a77dfae 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/PooledDataSource.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/PooledDataSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -50,6 +50,7 @@
other = ds;
}
+ @Override
public Connection getConnection() throws SQLException {
final Connection conn;
if (connections.isEmpty()) {
@@ -60,32 +61,40 @@
return new PooledConnection(conn);
}
+ @Override
public Connection getConnection(String username, String password) throws SQLException {
return other.getConnection(username, password);
}
+ @Override
public int getLoginTimeout() throws SQLException {
return other.getLoginTimeout();
}
+ @Override
public PrintWriter getLogWriter() throws SQLException {
return other.getLogWriter();
}
+ @Override
public Logger getParentLogger() {return null;}
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return other.isWrapperFor(iface);
}
+ @Override
public void setLoginTimeout(int seconds) throws SQLException {
other.setLoginTimeout(seconds);
}
+ @Override
public void setLogWriter(PrintWriter out) throws SQLException {
other.setLogWriter(out);
}
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
return other.unwrap(iface);
}
@@ -94,246 +103,295 @@
private Connection other;
+ @Override
public void clearWarnings() throws SQLException {
assertOpen();
other.clearWarnings();
}
+ @Override
public void close() throws SQLException {
assertOpen();
connections.push(other);
other = null;
}
+ @Override
public void commit() throws SQLException {
assertOpen();
other.commit();
}
+ @Override
public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
assertOpen();
return other.createArrayOf(typeName, elements);
}
+ @Override
public Blob createBlob() throws SQLException {
assertOpen();
return other.createBlob();
}
+ @Override
public Clob createClob() throws SQLException {
assertOpen();
return other.createClob();
}
+ @Override
public NClob createNClob() throws SQLException {
assertOpen();
return other.createNClob();
}
+ @Override
public SQLXML createSQLXML() throws SQLException {
assertOpen();
return other.createSQLXML();
}
+ @Override
public Statement createStatement() throws SQLException {
assertOpen();
return other.createStatement();
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability)
throws SQLException {
assertOpen();
return other.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
assertOpen();
return other.createStatement(resultSetType, resultSetConcurrency);
}
+ @Override
public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
assertOpen();
return other.createStruct(typeName, attributes);
}
+ @Override
public boolean getAutoCommit() throws SQLException {
assertOpen();
return other.getAutoCommit();
}
+ @Override
public String getCatalog() throws SQLException {
assertOpen();
return other.getCatalog();
}
+ @Override
public Properties getClientInfo() throws SQLException {
assertOpen();
return other.getClientInfo();
}
+ @Override
public String getClientInfo(String name) throws SQLException {
assertOpen();
return other.getClientInfo(name);
}
+ @Override
public int getHoldability() throws SQLException {
assertOpen();
return other.getHoldability();
}
+ @Override
public DatabaseMetaData getMetaData() throws SQLException {
assertOpen();
return other.getMetaData();
}
+ @Override
public int getTransactionIsolation() throws SQLException {
assertOpen();
return other.getTransactionIsolation();
}
+ @Override
public Map<String, Class<?>> getTypeMap() throws SQLException {
assertOpen();
return other.getTypeMap();
}
+ @Override
public SQLWarning getWarnings() throws SQLException {
assertOpen();
return other.getWarnings();
}
+ @Override
public boolean isClosed() throws SQLException {
return other.isClosed();
}
+ @Override
public boolean isReadOnly() throws SQLException {
assertOpen();
return other.isReadOnly();
}
+ @Override
public boolean isValid(int timeout) throws SQLException {
assertOpen();
return other.isValid(timeout);
}
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
assertOpen();
return other.isWrapperFor(iface);
}
+ @Override
public String nativeSQL(String sql) throws SQLException {
assertOpen();
return other.nativeSQL(sql);
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability)
throws SQLException {
assertOpen();
return other.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
assertOpen();
return other.prepareCall(sql, resultSetType, resultSetConcurrency);
}
+ @Override
public CallableStatement prepareCall(String sql) throws SQLException {
assertOpen();
return other.prepareCall(sql);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
- int resultSetHoldability) throws SQLException {
+ int resultSetHoldability) throws SQLException {
assertOpen();
return other.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
assertOpen();
return other.prepareStatement(sql, resultSetType, resultSetConcurrency);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
assertOpen();
return other.prepareStatement(sql, autoGeneratedKeys);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
assertOpen();
return other.prepareStatement(sql, columnIndexes);
}
+ @Override
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
assertOpen();
return other.prepareStatement(sql, columnNames);
}
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
assertOpen();
return other.prepareStatement(sql);
}
+ @Override
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
assertOpen();
other.releaseSavepoint(savepoint);
}
+ @Override
public void rollback() throws SQLException {
assertOpen();
other.rollback();
}
+ @Override
public void rollback(Savepoint savepoint) throws SQLException {
assertOpen();
other.rollback(savepoint);
}
+ @Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
assertOpen();
other.setAutoCommit(autoCommit);
}
+ @Override
public void setCatalog(String catalog) throws SQLException {
assertOpen();
other.setCatalog(catalog);
}
+ @Override
public void setClientInfo(Properties properties) throws SQLClientInfoException {
other.setClientInfo(properties);
}
+ @Override
public void setClientInfo(String name, String value) throws SQLClientInfoException {
other.setClientInfo(name, value);
}
+ @Override
public void setHoldability(int holdability) throws SQLException {
assertOpen();
other.setHoldability(holdability);
}
+ @Override
public void setReadOnly(boolean readOnly) throws SQLException {
assertOpen();
other.setReadOnly(readOnly);
}
+ @Override
public Savepoint setSavepoint() throws SQLException {
assertOpen();
return other.setSavepoint();
}
+ @Override
public Savepoint setSavepoint(String name) throws SQLException {
return other.setSavepoint(name);
}
+ @Override
public void setTransactionIsolation(int level) throws SQLException {
assertOpen();
other.setTransactionIsolation(level);
}
+ @Override
public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
assertOpen();
other.setTypeMap(map);
}
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
assertOpen();
return other.unwrap(iface);
@@ -350,14 +408,19 @@
}
}
+ @Override
public int getNetworkTimeout(){return 0;}
+ @Override
public void setNetworkTimeout(Executor executor, int milliseconds){}
+ @Override
public void abort(Executor executor){}
+ @Override
public String getSchema(){return null;}
+ @Override
public void setSchema(String schema){}
}
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/SkipBugzillaTestRunner.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/SkipBugzillaTestRunner.java
index dbd7c64..b7fb302 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/SkipBugzillaTestRunner.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/framework/wdf/SkipBugzillaTestRunner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -123,7 +123,7 @@
databasePlatformClass = null; // FIXME
}
- String testBugzillaRun = (String) testProperties.get(TEST_BUGZILLA_RUN);
+ String testBugzillaRun = testProperties.get(TEST_BUGZILLA_RUN);
if ("all".equals(testBugzillaRun)) {
runAllBugzilla = true;
bugid = -1;
@@ -136,7 +136,7 @@
}
}
- String testIssueRun = (String) testProperties.get(TEST_ISSUE_RUN);
+ String testIssueRun = testProperties.get(TEST_ISSUE_RUN);
if ("all".equals(testIssueRun)) {
runAllIssues = true;
issueid = -1;
@@ -149,7 +149,7 @@
}
}
- String testToBeInvestigatedRun = (String) testProperties.get(TEST_TO_BE_INVESTIGATED_RUN);
+ String testToBeInvestigatedRun = testProperties.get(TEST_TO_BE_INVESTIGATED_RUN);
if ("all".equals(testToBeInvestigatedRun)) {
runAllUnknown = true;
runOnlyUnknown = false;
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java
index 90f9962..b3f898d 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/JPA1Base.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -41,6 +41,7 @@
super("jpa1testmodel");
}
+ @Override
final protected String[] getClearableTableNames() {
return CLEARABLE_TABLE_NAMES;
}
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithFieldAccess.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithFieldAccess.java
index 71a460f..81e9112 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithFieldAccess.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithFieldAccess.java
@@ -145,6 +145,7 @@
+ ") in embedded field");
}
+ @Override
public void mutate(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -155,12 +156,14 @@
obj.getFieldAccess().changeTime(-CHANGED);
}
+ @Override
public boolean isNull(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
return obj.getFieldAccess().retrieveDate() == null && obj.getFieldAccess().retrieveTime() == 0L;
}
+ @Override
public void setNull(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -168,6 +171,7 @@
obj.getFieldAccess().changeTime(0L);
}
+ @Override
public void set(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -175,6 +179,7 @@
obj.getFieldAccess().changeTime(-UNCHANGED);
}
+ @Override
public void change(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -182,6 +187,7 @@
obj.getFieldAccess().changeTime(-CHANGED);
}
+ @Override
public boolean isChanged(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -218,6 +224,7 @@
+ ") in embedded field");
}
+ @Override
public void mutate(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.propertyAccess);
@@ -225,12 +232,14 @@
obj.propertyAccess.setTime(-CHANGED);
}
+ @Override
public boolean isNull(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.propertyAccess);
return obj.propertyAccess.getDate() == null && obj.propertyAccess.getTime() == 0L;
}
+ @Override
public void setNull(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.propertyAccess);
@@ -238,6 +247,7 @@
obj.propertyAccess.setTime(0L);
}
+ @Override
public void set(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.propertyAccess);
@@ -245,6 +255,7 @@
obj.propertyAccess.setTime(-UNCHANGED);
}
+ @Override
public void change(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.propertyAccess);
@@ -252,6 +263,7 @@
obj.propertyAccess.setTime(-CHANGED);
}
+ @Override
public boolean isChanged(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.propertyAccess);
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithPropertyAccess.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithPropertyAccess.java
index a496104..88e5d39 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithPropertyAccess.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/embedded/TestEmbeddingWithPropertyAccess.java
@@ -148,6 +148,7 @@
+ ") in embedded field");
}
+ @Override
public void mutate(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -158,12 +159,14 @@
obj.getFieldAccess().changeTime(-CHANGED);
}
+ @Override
public boolean isNull(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
return obj.getFieldAccess().retrieveDate() == null && obj.getFieldAccess().retrieveTime() == 0L;
}
+ @Override
public void setNull(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -171,6 +174,7 @@
obj.getFieldAccess().changeTime(0L);
}
+ @Override
public void set(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -178,6 +182,7 @@
obj.getFieldAccess().changeTime(-UNCHANGED);
}
+ @Override
public void change(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -185,6 +190,7 @@
obj.getFieldAccess().changeTime(-CHANGED);
}
+ @Override
public boolean isChanged(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -218,6 +224,7 @@
+ ") in embedded field");
}
+ @Override
public void mutate(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getPropertyAccess());
@@ -225,12 +232,14 @@
obj.getPropertyAccess().setTime(-CHANGED);
}
+ @Override
public boolean isNull(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getPropertyAccess());
return obj.getPropertyAccess().getDate() == null && obj.getPropertyAccess().getTime() == 0L;
}
+ @Override
public void setNull(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getPropertyAccess());
@@ -238,6 +247,7 @@
obj.getPropertyAccess().setTime(0L);
}
+ @Override
public void set(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getPropertyAccess());
@@ -245,6 +255,7 @@
obj.getPropertyAccess().setTime(-UNCHANGED);
}
+ @Override
public void change(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getPropertyAccess());
@@ -252,6 +263,7 @@
obj.getPropertyAccess().setTime(-CHANGED);
}
+ @Override
public boolean isChanged(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getPropertyAccess());
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/generator/TestSequence.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/generator/TestSequence.java
index 37ab984..b430a54 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/generator/TestSequence.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/generator/TestSequence.java
@@ -101,14 +101,14 @@
final Element water = new Element("water");
em.persist(tree); // id 1
em2.persist(water); // id 4
- Assert.assertEquals("wrong allocation", ((int) tree.getId() + 3), ((int) water.getId()));
+ Assert.assertEquals("wrong allocation", (tree.getId() + 3), ((int) water.getId()));
final Plant flower = new Plant("flower");
final Plant grass = new Plant("grass");
final Plant bush = new Plant("bush");
em.persist(flower); // id 2
em.persist(grass); // id 3
em.persist(bush); // id 7
- Assert.assertEquals("wrong allocation", ((int) water.getId() + 3), ((int) bush.getId()));
+ Assert.assertEquals("wrong allocation", (water.getId() + 3), ((int) bush.getId()));
em.getTransaction().commit();
em2.getTransaction().commit();
} finally {
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/inheritance/CallbackTest.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/inheritance/CallbackTest.java
index aaa8299..a1d420e 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/inheritance/CallbackTest.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/inheritance/CallbackTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -56,6 +56,7 @@
callCounter = 0;
}
+ @Override
public void callbackCalled(Object entity, Class<? extends Annotation> event) {
if (event != expectedEvent) {
log.add("Wrong event, expected " + expectedEvent + ", got " + event);
@@ -101,12 +102,14 @@
final EntityManager em = environment.getEntityManager();
try {
VehicleListener.setListener(new CallbackEventListener() {
+ @Override
public void callbackCalled(Object entity, Class<? extends Annotation> event) {
vehicleCallbackCalled((Vehicle) entity, event);
}
});
try {
BikeListener.setListener(new CallbackEventListener() {
+ @Override
public void callbackCalled(Object entity, Class<? extends Annotation> event) {
bikeCallbackCalled((Bicycle) entity, event);
}
@@ -197,12 +200,14 @@
final MountainBike storedMountainBike = (MountainBike) em.find(Vehicle.class, mountainBike.getId());
// test starts here
VehicleListener.setListener(new CallbackEventListener() {
+ @Override
public void callbackCalled(Object entity, Class<? extends Annotation> event) {
vehicleCallbackCalled((Vehicle) entity, event);
}
});
try {
BikeListener.setListener(new CallbackEventListener() {
+ @Override
public void callbackCalled(Object entity, Class<? extends Annotation> event) {
bikeCallbackCalled((Bicycle) entity, event);
}
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java
index 3b44b8f..0fddbdb 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestParameterTypes.java
@@ -121,15 +121,18 @@
@Test
public void testPrimitiveBoolean() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveBoolean(true);
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.primitiveBoolean = ?1 and b.id = ?2")
.setParameter(1, Boolean.TRUE).setParameter(2, Integer.valueOf(id));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
@@ -140,14 +143,17 @@
@Test
public void testPrimitiveByte() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimititveByte((byte) 17);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.primititveByte = ?1 and b.id = ?2")
.setParameter(1, Byte.valueOf((byte) 17)).setParameter(2, Integer.valueOf(id)).setParameter(2,
@@ -160,14 +166,17 @@
@Test
public void testPrimitiveChar() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveChar('A');
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.primitiveChar = ?1 and b.id = ?2")
.setParameter(1, Character.valueOf('A')).setParameter(2, Integer.valueOf(id));
@@ -179,14 +188,17 @@
@Test
public void testPrimitiveShort() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveShort((short) 19);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.primitiveShort = ?1 and b.id = ?2")
.setParameter(1, Short.valueOf((short) 19)).setParameter(2, Integer.valueOf(id));
@@ -198,14 +210,17 @@
@Test
public void testPrimitiveInt() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveInt(88);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.primitiveInt = ?1 and b.id = ?2")
.setParameter(1, Integer.valueOf(88)).setParameter(2, Integer.valueOf(id));
@@ -217,14 +232,17 @@
@Test
public void testPrimitiveLong() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveLong(88);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.primitiveLong = ?1 and b.id = ?2")
.setParameter(1, Long.valueOf(88)).setParameter(2, Integer.valueOf(id));
@@ -236,14 +254,17 @@
@Test
public void testPrimitiveFloat() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveFloat((float) 88.5);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.primitiveFloat = ?1 and b.id = ?2")
.setParameter(1, Float.valueOf("88.5")).setParameter(2, Integer.valueOf(id));
@@ -255,14 +276,17 @@
@Test
public void testPrimitiveDouble() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveDouble(99.5);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.primitiveDouble = ?1 and b.id = ?2")
.setParameter(1, Double.valueOf(("99.5"))).setParameter(2, Integer.valueOf(id));
@@ -275,15 +299,18 @@
@Test
public void testWrapperBoolean() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperBoolean(Boolean.TRUE);
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.wrapperBoolean = ?1 and b.id = ?2")
.setParameter(1, Boolean.TRUE).setParameter(2, Integer.valueOf(id));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
@@ -294,14 +321,17 @@
@Test
public void testWrapperByte() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperByte(Byte.valueOf((byte) 17));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.wrapperByte = ?1 and b.id = ?2")
.setParameter(1, Byte.valueOf((byte) 17)).setParameter(2, Integer.valueOf(id));
@@ -313,14 +343,17 @@
@Test
public void testWrapperCharacter() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperCharacter(Character.valueOf('A'));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.wrapperCharacter = ?1 and b.id = ?2")
.setParameter(1, Character.valueOf('A')).setParameter(2, Integer.valueOf(id));
@@ -332,14 +365,17 @@
@Test
public void testWrapperShort() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperShort(Short.valueOf((short) 1));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.wrapperShort = ?1 and b.id = ?2")
.setParameter(1, Short.valueOf((short) 1)).setParameter(2, Integer.valueOf(id));
@@ -351,14 +387,17 @@
@Test
public void testWrapperInteger() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperInteger(Integer.valueOf(1));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.wrapperInteger = ?1 and b.id = ?2")
.setParameter(1, Integer.valueOf(1)).setParameter(2, Integer.valueOf(id));
@@ -370,14 +409,17 @@
@Test
public void testWrapperLong() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperLong(Long.valueOf(1));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.wrapperLong = ?1 and b.id = ?2")
.setParameter(1, Long.valueOf(1)).setParameter(2, Integer.valueOf(id));
@@ -389,14 +431,17 @@
@Test
public void testWrapperDouble() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperDouble(Double.valueOf(1));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.wrapperDouble = ?1 and b.id = ?2")
.setParameter(1, Double.valueOf(("1"))).setParameter(2, Integer.valueOf(id));
@@ -408,14 +453,17 @@
@Test
public void testWrapperFloat() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperFloat(Float.valueOf(1));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.wrapperFloat = ?1 and b.id = ?2")
.setParameter(1, Float.valueOf("1")).setParameter(2, Integer.valueOf(id));
@@ -428,14 +476,17 @@
@Test
public void testString2Varchar() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setString2Varchar("VC 1");
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.string2Varchar = ?1 and b.id = ?2")
.setParameter(1, "VC 1").setParameter(2, Integer.valueOf(id));
@@ -447,14 +498,17 @@
@Test
public void testString2Clob() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setString2Clob("VC 1");
}
+ @Override
public boolean isComparableJdbcType() {
return false;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
throw new UnsupportedOperationException();
}
@@ -465,14 +519,17 @@
@Test
public void testBigDecimal() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setBigDecimal(new BigDecimal("1.1"));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.bigDecimal = ?1 and b.id = ?2")
.setParameter(1, new BigDecimal("1.1")).setParameter(2, Integer.valueOf(id));
@@ -484,14 +541,17 @@
@Test
public void testBigInteger() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setBigInteger(new BigInteger("11"));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.bigInteger = ?1 and b.id = ?2")
.setParameter(1, new BigInteger("11")).setParameter(2, Integer.valueOf(id));
@@ -504,14 +564,17 @@
@Test
public void testUtilDate() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilDate(new Date(1000));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.utilDate = ?1 and b.id = ?2")
.setParameter(1, new Date(1000), TemporalType.TIMESTAMP).setParameter(2, Integer.valueOf(id));
@@ -523,14 +586,17 @@
@Test
public void testUtilCalendar() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(2005, 9, 8, 10, 49));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.utilCalendar = ?1 and b.id = ?2")
.setParameter(1, new GregorianCalendar(2005, 9, 8, 10, 49), TemporalType.TIMESTAMP).setParameter(2,
@@ -543,14 +609,17 @@
@Test
public void testSqlDate() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSqlDate(java.sql.Date.valueOf("2005-09-08"));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.sqlDate = ?1 and b.id = ?2").setParameter(
1, java.sql.Date.valueOf("2005-09-08")).setParameter(2, Integer.valueOf(id));
@@ -562,14 +631,17 @@
@Test
public void testSqlTime() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSqlTime(java.sql.Time.valueOf("10:49:00"));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.sqlTime = ?1 and b.id = ?2").setParameter(
1, java.sql.Time.valueOf("10:49:00")).setParameter(2, Integer.valueOf(id));
@@ -581,14 +653,17 @@
@Test
public void testSqlTimestamp() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSqlTimestamp(new java.sql.Timestamp(1000));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.sqlTimestamp = ?1 and b.id = ?2")
.setParameter(1, new java.sql.Timestamp(1000)).setParameter(2, Integer.valueOf(id));
@@ -602,14 +677,17 @@
public void testPrimitiveByteArray2Binary() {
final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Binary(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery(
"select b from BasicTypesFieldAccess b where b.primitiveByteArray2Binary = ?1 and b.id = ?2")
@@ -623,14 +701,17 @@
public void testPrimitiveByteArray2Longvarbinary() {
final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Longvarbinary(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return false;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
throw new UnsupportedOperationException();
}
@@ -642,14 +723,17 @@
public void testPrimitiveByteArray2Blob() {
final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Blob(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return false;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
throw new UnsupportedOperationException();
}
@@ -661,14 +745,17 @@
public void testPrimitiveCharArray2Varchar() {
final char[] UNCHANGED = new char[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveCharArray2Varchar(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery(
"select b from BasicTypesFieldAccess b where b.primitiveCharArray2Varchar = ?1 and b.id = ?2")
@@ -682,14 +769,17 @@
public void testPrimitiveCharArray2Clob() {
final char[] UNCHANGED = new char[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveCharArray2Clob(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return false;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
throw new UnsupportedOperationException();
}
@@ -703,14 +793,17 @@
Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
Byte.valueOf((byte) 7) };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Binary(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery(
"select b from BasicTypesFieldAccess b where b.wrapperByteArray2Binary = ?1 and b.id = ?2")
@@ -726,14 +819,17 @@
Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
Byte.valueOf((byte) 7) };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Longvarbinary(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return false;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
throw new UnsupportedOperationException();
}
@@ -747,14 +843,17 @@
Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
Byte.valueOf((byte) 7) };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Blob(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return false;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
throw new UnsupportedOperationException();
}
@@ -767,14 +866,17 @@
public void testWrapperCharArray2Varchar() {
final Character[] UNCHANGED = new Character[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperCharacterArray2Varchar(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery(
"select b from BasicTypesFieldAccess b where b.wrapperCharacterArray2Varchar = ?1 and b.id = ?2")
@@ -789,14 +891,17 @@
public void testWrapperCharArray2Clob() {
final Character[] UNCHANGED = new Character[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperCharacterArray2Clob(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return false;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
throw new UnsupportedOperationException();
}
@@ -809,14 +914,17 @@
Validator validator = new Validator() {
UserDefinedSerializable UNCHANGED = new UserDefinedSerializable("Unchanged");
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSerializable(UNCHANGED);
}
+ @Override
public boolean isComparableJdbcType() {
return false;
}
+ @Override
public Query createQuery(EntityManager em, int id) {
throw new UnsupportedOperationException();
}
@@ -827,15 +935,18 @@
@Test
public void testEnumString() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setEnumString(UserDefinedEnum.HUGO);
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.enumString = ?1 and b.id = ?2")
.setParameter(1, UserDefinedEnum.HUGO).setParameter(2, Integer.valueOf(id));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
@@ -846,15 +957,18 @@
@Test
public void testEnumOrdinal() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setEnumOrdinal(UserDefinedEnum.HUGO);
}
+ @Override
public Query createQuery(EntityManager em, int id) {
return em.createQuery("select b from BasicTypesFieldAccess b where b.enumOrdinal = ?1 and b.id = ?2")
.setParameter(1, UserDefinedEnum.HUGO).setParameter(2, Integer.valueOf(id));
}
+ @Override
public boolean isComparableJdbcType() {
return true;
}
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectList.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectList.java
index c542fdf..1bdf308 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectList.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/query/TestSelectList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -232,7 +232,7 @@
for (BasicTypesFieldAccess btfa : entities) {
btfa.setPrimitiveDouble(Double.parseDouble("0.5"));
btfa.setString2Varchar("maeh");
- btfa.setPrimitiveLong((long) 456);
+ btfa.setPrimitiveLong(456);
btfa.setBigDecimal(new BigDecimal(5));
btfa.setBigInteger(BigInteger.valueOf(10));
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEagerLoading.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEagerLoading.java
index 8177883..0896be6 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEagerLoading.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/relation/TestEagerLoading.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -175,6 +175,7 @@
}
private static class EmployeeComparator implements Comparator<Employee> {
+ @Override
public int compare(Employee e1, Employee e2) {
if (e1.getId() < e2.getId()) {
return -1;
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/BufferReadTest.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/BufferReadTest.java
index aea8234..a2c5b24 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/BufferReadTest.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/BufferReadTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -67,18 +67,22 @@
@Test
public void testFindOutsideTransaction() {
Action action = new Action() {
+ @Override
public void run() {
em.clear();
em.find(BasicTypesPropertyAccess.class, KEY);
}
+ @Override
public String description() {
return "find outside transaction (large, hit)";
}
+ @Override
public void prepare() {
}
+ @Override
public void tearDown() {
}
};
@@ -88,18 +92,22 @@
@Test
public void testFindOutsideTransactionSmall() {
Action action = new Action() {
+ @Override
public void run() {
em.clear();
em.find(Department.class, KEY);
}
+ @Override
public String description() {
return "find outside transaction (small, hit)";
}
+ @Override
public void prepare() {
}
+ @Override
public void tearDown() {
}
};
@@ -111,20 +119,24 @@
Action action = new Action() {
Query query;
+ @Override
public void run() {
em.clear();
}
+ @Override
public String description() {
return "query complete outside transaction (small, hit)";
}
+ @Override
public void prepare() {
query = em.createQuery("select d from Department d where d.id = ?1");
query.setParameter(1, Integer.valueOf(1));
query.getSingleResult();
}
+ @Override
public void tearDown() {
}
};
@@ -138,21 +150,25 @@
Action action = new Action() {
Query query;
+ @Override
public void run() {
myEm.clear();
query.getSingleResult();
}
+ @Override
public String description() {
return "query execute outside transaction (small, hit)";
}
+ @Override
public void prepare() {
getEnvironment().beginTransaction(myEm);
query = myEm.createQuery("select d from Department d where d.id = ?1");
query.setParameter(1, Integer.valueOf(1));
}
+ @Override
public void tearDown() {
}
@@ -167,15 +183,18 @@
Action action = new Action() {
Query query;
+ @Override
public void run() {
myEm.clear();
query.getSingleResult();
}
+ @Override
public String description() {
return "query execute outside transaction (new, hit)";
}
+ @Override
public void prepare() {
getEnvironment().beginTransaction(myEm);
query = myEm
@@ -183,6 +202,7 @@
query.setParameter(1, Integer.valueOf(1));
}
+ @Override
public void tearDown() {
if (getEnvironment().isTransactionActive(myEm)) {
myEm.getTransaction().rollback();
@@ -196,6 +216,7 @@
@Test
public void testNamedQueryCompleteOutsideTransactionSmall() {
Action action = new Action() {
+ @Override
public void run() {
em.clear();
Query query = em.createNamedQuery("getDepartmentById");
@@ -203,13 +224,16 @@
query.getSingleResult();
}
+ @Override
public String description() {
return "query named complete outside transaction (small, hit)";
}
+ @Override
public void tearDown() {
}
+ @Override
public void prepare() {
}
};
@@ -223,21 +247,25 @@
Action action = new Action() {
Query query;
+ @Override
public void run() {
myEm.clear();
query.getSingleResult();
}
+ @Override
public String description() {
return "query named execute outside transaction (small, hit)";
}
+ @Override
public void prepare() {
getEnvironment().beginTransaction(myEm);
query = myEm.createNamedQuery("getDepartmentById");
query.setParameter(1, Integer.valueOf(1));
}
+ @Override
public void tearDown() {
}
};
@@ -251,19 +279,23 @@
Action action = new Action() {
Query query;
+ @Override
public void run() {
myEm.clear();
query.getSingleResult();
}
+ @Override
public String description() {
return "native entity execute outside transaction (small, hit)";
}
+ @Override
public void prepare() {
query = myEm.createNativeQuery("select ID, NAME, VERSION from TMP_DEP where ID = 1", Department.class);
}
+ @Override
public void tearDown() {
}
@@ -279,6 +311,7 @@
Action action = new Action() {
Query query;
+ @Override
public void run() {
myEm.clear();
Object object = query.getSingleResult();
@@ -288,14 +321,17 @@
new Department(id, name);
}
+ @Override
public String description() {
return "native fields execute outside transaction (small, hit)";
}
+ @Override
public void prepare() {
query = myEm.createNamedQuery("getDepartmentFieldByField1");
}
+ @Override
public void tearDown() {
}
};
@@ -313,6 +349,7 @@
try {
preparedStatement.setInt(1, 1);
Action action = new Action() {
+ @Override
public void run() {
try {
ResultSet rs = preparedStatement.executeQuery();
@@ -327,13 +364,16 @@
}
}
+ @Override
public void tearDown() {
}
+ @Override
public String description() {
return "JDBC excluding prepare and set (small, hit)";
}
+ @Override
public void prepare() {
}
};
@@ -354,6 +394,7 @@
connection.setAutoCommit(false);
try {
Action action = new Action() {
+ @Override
public void run() {
try {
final PreparedStatement preparedStatement = connection
@@ -376,13 +417,16 @@
}
}
+ @Override
public void tearDown() {
}
+ @Override
public String description() {
return "JDBC incuding prepare (small, hit)";
}
+ @Override
public void prepare() {
}
};
@@ -402,18 +446,22 @@
@Test
public void testNotFound() {
Action action = new Action() {
+ @Override
public void run() {
em.clear();
em.find(BasicTypesPropertyAccess.class, MISS);
}
+ @Override
public String description() {
return "find outside transaction (miss)";
}
+ @Override
public void tearDown() {
}
+ @Override
public void prepare() {
}
};
@@ -423,17 +471,21 @@
@Test
public void testFlush() {
Action action = new Action() {
+ @Override
public void run() {
em.flush();
}
+ @Override
public void tearDown() {
}
+ @Override
public String description() {
return "flush (unchanged)";
}
+ @Override
public void prepare() {
}
};
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java
index 10cb6e0..fb49e6c 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicFieldTypes.java
@@ -220,14 +220,17 @@
@Test
public void testPrimitiveBoolean() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveBoolean(true);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveBoolean(false);
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.isPrimitiveBoolean() != true;
}
@@ -238,14 +241,17 @@
@Test
public void testPrimitiveByte() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimititveByte((byte) 17);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimititveByte((byte) 23);
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getPrimititveByte() != 17;
}
@@ -256,14 +262,17 @@
@Test
public void testPrimitiveChar() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveChar('A');
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveChar('B');
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getPrimitiveChar() != 'A';
}
@@ -274,14 +283,17 @@
@Test
public void testPrimitiveShort() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveShort((short) 19);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveShort((short) 45);
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getPrimitiveShort() != 19;
}
@@ -292,14 +304,17 @@
@Test
public void testPrimitiveInt() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveInt(88);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveInt(77);
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getPrimitiveInt() != 88;
}
@@ -310,14 +325,17 @@
@Test
public void testPrimitiveLong() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveLong(88);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveLong(77);
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getPrimitiveLong() != 88;
}
@@ -328,14 +346,17 @@
@Test
public void testPrimitiveFloat() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveFloat((float) 88.5);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveFloat((float) 77.5);
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getPrimitiveFloat() != 88.5;
}
@@ -346,14 +367,17 @@
@Test
public void testPrimitiveDouble() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveDouble(99.5);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveDouble(77.5);
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getPrimitiveDouble() != 99.5;
}
@@ -365,22 +389,27 @@
@Test
public void testWrapperBoolean() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperBoolean(Boolean.TRUE);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperBoolean(Boolean.FALSE);
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperBoolean(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperBoolean() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getWrapperBoolean().equals(Boolean.TRUE);
}
@@ -391,22 +420,27 @@
@Test
public void testWrapperByte() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperByte(Byte.valueOf((byte) 17));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperByte(Byte.valueOf((byte) 18));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperByte(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperByte() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getWrapperByte().equals(Byte.valueOf((byte) 17));
}
@@ -417,22 +451,27 @@
@Test
public void testWrapperCharacter() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperCharacter(Character.valueOf('A'));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperCharacter(Character.valueOf('B'));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperCharacter(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperCharacter() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getWrapperCharacter().equals(Character.valueOf('A'));
}
@@ -443,22 +482,27 @@
@Test
public void testWrapperShort() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperShort(Short.valueOf((short) 1));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperShort(Short.valueOf((short) 2));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperShort(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperShort() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getWrapperShort().equals(Short.valueOf((short) 1));
}
@@ -469,22 +513,27 @@
@Test
public void testWrapperInteger() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperInteger(Integer.valueOf(1));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperInteger(Integer.valueOf(2));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperInteger(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperInteger() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getWrapperInteger().equals(Integer.valueOf(1));
}
@@ -495,22 +544,27 @@
@Test
public void testWrapperLong() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperLong(Long.valueOf(1));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperLong(Long.valueOf(2));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperLong(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperLong() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getWrapperLong().equals(Long.valueOf(1));
}
@@ -521,22 +575,27 @@
@Test
public void testWrapperDouble() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperDouble(Double.valueOf(1));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperDouble(Double.valueOf(2));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperDouble(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperDouble() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getWrapperDouble().equals(Double.valueOf(1));
}
@@ -547,22 +606,27 @@
@Test
public void testWrapperFloat() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperFloat(Float.valueOf(1));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperFloat(Float.valueOf(2));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperFloat(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperFloat() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getWrapperFloat().equals(Float.valueOf(1));
}
@@ -574,22 +638,27 @@
@Test
public void testString2Varchar() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setString2Varchar("VC 1");
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setString2Varchar("VC 2");
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setString2Varchar(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getString2Varchar() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getString2Varchar().equals("VC 1");
}
@@ -600,22 +669,27 @@
@Test
public void testString2Clob() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setString2Clob("VC 1");
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setString2Clob("VC 2");
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setString2Clob(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getString2Clob() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getString2Clob().equals("VC 1");
}
@@ -626,22 +700,27 @@
@Test
public void testBigDecimal() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setBigDecimal(new BigDecimal("1.1"));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setBigDecimal(new BigDecimal("2.2"));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setBigDecimal(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getBigDecimal() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getBigDecimal().compareTo(new BigDecimal("1.1")) != 0;
}
@@ -652,22 +731,27 @@
@Test
public void testBigInteger() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setBigInteger(new BigInteger("11"));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setBigInteger(new BigInteger("22"));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setBigInteger(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getBigInteger() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getBigInteger().equals(new BigInteger("11"));
}
@@ -679,26 +763,32 @@
@Test
public void testUtilDate() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilDate(new Date(1000));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setUtilDate(new Date(2000));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setUtilDate(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getUtilDate() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getUtilDate().equals(new Date(1000));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getUtilDate().setTime(2000);
}
@@ -709,26 +799,32 @@
@Test
public void testUtilCalendar() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(2005, 9, 8, 10, 49));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(2005, 9, 9, 10, 49));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getUtilCalendar() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getUtilCalendar().equals(new GregorianCalendar(2005, 9, 8, 10, 49));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getUtilCalendar().set(2005, 9, 9);
}
@@ -739,26 +835,32 @@
@Test
public void testSqlDate() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSqlDate(java.sql.Date.valueOf("2005-09-08"));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setSqlDate(java.sql.Date.valueOf("2005-09-09"));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setSqlDate(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getSqlDate() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getSqlDate().equals(java.sql.Date.valueOf("2005-09-08"));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getSqlDate().setTime(java.sql.Date.valueOf("2005-09-09").getTime());
}
@@ -769,26 +871,32 @@
@Test
public void testSqlTime() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSqlTime(java.sql.Time.valueOf("10:49:00"));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setSqlTime(java.sql.Time.valueOf("11:49:00"));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setSqlTime(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getSqlTime() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getSqlTime().equals(java.sql.Time.valueOf("10:49:00"));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getSqlTime().setTime(java.sql.Time.valueOf("11:49:00").getTime());
}
@@ -799,26 +907,32 @@
@Test
public void testSqlTimestamp() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSqlTimestamp(new java.sql.Timestamp(1000));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setSqlTimestamp(new java.sql.Timestamp(2000));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setSqlTimestamp(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getSqlTimestamp() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getSqlTimestamp().equals(new java.sql.Timestamp(1000));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getSqlTimestamp().setTime(2000);
}
@@ -831,26 +945,32 @@
public void testPrimitiveByteArray2Binary() {
final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Binary(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Binary(new byte[] { 8, 1, 2, 3, 4, 5, 6, 7 });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Binary(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getPrimitiveByteArray2Binary() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveByteArray2Binary());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getPrimitiveByteArray2Binary()[0] = 8;
}
@@ -863,26 +983,32 @@
public void testPrimitiveByteArray2Longvarbinary() {
final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Longvarbinary(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Longvarbinary(new byte[] { 8, 1, 2, 3, 4, 5, 6, 7 });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Longvarbinary(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getPrimitiveByteArray2Longvarbinary() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveByteArray2Longvarbinary());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getPrimitiveByteArray2Longvarbinary()[0] = 8;
}
@@ -894,26 +1020,32 @@
public void testPrimitiveByteArray2Blob() {
final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Blob(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Blob(new byte[] { 8, 1, 2, 3, 4, 5, 6, 7 });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setPrimitiveByteArray2Blob(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getPrimitiveByteArray2Blob() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveByteArray2Blob());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getPrimitiveByteArray2Blob()[0] = 8;
}
@@ -925,26 +1057,32 @@
public void testPrimitiveCharArray2Varchar() {
final char[] UNCHANGED = new char[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveCharArray2Varchar(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveCharArray2Varchar(new char[] { 'C', 'H', 'A', 'N', 'G', 'E', 'D' });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setPrimitiveCharArray2Varchar(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getPrimitiveCharArray2Varchar() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveCharArray2Varchar());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getPrimitiveCharArray2Varchar()[0] = 'X';
}
@@ -956,26 +1094,32 @@
public void testPrimitiveCharArray2Clob() {
final char[] UNCHANGED = new char[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setPrimitiveCharArray2Clob(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setPrimitiveCharArray2Clob(new char[] { 'C', 'H', 'A', 'N', 'G', 'E', 'D' });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setPrimitiveCharArray2Clob(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getPrimitiveCharArray2Clob() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveCharArray2Clob());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getPrimitiveCharArray2Clob()[0] = 'X';
}
@@ -989,28 +1133,34 @@
Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
Byte.valueOf((byte) 7) };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Binary(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Binary(new Byte[] { Byte.valueOf((byte) 8), Byte.valueOf((byte) 1),
Byte.valueOf((byte) 2), Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5),
Byte.valueOf((byte) 6), Byte.valueOf((byte) 7) });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Binary(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperByteArray2Binary() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperByteArray2Binary());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getWrapperByteArray2Binary()[0] = Byte.valueOf((byte) 8);
}
@@ -1024,28 +1174,34 @@
Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
Byte.valueOf((byte) 7) };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Longvarbinary(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Longvarbinary(new Byte[] { Byte.valueOf((byte) 8), Byte.valueOf((byte) 1),
Byte.valueOf((byte) 2), Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5),
Byte.valueOf((byte) 6), Byte.valueOf((byte) 7) });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Longvarbinary(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperByteArray2Longvarbinary() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperByteArray2Longvarbinary());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getWrapperByteArray2Longvarbinary()[0] = Byte.valueOf((byte) 8);
}
@@ -1059,28 +1215,34 @@
Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
Byte.valueOf((byte) 7) };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Blob(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Blob(new Byte[] { Byte.valueOf((byte) 8), Byte.valueOf((byte) 1),
Byte.valueOf((byte) 2), Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5),
Byte.valueOf((byte) 6), Byte.valueOf((byte) 7) });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperByteArray2Blob(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperByteArray2Blob() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperByteArray2Blob());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getWrapperByteArray2Blob()[0] = Byte.valueOf((byte) 8);
}
@@ -1093,26 +1255,32 @@
public void testWrapperCharArray2Varchar() {
final Character[] UNCHANGED = new Character[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperCharacterArray2Varchar(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperCharacterArray2Varchar(new Character[] { 'C', 'H', 'A', 'N', 'G', 'E', 'D' });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperCharacterArray2Varchar(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperCharacterArray2Varchar() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperCharacterArray2Varchar());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getWrapperCharacterArray2Varchar()[0] = 'X';
}
@@ -1125,26 +1293,32 @@
public void testWrapperCharArray2Clob() {
final Character[] UNCHANGED = new Character[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setWrapperCharacterArray2Clob(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setWrapperCharacterArray2Clob(new Character[] { 'C', 'H', 'A', 'N', 'G', 'E', 'D' });
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setWrapperCharacterArray2Clob(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getWrapperCharacterArray2Clob() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperCharacterArray2Clob());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getWrapperCharacterArray2Clob()[0] = 'X';
}
@@ -1157,26 +1331,32 @@
MutableValidator validator = new MutableValidator() {
UserDefinedSerializable UNCHANGED = new UserDefinedSerializable("Unchanged");
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSerializable(UNCHANGED);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setSerializable(new UserDefinedSerializable("Changed"));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setSerializable(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getSerializable() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !UNCHANGED.equals(obj.getSerializable());
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
((UserDefinedSerializable) obj.getSerializable()).setTxt("Changed");
}
@@ -1187,22 +1367,27 @@
@Test
public void testEnumString() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setEnumString(UserDefinedEnum.HUGO);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setEnumString(UserDefinedEnum.EMIL);
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setEnumString(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getEnumString() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getEnumString() != UserDefinedEnum.HUGO;
}
@@ -1213,22 +1398,27 @@
@Test
public void testEnumOrdinal() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setEnumOrdinal(UserDefinedEnum.HUGO);
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setEnumOrdinal(UserDefinedEnum.EMIL);
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setEnumOrdinal(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getEnumOrdinal() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return obj.getEnumOrdinal() != UserDefinedEnum.HUGO;
}
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java
index e6edfdc..2d4921d 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestBasicPropertyTypes.java
@@ -220,14 +220,17 @@
@Test
public void testPrimitiveBoolean() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveBoolean(true);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveBoolean(false);
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveBoolean() != true;
}
@@ -238,14 +241,17 @@
@Test
public void testPrimitiveByte() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimititveByte((byte) 17);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimititveByte((byte) 23);
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getPrimititveByte() != 17;
}
@@ -256,14 +262,17 @@
@Test
public void testPrimitiveChar() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveChar('A');
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveChar('B');
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveChar() != 'A';
}
@@ -274,14 +283,17 @@
@Test
public void testPrimitiveShort() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveShort((short) 19);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveShort((short) 45);
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveShort() != 19;
}
@@ -292,14 +304,17 @@
@Test
public void testPrimitiveInt() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveInt(88);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveInt(77);
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveInt() != 88;
}
@@ -310,14 +325,17 @@
@Test
public void testPrimitiveLong() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveLong(88);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveLong(77);
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveLong() != 88;
}
@@ -328,14 +346,17 @@
@Test
public void testPrimitiveFloat() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveFloat((float) 88.5);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveFloat((float) 77.5);
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveFloat() != 88.5;
}
@@ -346,14 +367,17 @@
@Test
public void testPrimitiveDouble() {
Validator validator = new Validator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveDouble(99.5);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveDouble(77.5);
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveDouble() != 99.5;
}
@@ -365,22 +389,27 @@
@Test
public void testWrapperBoolean() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperBoolean(Boolean.TRUE);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperBoolean(Boolean.FALSE);
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperBoolean(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.isWrapperBoolean() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.isWrapperBoolean().equals(Boolean.TRUE);
}
@@ -391,22 +420,27 @@
@Test
public void testWrapperByte() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperByte(Byte.valueOf((byte) 17));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperByte(Byte.valueOf((byte) 18));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperByte(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperByte() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getWrapperByte().equals(Byte.valueOf((byte) 17));
}
@@ -417,22 +451,27 @@
@Test
public void testWrapperCharacter() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperCharacter(Character.valueOf('A'));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperCharacter(Character.valueOf('B'));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperCharacter(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperCharacter() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getWrapperCharacter().equals(Character.valueOf('A'));
}
@@ -443,22 +482,27 @@
@Test
public void testWrapperShort() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperShort(Short.valueOf((short) 1));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperShort(Short.valueOf((short) 2));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperShort(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperShort() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getWrapperShort().equals(Short.valueOf((short) 1));
}
@@ -469,22 +513,27 @@
@Test
public void testWrapperInteger() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperInteger(Integer.valueOf(1));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperInteger(Integer.valueOf(2));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperInteger(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperInteger() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getWrapperInteger().equals(Integer.valueOf(1));
}
@@ -495,22 +544,27 @@
@Test
public void testWrapperLong() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperLong(Long.valueOf(1));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperLong(Long.valueOf(2));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperLong(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperLong() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getWrapperLong().equals(Long.valueOf(1));
}
@@ -521,22 +575,27 @@
@Test
public void testWrapperDouble() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperDouble(Double.valueOf(1));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperDouble(Double.valueOf(2));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperDouble(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperDouble() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getWrapperDouble().equals(Double.valueOf(1));
}
@@ -547,22 +606,27 @@
@Test
public void testWrapperFloat() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperFloat(Float.valueOf(1));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperFloat(Float.valueOf(2));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperFloat(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperFloat() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getWrapperFloat().equals(Float.valueOf(1));
}
@@ -574,22 +638,27 @@
@Test
public void testString2Varchar() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setString2Varchar("VC 1");
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setString2Varchar("VC 2");
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setString2Varchar(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getString2Varchar() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getString2Varchar().equals("VC 1");
}
@@ -600,22 +669,27 @@
@Test
public void testString2Clob() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setString2Clob("VC 1");
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setString2Clob("VC 2");
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setString2Clob(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getString2Clob() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getString2Clob().equals("VC 1");
}
@@ -626,22 +700,27 @@
@Test
public void testBigDecimal() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setBigDecimal(new BigDecimal("1.1"));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setBigDecimal(new BigDecimal("2.2"));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setBigDecimal(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getBigDecimal() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getBigDecimal().compareTo(new BigDecimal("1.1")) != 0;
}
@@ -652,22 +731,27 @@
@Test
public void testBigInteger() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setBigInteger(new BigInteger("11"));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setBigInteger(new BigInteger("22"));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setBigInteger(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getBigInteger() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getBigInteger().equals(new BigInteger("11"));
}
@@ -679,26 +763,32 @@
@Test
public void testUtilDate() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setUtilDate(new Date(1000));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setUtilDate(new Date(2000));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setUtilDate(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getUtilDate() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getUtilDate().equals(new Date(1000));
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getUtilDate().setTime(2000);
}
@@ -709,26 +799,32 @@
@Test
public void testUtilCalendar() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(2005, 9, 8, 10, 49));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(2005, 9, 9, 10, 49));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setUtilCalendar(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getUtilCalendar() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getUtilCalendar().equals(new GregorianCalendar(2005, 9, 8, 10, 49));
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getUtilCalendar().set(2005, 9, 9);
}
@@ -739,26 +835,32 @@
@Test
public void testSqlDate() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setSqlDate(java.sql.Date.valueOf("2005-09-08"));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setSqlDate(java.sql.Date.valueOf("2005-09-09"));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setSqlDate(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getSqlDate() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getSqlDate().equals(java.sql.Date.valueOf("2005-09-08"));
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getSqlDate().setTime(java.sql.Date.valueOf("2005-09-09").getTime());
}
@@ -769,26 +871,32 @@
@Test
public void testSqlTime() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setSqlTime(java.sql.Time.valueOf("10:49:00"));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setSqlTime(java.sql.Time.valueOf("11:49:00"));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setSqlTime(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getSqlTime() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getSqlTime().equals(java.sql.Time.valueOf("10:49:00"));
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getSqlTime().setTime(java.sql.Time.valueOf("11:49:00").getTime());
}
@@ -799,26 +907,32 @@
@Test
public void testSqlTimestamp() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setSqlTimestamp(new java.sql.Timestamp(1000));
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setSqlTimestamp(new java.sql.Timestamp(2000));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setSqlTimestamp(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getSqlTimestamp() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !obj.getSqlTimestamp().equals(new java.sql.Timestamp(1000));
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getSqlTimestamp().setTime(2000);
}
@@ -831,26 +945,32 @@
public void testPrimitiveByteArray2Binary() {
final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveByteArray2Binary(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveByteArray2Binary(new byte[] { 8, 1, 2, 3, 4, 5, 6, 7 });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setPrimitiveByteArray2Binary(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveByteArray2Binary() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveByteArray2Binary());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getPrimitiveByteArray2Binary()[0] = 8;
}
@@ -863,26 +983,32 @@
public void testPrimitiveByteArray2Longvarbinary() {
final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveByteArray2Longvarbinary(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveByteArray2Longvarbinary(new byte[] { 8, 1, 2, 3, 4, 5, 6, 7 });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setPrimitiveByteArray2Longvarbinary(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveByteArray2Longvarbinary() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveByteArray2Longvarbinary());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getPrimitiveByteArray2Longvarbinary()[0] = 8;
}
@@ -894,26 +1020,32 @@
public void testPrimitiveByteArray2Blob() {
final byte[] UNCHANGED = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7 };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveByteArray2Blob(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveByteArray2Blob(new byte[] { 8, 1, 2, 3, 4, 5, 6, 7 });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setPrimitiveByteArray2Blob(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveByteArray2Blob() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveByteArray2Blob());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getPrimitiveByteArray2Blob()[0] = 8;
}
@@ -925,26 +1057,32 @@
public void testPrimitiveCharArray2Varchar() {
final char[] UNCHANGED = new char[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveCharArray2Varchar(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveCharArray2Varchar(new char[] { 'C', 'H', 'A', 'N', 'G', 'E', 'D' });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setPrimitiveCharArray2Varchar(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveCharArray2Varchar() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveCharArray2Varchar());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getPrimitiveCharArray2Varchar()[0] = 'X';
}
@@ -956,26 +1094,32 @@
public void testPrimitiveCharArray2Clob() {
final char[] UNCHANGED = new char[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setPrimitiveCharArray2Clob(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setPrimitiveCharArray2Clob(new char[] { 'C', 'H', 'A', 'N', 'G', 'E', 'D' });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setPrimitiveCharArray2Clob(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getPrimitiveCharArray2Clob() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getPrimitiveCharArray2Clob());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getPrimitiveCharArray2Clob()[0] = 'X';
}
@@ -989,28 +1133,34 @@
Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
Byte.valueOf((byte) 7), };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperByteArray2Binary(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperByteArray2Binary(new Byte[] { Byte.valueOf((byte) 8), Byte.valueOf((byte) 1),
Byte.valueOf((byte) 2), Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5),
Byte.valueOf((byte) 6), Byte.valueOf((byte) 7), });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperByteArray2Binary(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperByteArray2Binary() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperByteArray2Binary());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getWrapperByteArray2Binary()[0] = Byte.valueOf((byte) 8);
}
@@ -1024,28 +1174,34 @@
Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
Byte.valueOf((byte) 7), };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperByteArray2Longvarbinary(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperByteArray2Longvarbinary(new Byte[] { Byte.valueOf((byte) 8), Byte.valueOf((byte) 1),
Byte.valueOf((byte) 2), Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5),
Byte.valueOf((byte) 6), Byte.valueOf((byte) 7), });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperByteArray2Longvarbinary(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperByteArray2Longvarbinary() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperByteArray2Longvarbinary());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getWrapperByteArray2Longvarbinary()[0] = Byte.valueOf((byte) 8);
}
@@ -1059,28 +1215,34 @@
Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5), Byte.valueOf((byte) 6),
Byte.valueOf((byte) 7), };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperByteArray2Blob(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperByteArray2Blob(new Byte[] { Byte.valueOf((byte) 8), Byte.valueOf((byte) 1),
Byte.valueOf((byte) 2), Byte.valueOf((byte) 3), Byte.valueOf((byte) 4), Byte.valueOf((byte) 5),
Byte.valueOf((byte) 6), Byte.valueOf((byte) 7) });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperByteArray2Blob(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperByteArray2Blob() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperByteArray2Blob());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getWrapperByteArray2Blob()[0] = Byte.valueOf((byte) 8);
}
@@ -1093,26 +1255,32 @@
public void testWrapperCharArray2Varchar() {
final Character[] UNCHANGED = new Character[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperCharacterArray2Varchar(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperCharacterArray2Varchar(new Character[] { 'C', 'H', 'A', 'N', 'G', 'E', 'D' });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperCharacterArray2Varchar(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperCharacterArray2Varchar() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperCharacterArray2Varchar());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getWrapperCharacterArray2Varchar()[0] = 'X';
}
@@ -1125,26 +1293,32 @@
public void testWrapperCharArray2Clob() {
final Character[] UNCHANGED = new Character[] { 'U', 'N', 'C', 'H', 'A', 'N', 'G', 'E', 'D' };
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setWrapperCharacterArray2Clob(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setWrapperCharacterArray2Clob(new Character[] { 'C', 'H', 'A', 'N', 'G', 'E', 'D' });
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setWrapperCharacterArray2Clob(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getWrapperCharacterArray2Clob() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !Arrays.equals(UNCHANGED, obj.getWrapperCharacterArray2Clob());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
obj.getWrapperCharacterArray2Clob()[0] = 'X';
}
@@ -1157,26 +1331,32 @@
MutableValidator validator = new MutableValidator() {
UserDefinedSerializable UNCHANGED = new UserDefinedSerializable("Unchanged");
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setSerializable(UNCHANGED);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setSerializable(new UserDefinedSerializable("Changed"));
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setSerializable(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getSerializable() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return !UNCHANGED.equals(obj.getSerializable());
}
+ @Override
public void mutate(BasicTypesPropertyAccess obj) {
((UserDefinedSerializable) obj.getSerializable()).setTxt("Changed");
}
@@ -1187,22 +1367,27 @@
@Test
public void testEnumString() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setEnumString(UserDefinedEnum.HUGO);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setEnumString(UserDefinedEnum.EMIL);
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setEnumString(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getEnumString() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getEnumString() != UserDefinedEnum.HUGO;
}
@@ -1213,22 +1398,27 @@
@Test
public void testEnumOrdinal() {
ReferenceValidator validator = new ReferenceValidator() {
+ @Override
public void set(BasicTypesPropertyAccess obj) {
obj.setEnumOrdinal(UserDefinedEnum.HUGO);
}
+ @Override
public void change(BasicTypesPropertyAccess obj) {
obj.setEnumOrdinal(UserDefinedEnum.EMIL);
}
+ @Override
public void setNull(BasicTypesPropertyAccess obj) {
obj.setEnumOrdinal(null);
}
+ @Override
public boolean isNull(BasicTypesPropertyAccess obj) {
return obj.getEnumOrdinal() == null;
}
+ @Override
public boolean isChanged(BasicTypesPropertyAccess obj) {
return obj.getEnumOrdinal() != UserDefinedEnum.HUGO;
}
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestTemporalFieldTypes.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestTemporalFieldTypes.java
index a8c5733..49e6e55 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestTemporalFieldTypes.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/simple/TestTemporalFieldTypes.java
@@ -111,26 +111,32 @@
@Test
public void testUtilDateAsTimestamp() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilDate(new Date(1000));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setUtilDate(new Date(2000));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setUtilDate(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getUtilDate() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getUtilDate().equals(new Date(1000));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getUtilDate().setTime(2000);
}
@@ -141,26 +147,32 @@
@Test
public void testUtilCalendarAsTimestamp() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(2005, 9, 8, 10, 49));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(2005, 9, 9, 10, 49));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getUtilCalendar() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getUtilCalendar().equals(new GregorianCalendar(2005, 9, 8, 10, 49));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getUtilCalendar().set(2005, 9, 9);
}
@@ -171,26 +183,32 @@
@Test
public void testUtilCalendarAsDate() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(2005, 9, 8));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(2005, 9, 9));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getUtilCalendar() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getUtilCalendar().equals(new GregorianCalendar(2005, 9, 8));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getUtilCalendar().set(2005, 9, 9);
}
@@ -201,26 +219,32 @@
@Test
public void testUtilCalendarAsTime() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(1970, 1, 1, 10, 49));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(new GregorianCalendar(1970, 1, 1, 11, 49));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setUtilCalendar(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getUtilCalendar() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getUtilCalendar().equals(new GregorianCalendar(1970, 1, 1, 10, 49));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getUtilCalendar().set(1970, 1, 1, 11, 49);
}
@@ -231,26 +255,32 @@
@Test
public void testSqlDate() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSqlDate(java.sql.Date.valueOf("2005-09-08"));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setSqlDate(java.sql.Date.valueOf("2005-09-09"));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setSqlDate(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getSqlDate() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getSqlDate().equals(java.sql.Date.valueOf("2005-09-08"));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getSqlDate().setTime(java.sql.Date.valueOf("2005-09-09").getTime());
}
@@ -261,26 +291,32 @@
@Test
public void testSqlTime() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSqlTime(java.sql.Time.valueOf("10:49:00"));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setSqlTime(java.sql.Time.valueOf("11:49:00"));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setSqlTime(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getSqlTime() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getSqlTime().equals(java.sql.Time.valueOf("10:49:00"));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getSqlTime().setTime(java.sql.Time.valueOf("11:49:00").getTime());
}
@@ -291,26 +327,32 @@
@Test
public void testSqlTimestamp() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setSqlTimestamp(new java.sql.Timestamp(1000));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setSqlTimestamp(new java.sql.Timestamp(2000));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setSqlTimestamp(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getSqlTimestamp() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getSqlTimestamp().equals(new java.sql.Timestamp(1000));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getSqlTimestamp().setTime(2000);
}
@@ -322,26 +364,32 @@
@Test
public void testUtilDateAsTime() {
MutableValidator validator = new MutableValidator() {
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilDate(new Date(1000));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setUtilDate(new Date(2000));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setUtilDate(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getUtilDate() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getUtilDate().equals(new Date(1000));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getUtilDate().setTime(2000);
}
@@ -356,26 +404,32 @@
final long millis = java.sql.Date.valueOf("2005-09-08").getTime();
final long changedMillis = java.sql.Date.valueOf("2005-09-09").getTime();
+ @Override
public void set(BasicTypesFieldAccess obj) {
obj.setUtilDate(new java.util.Date(millis));
}
+ @Override
public void change(BasicTypesFieldAccess obj) {
obj.setUtilDate(new java.util.Date(changedMillis));
}
+ @Override
public void setNull(BasicTypesFieldAccess obj) {
obj.setUtilDate(null);
}
+ @Override
public boolean isNull(BasicTypesFieldAccess obj) {
return obj.getUtilDate() == null;
}
+ @Override
public boolean isChanged(BasicTypesFieldAccess obj) {
return !obj.getUtilDate().equals(new java.util.Date(millis));
}
+ @Override
public void mutate(BasicTypesFieldAccess obj) {
obj.getUtilDate().setTime(changedMillis);
}
diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa2/JPA2Base.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa2/JPA2Base.java
index 3436dc6..4a53795 100644
--- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa2/JPA2Base.java
+++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa2/JPA2Base.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2015 SAP. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -24,6 +24,7 @@
super("jpa2testmodel");
}
+ @Override
final protected String[] getClearableTableNames() {
return new String[0];
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractEclipseLinkParameterTypeVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractEclipseLinkParameterTypeVisitor.java
index 7a168c2..b083c39 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractEclipseLinkParameterTypeVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractEclipseLinkParameterTypeVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,65 +52,41 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
@@ -125,33 +101,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
type = Object.class;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractEclipseLinkSemanticValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractEclipseLinkSemanticValidator.java
index 3348556..6a2528e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractEclipseLinkSemanticValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractEclipseLinkSemanticValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -104,17 +104,11 @@
this.extension = extension;
}
- /**
- * {@inheritDoc}
- */
@Override
protected LiteralVisitor buildLiteralVisitor() {
return new EclipseLinkLiteralVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected OwningClauseVisitor buildOwningClauseVisitor() {
return new EclipseLinkOwningClauseVisitor();
@@ -128,9 +122,6 @@
return new TableExpressionVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected TopLevelFirstDeclarationVisitor buildTopLevelFirstDeclarationVisitor() {
return new TopLevelFirstDeclarationVisitor(this);
@@ -186,9 +177,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected PathType selectClausePathExpressionPathType() {
return PathType.ANY_FIELD_INCLUDING_COLLECTION;
@@ -212,9 +200,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateFunctionExpression(FunctionExpression expression) {
super.validateFunctionExpression(expression);
@@ -269,9 +254,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateInExpression(InExpression expression) {
super.validateInExpression(expression);
@@ -292,9 +274,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateRangeVariableDeclarationRootObject(RangeVariableDeclaration expression) {
@@ -317,34 +296,22 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected PathType validPathExpressionTypeForCountFunction() {
return PathType.ANY_FIELD_INCLUDING_COLLECTION;
}
- /**
- * {@inheritDoc}
- */
@Override
protected PathType validPathExpressionTypeForInExpression() {
// Loosen up the JPA spec restriction because ANTLR parser used to allow it
return PathType.ANY_FIELD_INCLUDING_COLLECTION;
}
- /**
- * {@inheritDoc}
- */
@Override
protected PathType validPathExpressionTypeForInItem() {
return PathType.ANY_FIELD_INCLUDING_COLLECTION;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Boolean validateThirdPartyStateFieldPathExpression(StateFieldPathExpression expression) {
@@ -412,99 +379,66 @@
return valid;
}
- /**
- * {@inheritDoc}
- */
@Override
protected PathType validPathExpressionTypeForStringExpression() {
// Loosen up the JPA spec restriction because ANTLR parser used to allow it
return PathType.ANY_FIELD_INCLUDING_COLLECTION;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
super.visit(expression);
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
super.visit(expression);
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
super.visit(expression);
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
super.visit(expression);
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
super.visit(expression);
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
super.visit(expression);
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
super.visit(expression);
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
super.visit(expression);
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
super.visit(expression);
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
super.visit(expression);
@@ -524,18 +458,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
super.visit(expression);
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
super.visit(expression);
@@ -557,9 +485,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void dispose() {
super.dispose();
@@ -576,49 +501,31 @@
public int count;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
count = 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
count = expression.childrenSize();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
count = 1;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
count = 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
expression.getSelectClause().accept(this);
@@ -638,9 +545,6 @@
*/
protected boolean valid;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
valid = (this.expression == expression);
@@ -656,9 +560,6 @@
this.validator = validator;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractGrammarValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractGrammarValidator.java
index 454ef39..be94163 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractGrammarValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractGrammarValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1085,9 +1085,6 @@
return helper;
}
- /**
- * {@inheritDoc}
- */
@Override
public void dispose() {
inputParameters.clear();
@@ -1162,9 +1159,6 @@
return visitor;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar getGrammar() {
return jpqlGrammar;
@@ -1191,9 +1185,6 @@
return helper;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -2530,34 +2521,22 @@
return helper;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, absExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
// Nothing to validate
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
validateArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
@@ -2569,17 +2548,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
validateLogicalExpression(expression, ConditionalExpressionBNF.ID, ConditionalExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
@@ -2602,17 +2575,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
validateAggregateFunctionLocation(expression, avgFunctionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
int startPosition = position(expression);
@@ -2620,9 +2587,6 @@
addProblem(expression, startPosition, endPosition, BadExpression_InvalidExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
@@ -2675,9 +2639,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
@@ -2759,9 +2720,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
@@ -2774,9 +2732,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
// Nothing to validate, it's done by the parent expression
@@ -2784,9 +2739,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -2885,9 +2837,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
@@ -2941,17 +2890,11 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
validatePathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
@@ -2976,9 +2919,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
@@ -3003,9 +2943,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
@@ -3072,17 +3009,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
validateAggregateFunctionLocation(expression, countFunctionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -3145,9 +3076,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
@@ -3202,26 +3130,17 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
// Nothing to validate, done directly by DeleteClause and WhereClause
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
validateArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
@@ -3253,9 +3172,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
@@ -3264,9 +3180,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
@@ -3279,25 +3192,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, existsExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
validateAbstractFromClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
@@ -3326,9 +3230,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
@@ -3353,9 +3254,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
validateAbstractConditionalClause(
@@ -3365,9 +3263,6 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -3384,17 +3279,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
validateIdentificationVariableDeclaration(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
@@ -3407,9 +3296,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -3543,9 +3429,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
@@ -3599,9 +3482,6 @@
validateOwningClause(expression, parameter);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -3714,9 +3594,6 @@
expression.getOnClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
@@ -3752,9 +3629,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
@@ -3767,25 +3641,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
// Nothing to validate
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, lengthExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
@@ -3835,57 +3700,36 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
validateAbstractTripleEncapsulatedExpression(expression, locateExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, lowerExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
validateAggregateFunctionLocation(expression, maxFunctionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
validateAggregateFunctionLocation(expression, minFunctionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
validateAbstractDoubleEncapsulatedExpression(expression, modExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
validateArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
@@ -3903,9 +3747,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -3919,17 +3760,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// Nothing to validate
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
@@ -3942,9 +3777,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
@@ -3963,17 +3795,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, objectExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
@@ -4007,9 +3833,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
@@ -4029,9 +3852,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
@@ -4055,9 +3875,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
validateLogicalExpression(
@@ -4067,9 +3884,6 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -4111,9 +3925,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -4160,9 +3971,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
@@ -4178,67 +3986,43 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
validateAbstractSelectStatement(expression);
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
validateAbstractFromClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
validateAbstractSelectClause(expression, isMultipleSubquerySelectItemsAllowed(expression));
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
validateSimpleSelectStatement(expression);
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, sizeExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, sqrtExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
validatePathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
if (!expression.hasCloseQuote()) {
@@ -4246,9 +4030,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
@@ -4273,33 +4054,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
validateAbstractTripleEncapsulatedExpression(expression, substringExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
validateArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
validateAggregateFunctionLocation(expression, sumFunctionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
@@ -4313,9 +4082,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
@@ -4387,9 +4153,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
@@ -4402,17 +4165,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
// Nothing to validate and we don't want to validate its encapsulated expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
@@ -4461,9 +4218,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
@@ -4506,26 +4260,17 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
// Done directly by UpdateClause and WhereClause
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, upperExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
@@ -4538,9 +4283,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
@@ -4585,9 +4327,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
validateAbstractConditionalClause(
@@ -4700,9 +4439,6 @@
*/
abstract boolean validateSeparator(CollectionExpression expression, int index);
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
validateSeparation(expression);
@@ -4718,9 +4454,6 @@
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] arguments(T expression) {
return ExpressionTools.EMPTY_STRING_ARRAY;
@@ -4743,17 +4476,11 @@
return expression.hasFirstExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasLeftParenthesis(T expression) {
return expression.hasLeftParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasRightParenthesis(T expression) {
// If the second encapsulated expression is missing, then no need
@@ -4768,9 +4495,6 @@
expression.hasSecondExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String identifier(T expression) {
return expression.getIdentifier();
@@ -4867,9 +4591,6 @@
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] arguments(T expression) {
return ExpressionTools.EMPTY_STRING_ARRAY;
@@ -4901,17 +4622,11 @@
*/
protected abstract String encapsulatedExpressionMissingKey(T expression);
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasLeftParenthesis(T expression) {
return expression.hasLeftParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasRightParenthesis(T expression) {
// If the encapsulated expression is missing, then no need to
@@ -4921,9 +4636,6 @@
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public final String identifier(T expression) {
return expression.getIdentifier();
@@ -4973,9 +4685,6 @@
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] arguments(T expression) {
return ExpressionTools.EMPTY_STRING_ARRAY;
@@ -4995,17 +4704,11 @@
return expression.hasFirstExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasLeftParenthesis(T expression) {
return expression.hasLeftParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasRightParenthesis(T expression) {
return !isRightParenthesisMissing(expression);
@@ -5112,9 +4815,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
this.expression = expression;
@@ -5132,9 +4832,6 @@
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
boolean validateSeparator(CollectionExpression expression, int index) {
return expression.hasComma(index);
@@ -5152,9 +4849,6 @@
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
boolean validateSeparator(CollectionExpression expression, int index) {
return !expression.hasComma(index);
@@ -5169,9 +4863,6 @@
*/
ComparisonExpression expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
this.expression = expression;
@@ -5186,9 +4877,6 @@
*/
public boolean dateTime;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
dateTime = true;
@@ -5213,9 +4901,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
this.expression = expression;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractSemanticValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractSemanticValidator.java
index f8a2634..9ffec3e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractSemanticValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractSemanticValidator.java
@@ -230,9 +230,6 @@
return new TopLevelFirstDeclarationVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
public void dispose() {
super.dispose();
@@ -292,9 +289,6 @@
return comparisonExpressionVisitor;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar getGrammar() {
return helper.getGrammar();
@@ -339,9 +333,6 @@
return virtualIdentificationVariableFinder;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -2654,306 +2645,192 @@
return PathType.BASIC_FIELD_ONLY;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(AbsExpression expression) {
validateAbsExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(AbstractSchemaName expression) {
validateAbstractSchemaName(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(AdditionExpression expression) {
validateAdditionExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(AllOrAnyExpression expression) {
validateAllOrAnyExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(AndExpression expression) {
validateAndExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(ArithmeticFactor expression) {
validateArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(AvgFunction expression) {
validateAvgFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(BadExpression expression) {
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(BetweenExpression expression) {
validateBetweenExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(CaseExpression expression) {
validateCaseExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(CoalesceExpression expression) {
validateCoalesceExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(CollectionExpression expression) {
// Nothing to validate semantically
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(CollectionMemberDeclaration expression) {
validateCollectionMemberDeclaration(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(CollectionMemberExpression expression) {
validateCollectionMemberExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(CollectionValuedPathExpression expression) {
// Validated by the parent of the expression
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(ComparisonExpression expression) {
validateComparisonExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(ConcatExpression expression) {
validateConcatExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(ConstructorExpression expression) {
validateConstructorExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(CountFunction expression) {
validateCountFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(DateTime expression) {
validateDateTime(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(DeleteClause expression) {
validateDeleteClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(DeleteStatement expression) {
validateDeleteStatement(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(DivisionExpression expression) {
validateDivisionExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(EmptyCollectionComparisonExpression expression) {
validateCollectionValuedPathExpression(expression.getExpression(), true);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(EntityTypeLiteral expression) {
validateEntityTypeLiteral(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(EntryExpression expression) {
validateEntryExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(ExistsExpression expression) {
validateExistsExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(FromClause expression) {
validateFromClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(FunctionExpression expression) {
validateFunctionExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(GroupByClause expression) {
validateGroupByClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(HavingClause expression) {
validateHavingClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(IdentificationVariable expression) {
validateIdentificationVariable(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(IdentificationVariableDeclaration expression) {
validateIdentificationVariableDeclaration(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(IndexExpression expression) {
validateIndexExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(InExpression expression) {
validateInExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(InputParameter expression) {
// Nothing to validate semantically
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(Join expression) {
validateJoin(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(JPQLExpression expression) {
if (expression.hasQueryStatement()) {
@@ -2962,177 +2839,111 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(KeyExpression expression) {
validateKeyExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(KeywordExpression expression) {
// Nothing semantically to validate
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(LengthExpression expression) {
validateLengthExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(LikeExpression expression) {
validateLikeExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(LocateExpression expression) {
validateLocateExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(LowerExpression expression) {
validateLowerExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(MaxFunction expression) {
validateMaxFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(MinFunction expression) {
validateMinFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(ModExpression expression) {
validateModExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(MultiplicationExpression expression) {
validateMultiplicationExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(NotExpression expression) {
validateNotExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(NullComparisonExpression expression) {
validateNullComparisonExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(NullExpression expression) {
// Nothing semantically to validate
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(NullIfExpression expression) {
validateNullIfExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(NumericLiteral expression) {
// Nothing semantically to validate
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(ObjectExpression expression) {
validateObjectExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(OnClause expression) {
validateOnClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(OrderByClause expression) {
validateOrderByClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(OrderByItem expression) {
validateOrderByItem(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(OrExpression expression) {
validateOrExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(RangeVariableDeclaration expression) {
validateRangeVariableDeclaration(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(ResultVariable expression) {
@@ -3145,194 +2956,122 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SelectClause expression) {
validateSelectClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SelectStatement expression) {
validateSelectStatement(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SimpleFromClause expression) {
validateSimpleFromClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SimpleSelectClause expression) {
validateSimpleSelectClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SimpleSelectStatement expression) {
validateSimpleSelectStatement(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SizeExpression expression) {
validateSizeExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SqrtExpression expression) {
validateSqrtExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(StateFieldPathExpression expression) {
validateStateFieldPathExpression(expression, PathType.ANY_FIELD);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(StringLiteral expression) {
// Nothing semantically to validate
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SubExpression expression) {
// Nothing semantically to validate
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SubstringExpression expression) {
validateSubstringExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SubtractionExpression expression) {
validateSubtractionExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SumFunction expression) {
validateSumFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(TreatExpression expression) {
validateTreatExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(TrimExpression expression) {
validateTrimExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(TypeExpression expression) {
validateTypeExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(UnknownExpression expression) {
// Nothing semantically to validate
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(UpdateClause expression) {
validateUpdateClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(UpdateItem expression) {
validateUpdateItem(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(UpdateStatement expression) {
validateUpdateStatement(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(UpperExpression expression) {
validateUpperExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(ValueExpression expression) {
validateValueExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(WhenClause expression) {
validateWhenClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(WhereClause expression) {
validateWhereClause(expression);
@@ -3350,9 +3089,6 @@
*/
protected CollectionValuedPathExpression expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
this.expression = expression;
@@ -3365,17 +3101,11 @@
protected IdentificationVariable expression;
public boolean result;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
result = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
if (this.expression == expression) {
@@ -3383,9 +3113,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
// Make sure to bypass any sub expression
@@ -3429,18 +3156,12 @@
rightStateFieldPathExpressionValid = false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
// Redirect to the validator, nothing special is required
expression.accept(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -3462,9 +3183,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
@@ -3494,51 +3212,33 @@
protected boolean valid;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
// Already validated, no need to duplicate the issue
valid = false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
valid = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
expression.getRangeVariableDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// Already validated, no need to duplicate the issue
valid = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
expression.getRootObject().accept(this);
@@ -3554,17 +3254,11 @@
this.validator = validator;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.accept(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
validator.validateStateFieldPathExpression(expression, validator.validPathExpressionTypeForInItem());
@@ -3612,9 +3306,6 @@
*/
protected StateFieldPathExpression expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
this.expression = expression;
@@ -3624,9 +3315,6 @@
// Made static final for performance reasons.
protected static final class SubqueryFirstDeclarationVisitor extends FirstDeclarationVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
valid = true;
@@ -3636,9 +3324,6 @@
// Made static for performance reasons.
protected static class TopLevelFirstDeclarationVisitor extends FirstDeclarationVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
// TODO
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractValidator.java
index 15b70df..bf5087b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/AbstractValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -738,9 +738,6 @@
this.problems = problems;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.acceptChildren(this);
@@ -764,9 +761,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
for (Expression child : expression.children()) {
@@ -777,17 +771,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// Ignore this, it should be validated by another validator
@@ -812,17 +800,11 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getParent().accept(this);
@@ -847,25 +829,16 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
CollectionTools.addAll(expressions, expression.children());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expressions.add(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// Don't add it
@@ -964,43 +937,28 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
// This is not a valid expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
// A collection expression is never valid
valid = false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
- validate(((AbstractExpression) expression).getQueryBNF());
+ validate(expression.getQueryBNF());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// The missing expression is validated by GrammarValidator
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
if (expression.hasExpression()) {
@@ -1008,9 +966,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
// This is not a valid expression
@@ -1031,17 +986,11 @@
*/
protected boolean subExpression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
nestedArraySize = subExpression ? expression.childrenSize() : -1;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
subExpression = true;
@@ -1089,81 +1038,51 @@
whereClause = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
deleteClause = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
fromClause = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
groupByClause = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
havingClause = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
orderByClause = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
selectClause = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
simpleFromClause = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
simpleSelectClause = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
updateClause = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
whereClause = expression;
@@ -1190,33 +1109,21 @@
updateStatement = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
deleteStatement = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
selectStatement = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
simpleSelectStatement = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
updateStatement = expression;
@@ -1233,9 +1140,6 @@
*/
private SimpleSelectStatement expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
this.expression = expression;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/BaseDeclarationIdentificationVariableFinder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/BaseDeclarationIdentificationVariableFinder.java
index 1e5d561..3d07d92 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/BaseDeclarationIdentificationVariableFinder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/BaseDeclarationIdentificationVariableFinder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,17 +61,11 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
// Incomplete/invalid query, stop here
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
if (traverse) {
@@ -83,9 +77,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
try {
@@ -97,17 +88,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
expression.getDeleteClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
if (traverse) {
@@ -118,9 +103,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
if (traverse) {
@@ -128,9 +110,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
if (traverse) {
@@ -141,25 +120,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
expression.getQueryStatement().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// Incomplete/invalid query, stop here
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
if (traverse) {
@@ -170,25 +140,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
// Nothing to do because this visitor is only meant for DELETE or UPDATE queries
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
// Incomplete/invalid query, stop here
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
try {
@@ -200,9 +161,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
expression.getUpdateClause().accept(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/DefaultJPQLQueryProblem.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/DefaultJPQLQueryProblem.java
index 6f85b92..7c7a3a7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/DefaultJPQLQueryProblem.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/DefaultJPQLQueryProblem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -78,49 +78,31 @@
this.messageArguments = messageArguments;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getEndPosition() {
return endIndex;
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getExpression() {
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] getMessageArguments() {
return messageArguments;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getMessageKey() {
return messageKey;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getStartPosition() {
return startIndex;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkGrammarValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkGrammarValidator.java
index d6acfb4..3c40e03 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkGrammarValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkGrammarValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -201,17 +201,11 @@
return new InExpressionWithNestedArrayVisitor(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected LiteralVisitor buildLiteralVisitor() {
return new EclipseLinkLiteralVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected OwningClauseVisitor buildOwningClauseVisitor() {
return new EclipseLinkOwningClauseVisitor();
@@ -279,9 +273,6 @@
return inExpressionWithNestedArrayVisitor;
}
- /**
- * {@inheritDoc}
- */
@Override
protected EclipseLinkOwningClauseVisitor getOwningClauseVisitor() {
return (EclipseLinkOwningClauseVisitor) super.getOwningClauseVisitor();
@@ -315,26 +306,17 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isInputParameterInValidLocation(InputParameter expression) {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
EclipseLinkVersion version = EclipseLinkVersion.value(getGrammar().getProviderVersion());
return version.isNewerThanOrEqual(EclipseLinkVersion.VERSION_2_4);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isMultipleSubquerySelectItemsAllowed(SimpleSelectClause expression) {
return isInExpressionWithNestedArray(expression);
@@ -364,9 +346,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isSubqueryAllowedAnywhere() {
EclipseLinkVersion version = EclipseLinkVersion.value(getProviderVersion());
@@ -382,9 +361,6 @@
return helper;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateAbstractSelectClause(AbstractSelectClause expression,
boolean multipleSelectItemsAllowed) {
@@ -404,16 +380,10 @@
super.validateAbstractSelectClause(expression, multipleSelectItemsAllowed);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
@@ -449,25 +419,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
// TODO: 2.5
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
validateAbstractDoubleEncapsulatedExpression(expression, databaseTypeHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
@@ -491,25 +452,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
// TODO: 2.5
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
@@ -596,25 +548,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
// TODO: 2.5
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, tableExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
@@ -647,9 +590,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
@@ -700,25 +640,16 @@
*/
public boolean valid;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
valid = visitor.isNestedArray(expression.getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
expression.getParent().accept(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkLiteralVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkLiteralVisitor.java
index df3ffa2..34ddb60 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkLiteralVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkLiteralVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,30 +54,18 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
if (type == LiteralType.STRING_LITERAL) {
@@ -85,44 +73,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
if (type == LiteralType.STRING_LITERAL) {
@@ -130,16 +100,10 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkVersion.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkVersion.java
index b029cb4..b08026c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkVersion.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkVersion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -204,9 +204,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return String.valueOf(version);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/JPAVersion.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/JPAVersion.java
index 7b53865..0edddd6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/JPAVersion.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/JPAVersion.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -179,9 +179,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getVersion();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/JPQLQueryProblemResourceBundle.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/JPQLQueryProblemResourceBundle.java
index 228b752..1cb79e0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/JPQLQueryProblemResourceBundle.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/JPQLQueryProblemResourceBundle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,9 +32,6 @@
*/
public static final String PROPERTIES_FILE_NAME = JPQLQueryProblemResourceBundle.class.getPackage().getName() + ".jpa_jpql_validation";
- /**
- * {@inheritDoc}
- */
@Override
protected Object[][] getContents() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/LiteralVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/LiteralVisitor.java
index d086182..6b52c83 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/LiteralVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/LiteralVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -86,9 +86,6 @@
this.literal = ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
if (type == LiteralType.ABSTRACT_SCHEMA_NAME) {
@@ -96,9 +93,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -113,17 +107,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
visitAbstractPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
if (type == LiteralType.ENTITY_TYPE) {
@@ -131,9 +119,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
if (type == LiteralType.STRING_LITERAL) {
@@ -141,9 +126,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -155,9 +137,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
if (type == LiteralType.INPUT_PARAMETER) {
@@ -165,9 +144,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
if (type == LiteralType.IDENTIFICATION_VARIABLE) {
@@ -178,9 +154,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
if (type == LiteralType.ABSTRACT_SCHEMA_NAME) {
@@ -191,9 +164,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
if (type == LiteralType.RESULT_VARIABLE) {
@@ -201,17 +171,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
visitAbstractPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
if (type == LiteralType.STRING_LITERAL) {
@@ -219,9 +183,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
expression.getCollectionValuedPathExpression().accept(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/ParameterTypeVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/ParameterTypeVisitor.java
index 5844d9a..573fc6e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/ParameterTypeVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/ParameterTypeVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -152,68 +152,44 @@
*/
public abstract Object getType();
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
// The absolute function always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
// An abstract schema type always have a type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
// The average function always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
@@ -277,25 +253,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
@@ -309,26 +276,17 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
// A collection-valued path expression always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
if (expression.getExpression().isAncestor(inputParameter)) {
@@ -336,43 +294,28 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
typeName = expression.getClassName();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
// The count function always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
// A date/time always have a type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
@@ -385,59 +328,38 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
// The exist function always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
type = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
// The identification variable always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -454,9 +376,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
if (inputParameter == null) {
@@ -465,26 +384,17 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
// KEY() always have a type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
@@ -498,9 +408,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
@@ -520,9 +427,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
@@ -541,60 +445,39 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
// The lower function always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
// The maximum function always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
// The minimum function always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
visitDoubleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -608,51 +491,33 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
visitDoubleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
// A numerical expression always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
// The modulo function always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
if (expression.isAncestor(inputParameter)) {
@@ -663,26 +528,17 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
// A state field path expression always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
@@ -698,26 +554,17 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
// The sum function always have a return type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
@@ -729,9 +576,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
if (expression.getExpression() != inputParameter) {
@@ -739,34 +583,22 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
expression.getStateFieldPathExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
// VALUE() always have a type
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
super.visit(expression);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/WordParser.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/WordParser.java
index 869ffcd..4efbb52 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/WordParser.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/WordParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -939,9 +939,6 @@
return text.subSequence(startIndex, endIndex).toString();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return isTail() ? ExpressionTools.EMPTY_STRING : substring();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbsExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbsExpression.java
index dff84db..3f103f4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbsExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbsExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,25 +45,16 @@
super(parent, ABS);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return SimpleArithmeticExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningNumericsBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbsExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbsExpressionFactory.java
index 2153544..5458e1a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbsExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbsExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.ABS);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractConditionalClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractConditionalClause.java
index c127acd..bfeadfe 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractConditionalClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractConditionalClause.java
@@ -67,25 +67,16 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getConditionalExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addChildrenTo(Collection<Expression> children) {
children.add(getConditionalExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addOrderedChildrenTo(List<Expression> children) {
@@ -122,9 +113,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -186,18 +174,12 @@
return hasSpaceAfterIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.character() == RIGHT_PARENTHESIS ||
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void parse(WordParser wordParser, boolean tolerant) {
@@ -210,17 +192,11 @@
conditionalExpression = parse(wordParser, ConditionalExpressionBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean shouldSkipLiteral(AbstractExpression expression) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractDoubleEncapsulatedExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractDoubleEncapsulatedExpression.java
index b6fb6ff..705ea77 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractDoubleEncapsulatedExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractDoubleEncapsulatedExpression.java
@@ -66,27 +66,18 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getFirstExpression().accept(visitor);
getSecondExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getFirstExpression());
children.add(getSecondExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List<Expression> children) {
@@ -132,9 +123,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -183,9 +171,6 @@
return hasComma;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasFirstExpression() || hasComma || hasSecondExpression();
@@ -223,9 +208,6 @@
return hasSpaceAfterComma;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
char character = wordParser.character();
@@ -256,9 +238,6 @@
*/
public abstract String parameterExpressionBNF(int index);
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -296,9 +275,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
hasComma = false;
@@ -307,9 +283,6 @@
hasSpaceAfterComma = false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedTextEncapsulatedExpression(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkExpressionVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkExpressionVisitor.java
index 1df49f1..ca17f53 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkExpressionVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkExpressionVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,86 +30,50 @@
public abstract class AbstractEclipseLinkExpressionVisitor extends AbstractExpressionVisitor
implements EclipseLinkExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkTraverseChildrenVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkTraverseChildrenVisitor.java
index 4cb5f4a..b86f012 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkTraverseChildrenVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkTraverseChildrenVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,97 +32,61 @@
public abstract class AbstractEclipseLinkTraverseChildrenVisitor extends AbstractTraverseChildrenVisitor
implements EclipseLinkExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
visit((Expression) expression);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkTraverseParentVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkTraverseParentVisitor.java
index 8e7e81e..b175383 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkTraverseParentVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEclipseLinkTraverseParentVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,97 +31,61 @@
public abstract class AbstractEclipseLinkTraverseParentVisitor extends AbstractTraverseParentVisitor
implements EclipseLinkExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
visit((Expression) expression);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEncapsulatedExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEncapsulatedExpression.java
index 6ca6539..a667458 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEncapsulatedExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractEncapsulatedExpression.java
@@ -61,9 +61,6 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addOrderedChildrenTo(List<Expression> children) {
@@ -156,9 +153,6 @@
return hasSpaceAfterIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -185,9 +179,6 @@
wordParser.startsWith(EQUAL);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -278,9 +269,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractExpression.java
index 8aec2e4..ee14a92 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -390,9 +390,6 @@
throw new RuntimeException("The position of the Expression could not be calculated: " + expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final ListIterable<Expression> children() {
if (children == null) {
@@ -434,9 +431,6 @@
return getExpressionRegistry().getExpressionFactory(fallBackQueryBNF.getFallbackExpressionFactoryId());
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getQueryBNF();
@@ -465,9 +459,6 @@
return getGrammar().getExpressionRegistry();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return getRoot().getGrammar();
@@ -492,17 +483,11 @@
return getRoot().getJPAVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
public final int getLength() {
return toActualText().length();
}
- /**
- * {@inheritDoc}
- */
@Override
public final int getOffset() {
if (offset == -1) {
@@ -511,9 +496,6 @@
return offset;
}
- /**
- * {@inheritDoc}
- */
@Override
public final AbstractExpression getParent() {
return parent;
@@ -529,9 +511,6 @@
return getExpressionRegistry().getQueryBNF(queryBNFID);
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLExpression getRoot() {
return (parent == null) ? (JPQLExpression) this : parent.getRoot();
@@ -573,9 +552,6 @@
return queryBNF.handleCollection();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isAncestor(Expression expression) {
@@ -668,9 +644,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public final ListIterable<Expression> orderedChildren() {
if (orderedChildren == null) {
@@ -1041,9 +1014,6 @@
return factory.buildExpression(this, wordParser, word, queryBNF, null, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
public void populatePosition(QueryPosition queryPosition, int position) {
@@ -1132,9 +1102,6 @@
return (expression != null);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toActualText() {
if (actualText == null) {
@@ -1145,9 +1112,6 @@
return actualText;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
if (parsedText == null) {
@@ -1169,9 +1133,6 @@
*/
protected abstract void toParsedText(StringBuilder writer, boolean actual);
- /**
- * {@inheritDoc}
- */
@Override
public final String toString() {
// toString() should only be called during debugging, thus the cached parsed text
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractExpressionVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractExpressionVisitor.java
index ea3d402..b4f23a2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractExpressionVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractExpressionVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,590 +30,338 @@
*/
public abstract class AbstractExpressionVisitor implements ExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractFromClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractFromClause.java
index e1f13ac..c02121c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractFromClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractFromClause.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,9 +90,6 @@
super(parent, FROM);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getDeclaration().accept(visitor);
@@ -100,9 +97,6 @@
getAsOfClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getDeclaration());
@@ -110,9 +104,6 @@
children.add(getAsOfClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -167,9 +158,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -300,9 +288,6 @@
return hasSpaceAfterHierarchicalQueryClause;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -314,9 +299,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -358,17 +340,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean shouldParseWithFactoryFirst() {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractJPQLGrammar.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractJPQLGrammar.java
index baa8ce5..0996ede 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractJPQLGrammar.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractJPQLGrammar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -136,9 +136,6 @@
return jpqlGrammar;
}
- /**
- * {@inheritDoc}
- */
@Override
public ExpressionRegistry getExpressionRegistry() {
return registry;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractLiteralExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractLiteralExpressionFactory.java
index fbc8ecf..3c88b9a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractLiteralExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractLiteralExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,9 +59,6 @@
AbstractExpression expression,
boolean tolerant);
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractOrderByClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractOrderByClause.java
index 5d7ad13..437ef91 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractOrderByClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractOrderByClause.java
@@ -56,25 +56,16 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getOrderByItems().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getOrderByItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -108,9 +99,6 @@
return new CollectionExpression(this, children, spaces, commas, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -162,9 +150,6 @@
return hasSpaceAfterIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -177,9 +162,6 @@
orderByItems = parse(wordParser, OrderByItemBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractPathExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractPathExpression.java
index aaf87b9..4c67563 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractPathExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractPathExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -107,26 +107,17 @@
this.pathSize = -1;
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getIdentificationVariable().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
checkPaths();
children.add(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addOrderedChildrenTo(List<Expression> children) {
@@ -233,9 +224,6 @@
return endsWithDot;
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -291,9 +279,6 @@
return identificationVariable.isVirtual();
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void parse(WordParser wordParser, boolean tolerant) {
wordParser.moveForward(getText());
@@ -366,9 +351,6 @@
return writer.toString();
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaName.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaName.java
index 1666a3b..ecf26fc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaName.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,72 +37,45 @@
super(parent, abstractSchemaName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(getText()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(AbstractSchemaNameBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getText() {
return super.getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
wordParser.moveForward(getText());
}
- /**
- * {@inheritDoc}
- */
@Override
public String toActualText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaNameBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaNameBNF.java
index 22f0bca..db3221f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaNameBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaNameBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaNameFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaNameFactory.java
index fe60476..9968639 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaNameFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSchemaNameFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSelectClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSelectClause.java
index 14840b2..70ecaf7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSelectClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSelectClause.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -76,25 +76,16 @@
super(parent, SELECT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getSelectExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getSelectExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -139,9 +130,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -234,9 +222,6 @@
return hasSpaceAfterSelect;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -255,17 +240,11 @@
selectExpression = parse(wordParser, getSelectItemQueryBNFId(), tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean shouldSkipLiteral(AbstractExpression expression) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSelectStatement.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSelectStatement.java
index fcec2e7..340b775 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSelectStatement.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSelectStatement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -87,9 +87,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getSelectClause().accept(visitor);
@@ -99,9 +96,6 @@
getHavingClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getSelectClause());
@@ -111,9 +105,6 @@
children.add(getHavingClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -177,9 +168,6 @@
*/
protected abstract AbstractSelectClause buildSelectClause();
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -361,9 +349,6 @@
!whereClause.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -442,9 +427,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSingleEncapsulatedExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSingleEncapsulatedExpression.java
index 24633b4..ee44604 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSingleEncapsulatedExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractSingleEncapsulatedExpression.java
@@ -48,25 +48,16 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List<Expression> children) {
if (expression != null) {
@@ -74,9 +65,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -106,9 +94,6 @@
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasExpression();
@@ -125,9 +110,6 @@
!expression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -136,9 +118,6 @@
expression = parse(wordParser, getEncapsulatedExpressionQueryBNFId(), tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
expression = null;
@@ -156,9 +135,6 @@
this.expression.setParent(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedTextEncapsulatedExpression(StringBuilder writer, boolean actual) {
if (expression != null) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTraverseChildrenVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTraverseChildrenVisitor.java
index 9879f43..c6f4d46 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTraverseChildrenVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTraverseChildrenVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,9 +26,6 @@
*/
public abstract class AbstractTraverseChildrenVisitor extends AnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
protected final void visit(Expression expression) {
expression.acceptChildren(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTraverseParentVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTraverseParentVisitor.java
index 778887f..1e99f8f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTraverseParentVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTraverseParentVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,17 +25,11 @@
*/
public abstract class AbstractTraverseParentVisitor extends AnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
// This is the root of the parsed tree
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTripleEncapsulatedExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTripleEncapsulatedExpression.java
index ce75b6f..8eabcc7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTripleEncapsulatedExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AbstractTripleEncapsulatedExpression.java
@@ -85,9 +85,6 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getFirstExpression().accept(visitor);
@@ -95,9 +92,6 @@
getThirdExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getFirstExpression());
@@ -105,9 +99,6 @@
children.add(getThirdExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List<Expression> children) {
@@ -171,9 +162,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -238,9 +226,6 @@
return thirdExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasFirstExpression() || hasFirstComma ||
@@ -321,9 +306,6 @@
!thirdExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -351,9 +333,6 @@
*/
protected abstract boolean isThirdExpressionOptional();
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -410,9 +389,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
hasFirstComma = false;
@@ -424,9 +400,6 @@
hasSpaceAfterSecondComma = false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void toParsedTextEncapsulatedExpression(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AdditionExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AdditionExpression.java
index 139fcb9..620e932 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AdditionExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AdditionExpression.java
@@ -36,9 +36,6 @@
super(parent, PLUS);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AggregateExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AggregateExpressionBNF.java
index 3b3bd0f..2caed4c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AggregateExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AggregateExpressionBNF.java
@@ -51,9 +51,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AggregateFunction.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AggregateFunction.java
index 4ea95fc..7707634 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AggregateFunction.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AggregateFunction.java
@@ -72,9 +72,6 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List<Expression> children) {
@@ -99,9 +96,6 @@
return new StateFieldPathExpression(this, word);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalAggregateFunctionBNF.ID;
@@ -118,9 +112,6 @@
return (distinctIdentifier != null) ?distinctIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(AggregateExpressionBNF.ID);
@@ -145,9 +136,6 @@
return hasSpaceAfterDistinct;
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -163,9 +151,6 @@
super.parseEncapsulatedExpression(wordParser, whitespaceCount, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedTextEncapsulatedExpression(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpression.java
index 1e1ea46..ca241dd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpression.java
@@ -52,33 +52,21 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return SubqueryBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(AllOrAnyExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression parse(WordParser wordParser, String queryBNFId, boolean tolerant) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpressionBNF.java
index dc35bd7..8685dba 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpressionFactory.java
index 0ab9393..a93ed5d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AllOrAnyExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,9 +45,6 @@
Expression.SOME);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AndExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AndExpression.java
index ffbb184..117658d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AndExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AndExpression.java
@@ -54,33 +54,21 @@
super(parent, AND);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getLeftExpressionQueryBNFId() {
return ConditionalTermBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getRightExpressionQueryBNFId() {
return ConditionalFactorBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(AND) ||
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AndExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AndExpressionFactory.java
index 0668744..53df739 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AndExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AndExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,9 +47,6 @@
super(ID, Expression.AND);
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("null")
protected AbstractExpression buildExpression(AbstractExpression parent,
@@ -105,9 +102,6 @@
*/
boolean found;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
found = true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AnonymousExpressionVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AnonymousExpressionVisitor.java
index 775d22c..c3f4e63 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AnonymousExpressionVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AnonymousExpressionVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,217 +30,136 @@
*/
public abstract class AnonymousExpressionVisitor implements ExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
visit((Expression) expression);
@@ -254,457 +173,286 @@
protected void visit(Expression expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
visit((Expression) expression);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpression.java
index eb17737..1e41d37 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getParent().findQueryBNF(expression);
@@ -59,33 +56,21 @@
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getLeftExpressionQueryBNFId() {
return ArithmeticExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ArithmeticTermBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public final String getRightExpressionQueryBNFId() {
return ArithmeticTermBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -109,9 +94,6 @@
return (expression != null);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final String parseIdentifier(WordParser wordParser) {
return getText();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpressionBNF.java
index 1467b4b..93bcde4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpressionFactory.java
index 6067823..c3af903 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,9 +64,6 @@
return new DivisionExpression(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
@@ -162,17 +159,11 @@
*/
boolean found;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
found = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
found = true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticFactor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticFactor.java
index bd04c77..ba041c6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticFactor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticFactor.java
@@ -56,33 +56,21 @@
operator = arithmeticFactor.charAt(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -97,9 +85,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -122,17 +107,11 @@
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ArithmeticFactorBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean handleAggregate(JPQLQueryBNF queryBNF) {
return false;
@@ -167,9 +146,6 @@
return operator == '-';
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.isArithmeticSymbol(wordParser.character()) ||
@@ -185,9 +161,6 @@
return operator == '+';
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -200,9 +173,6 @@
expression = parse(wordParser, ArithmeticFactorBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticFactorBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticFactorBNF.java
index 4319b5d..30abeca 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticFactorBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticFactorBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticPrimaryBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticPrimaryBNF.java
index 0079487..1c91e54 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticPrimaryBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticPrimaryBNF.java
@@ -65,9 +65,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticTermBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticTermBNF.java
index 166ffbf..bdfecd2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticTermBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ArithmeticTermBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClause.java
index 42fdf65..bfec2fb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClause.java
@@ -45,13 +45,13 @@
private AbstractExpression expression;
/**
- * Determines whether a whitespace was found after either <code><b>SCN</b><code> or
+ * Determines whether a whitespace was found after either <code><b>SCN</b></code> or
* <code><b>TIMESTAMP</b></code>.
*/
private boolean hasSpaceAfterCategory;
/**
- * Determines whether a whitespace was found after <code><b>AS OF</b><code>.
+ * Determines whether a whitespace was found after <code><b>AS OF</b></code>.
*/
private boolean hasSpaceAfterIdentifier;
@@ -81,33 +81,21 @@
super(parent, AS_OF);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -137,9 +125,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -193,9 +178,6 @@
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(AsOfClauseBNF.ID);
@@ -249,9 +231,6 @@
return timestampIdentifier != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -274,9 +253,6 @@
expression = parse(wordParser, ScalarExpressionBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClauseBNF.java
index 745458c..4950cfc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClauseFactory.java
index b451931..b12d774 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AsOfClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,6 @@
super(ID, Expression.AS_OF);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AvgFunction.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AvgFunction.java
index 8466bc6..5987bcc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AvgFunction.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AvgFunction.java
@@ -35,9 +35,6 @@
super(parent, AVG);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AvgFunctionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AvgFunctionFactory.java
index e8146c6..77b00e3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AvgFunctionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/AvgFunctionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.AVG);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpression.java
index 7d36dd4..2c3fc8d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,41 +57,26 @@
this.expression.setParent(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
// Don't traverse the invalid expression
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
// Don't traverse the invalid expression
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(toParsedText()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getParent().findQueryBNF(expression);
@@ -109,17 +94,11 @@
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(BadExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -131,25 +110,16 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isUnknown() {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
expression = parse(wordParser, BadExpressionBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
if (expression != null) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpressionBNF.java
index 5675f16..97723cd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpressionFactory.java
index 97f1109..4951033 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BadExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpression.java
index de7e6c4..6bc20ac 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpression.java
@@ -94,17 +94,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
@@ -112,9 +106,6 @@
getUpperBoundExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
@@ -122,9 +113,6 @@
children.add(getUpperBoundExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -172,9 +160,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -265,9 +250,6 @@
return lowerBoundExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(BetweenExpressionBNF.ID);
@@ -373,9 +355,6 @@
!upperBoundExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.character() == RIGHT_PARENTHESIS ||
@@ -385,9 +364,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -418,9 +394,6 @@
upperBoundExpression = parse(wordParser, InternalBetweenExpressionBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpressionBNF.java
index 645d51c..5448307 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpressionBNF.java
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpressionFactory.java
index 7ec4150..edefa0e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BetweenExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
Expression.NOT_BETWEEN);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanExpressionBNF.java
index 7259cc2..dc8b687 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanLiteralBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanLiteralBNF.java
index ba46806..e5f8a8e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanLiteralBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanLiteralBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanPrimaryBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanPrimaryBNF.java
index 2bae889..afe073e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanPrimaryBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/BooleanPrimaryBNF.java
@@ -48,9 +48,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpression.java
index 178c4ed..a47ba69 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpression.java
@@ -100,17 +100,11 @@
super(parent, CASE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getCaseOperand().accept(visitor);
@@ -118,9 +112,6 @@
getElseExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getCaseOperand());
@@ -128,9 +119,6 @@
children.add(getElseExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -183,9 +171,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -260,9 +245,6 @@
return elseExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(GeneralCaseExpressionBNF.ID);
@@ -381,9 +363,6 @@
!whenClauses.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -407,9 +386,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -447,9 +423,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
@@ -503,7 +476,7 @@
}
/**
- * A enumeration used to determine how {@link CaseExpression#isParsingComplete(WordParser, String)}
+ * A enumeration used to determine how {@link CaseExpression#isParsingComplete(WordParser, String, Expression)}
* should behaves.
*/
private enum ParsingType {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpressionBNF.java
index 562f818..edce92d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpressionBNF.java
@@ -40,9 +40,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpressionFactory.java
index f3f8ec6..f31e232 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.CASE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseOperandBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseOperandBNF.java
index ff5250c..d185e3e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseOperandBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CaseOperandBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpression.java
index 6a19576..97ae3e8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -74,17 +74,11 @@
shouldParseWithFactoryFirst = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List<Expression> children) {
@@ -109,9 +103,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return ScalarExpressionBNF.ID;
@@ -126,9 +117,6 @@
return databaseType;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(CastExpressionBNF.ID);
@@ -153,9 +141,6 @@
!databaseType.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return super.hasEncapsulatedExpression() || (asIdentifier != null) || hasDatabaseType();
@@ -192,9 +177,6 @@
return hasSpaceAfterExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -214,9 +196,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -246,9 +225,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
super.removeEncapsulatedExpression();
@@ -258,17 +234,11 @@
hasSpaceAfterExpression = false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean shouldParseWithFactoryFirst() {
return shouldParseWithFactoryFirst;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedTextEncapsulatedExpression(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpressionBNF.java
index 89a70bd..ad80278 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpressionFactory.java
index 26c2d13..e4f5647 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CastExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.CAST);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpression.java
index e663269..7c4cda2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,25 +39,16 @@
super(parent, COALESCE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalCoalesceExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(CoalesceExpressionBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpressionBNF.java
index 9bcfab4..47e8ff7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpressionFactory.java
index bf0b902..66cfb0b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CoalesceExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.COALESCE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionExpression.java
index 0e5edb2..70ce155 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionExpression.java
@@ -94,9 +94,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
@@ -114,9 +111,6 @@
getChild(index).accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
for (Expression child : children()) {
@@ -124,9 +118,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
@@ -138,9 +129,6 @@
children.addAll(this.children);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -208,9 +196,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getParent().findQueryBNF(expression);
@@ -238,9 +223,6 @@
return child;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getParent().getQueryBNF();
@@ -285,9 +267,6 @@
return children.indexOf(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
throw new IllegalAccessError("This method shouln't be invoked, text=" + wordParser);
@@ -321,9 +300,6 @@
return writer.toString();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
toParsedText(writer, childrenSize(), actual);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclaration.java
index df95f57..e48ccdb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclaration.java
@@ -98,35 +98,23 @@
super(parent, IN);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getCollectionValuedPathExpression().accept(visitor);
getIdentificationVariable().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getCollectionValuedPathExpression());
children.add(getIdentificationVariable());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -171,9 +159,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -234,9 +219,6 @@
return identificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(CollectionMemberDeclarationBNF.ID);
@@ -342,9 +324,6 @@
!hasIdentificationVariable();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.character() == RIGHT_PARENTHESIS ||
@@ -352,9 +331,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -445,9 +421,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclarationBNF.java
index fe8c9b2..8edafea 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclarationBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclarationBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclarationFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclarationFactory.java
index 0788fb4..360cbd0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclarationFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclarationFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(ID, Expression.IN);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpression.java
index 3b40f9d..2bda1df 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpression.java
@@ -86,35 +86,23 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getEntityExpression().accept(visitor);
getCollectionValuedPathExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getEntityExpression());
children.add(getCollectionValuedPathExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -158,9 +146,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -253,9 +238,6 @@
return MEMBER;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(CollectionMemberExpressionBNF.ID);
@@ -318,9 +300,6 @@
return hasSpaceAfterOf;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -349,9 +328,6 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpressionBNF.java
index 8750d72..66fb3e2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpressionFactory.java
index ca91d94..2243dae 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,9 +45,6 @@
Expression.NOT_MEMBER_OF);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpression.java
index cdab828..e9a0e09 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpression.java
@@ -65,17 +65,11 @@
super(parent, paths);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(CollectionValuedPathExpressionBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpressionBNF.java
index 183d31f..4d47baa 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpressionBNF.java
@@ -43,9 +43,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpressionFactory.java
index 17594a6..fe0dc5f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionValuedPathExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
@@ -52,9 +49,6 @@
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isCollection() {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpression.java
index b718f09..d1e2daa 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,9 +66,6 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
@@ -83,33 +80,21 @@
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getLeftExpressionQueryBNFId() {
return ComparisonExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ComparisonExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getRightExpressionQueryBNFId() {
return ComparisonExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -135,9 +120,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected String parseIdentifier(WordParser wordParser) {
return getText();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpressionBNF.java
index 6fdfb5b..7cad2ad 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpressionBNF.java
@@ -55,9 +55,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpressionFactory.java
index 24f707b..7744d17 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ComparisonExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,9 +49,6 @@
LOWER_THAN_OR_EQUAL);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CompoundExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CompoundExpression.java
index cf2a8f3..957c25f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CompoundExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CompoundExpression.java
@@ -60,27 +60,18 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getLeftExpression().accept(visitor);
getRightExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addChildrenTo(Collection<Expression> children) {
children.add(getLeftExpression());
children.add(getRightExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addOrderedChildrenTo(List<Expression> children) {
@@ -106,9 +97,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -214,9 +202,6 @@
return hasSpaceAfterIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void parse(WordParser wordParser, boolean tolerant) {
@@ -267,9 +252,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConcatExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConcatExpression.java
index 9999d6f..060eb53 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConcatExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConcatExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,9 +47,6 @@
super(parent, CONCAT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
@@ -74,17 +71,11 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalConcatExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningStringsBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConcatExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConcatExpressionFactory.java
index f22d63b..0a7dc70 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConcatExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConcatExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.CONCAT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalExpressionBNF.java
index e2883bc..d070982 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalFactorBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalFactorBNF.java
index dcb4862..9f14d7f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalFactorBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalFactorBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalPrimaryBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalPrimaryBNF.java
index 16518f6..cce9d34 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalPrimaryBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalPrimaryBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalTermBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalTermBNF.java
index 977c3c9..bec4ae9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalTermBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConditionalTermBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClause.java
index 9c4a86b..fdc4063 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClause.java
@@ -56,33 +56,21 @@
super(parent, CONNECT_BY);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -99,9 +87,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -135,9 +120,6 @@
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ConnectByClauseBNF.ID);
@@ -164,9 +146,6 @@
return hasSpaceAfterConnectBy;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -179,9 +158,6 @@
expression = parse(wordParser, InternalConnectByClauseBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClauseBNF.java
index ab4bf18..0c364d9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClauseBNF.java
@@ -40,9 +40,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClauseFactory.java
index cb2ded7..e935577 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConnectByClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,9 +40,6 @@
super(ID, CONNECT_BY);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpression.java
index 692aa13..9e03342 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpression.java
@@ -79,33 +79,21 @@
super(parent, NEW);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getConstructorItems().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getConstructorItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -159,9 +147,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -204,9 +189,6 @@
return constructorItems;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ConstructorExpressionBNF.ID);
@@ -253,18 +235,12 @@
return hasSpaceAfterNew;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.character() == RIGHT_PARENTHESIS ||
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -315,17 +291,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean shouldSkipLiteral(AbstractExpression expression) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpressionBNF.java
index 15e49cf..05b2f41 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpressionFactory.java
index 3101848..039a6b9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.NEW);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorItemBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorItemBNF.java
index 0fd1fc5..11eb420 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorItemBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorItemBNF.java
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CountFunction.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CountFunction.java
index 345b097..79c902e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CountFunction.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CountFunction.java
@@ -39,17 +39,11 @@
super(parent, COUNT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildEncapsulatedExpression(WordParser wordParser, String word) {
@@ -70,9 +64,6 @@
return super.buildEncapsulatedExpression(wordParser, word);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalCountBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CountFunctionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CountFunctionFactory.java
index 597d340..29ada19 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CountFunctionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CountFunctionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.COUNT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseType.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseType.java
index 658fca6..cac8553 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseType.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,41 +42,26 @@
super(parent, databaseType);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(DatabaseTypeQueryBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isSecondExpressionOptional() {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public String parameterExpressionBNF(int index) {
return NumericLiteralBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean shouldParseRightParenthesis(WordParser wordParser, boolean tolerant) {
// If the database type uses parenthesis, then this expression will own the right
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseTypeFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseTypeFactory.java
index 2214c83..4caa99f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseTypeFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseTypeFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseTypeQueryBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseTypeQueryBNF.java
index 97eb1b4..77f55e3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseTypeQueryBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatabaseTypeQueryBNF.java
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTime.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTime.java
index ac0b9cc..1d62b42 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTime.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTime.java
@@ -54,24 +54,15 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(getText()));
@@ -87,17 +78,11 @@
return identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningDatetimeBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getText() {
return super.getText();
@@ -148,9 +133,6 @@
return getText().charAt(0) == LEFT_CURLY_BRACKET;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -204,25 +186,16 @@
wordParser.moveForward(stopIndex - startIndex);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toActualText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(actual && !isJDBCDate() ? identifier : getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimeFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimeFactory.java
index 98b0ff5..d02cc9b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimeFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimeFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,9 +46,6 @@
"{");
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimePrimaryBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimePrimaryBNF.java
index 5f584ea..46d3830 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimePrimaryBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimePrimaryBNF.java
@@ -51,9 +51,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimeTimestampLiteralBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimeTimestampLiteralBNF.java
index 786d535..774ce12 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimeTimestampLiteralBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DateTimeTimestampLiteralBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatetimeExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatetimeExpressionBNF.java
index 84add30..22b39d5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatetimeExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DatetimeExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultEclipseLinkJPQLGrammar.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultEclipseLinkJPQLGrammar.java
index e6952df..17d5a90 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultEclipseLinkJPQLGrammar.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultEclipseLinkJPQLGrammar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,41 +57,26 @@
return EclipseLinkJPQLGrammar2_6.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public ExpressionRegistry getExpressionRegistry() {
return instance().getExpressionRegistry();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return instance().getJPAVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return instance().getProvider();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return instance().getProviderVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return instance().toString();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultJPQLGrammar.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultJPQLGrammar.java
index d5270eb..be1464a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultJPQLGrammar.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultJPQLGrammar.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,41 +60,26 @@
return JPQLGrammar2_1.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public ExpressionRegistry getExpressionRegistry() {
return instance().getExpressionRegistry();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return instance().getJPAVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return instance().getProvider();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return instance().toString();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultStringExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultStringExpression.java
index 3112acc..ee73e53 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultStringExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DefaultStringExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,49 +42,31 @@
this.value = value;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
// This object should not be visited
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
// This object does not have children
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
// Nothing to parse
}
- /**
- * {@inheritDoc}
- */
@Override
public void populatePosition(QueryPosition queryPosition, int position) {
queryPosition.setExpression(getParent());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(value);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClause.java
index e6c29df..a41d14d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClause.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -72,33 +72,21 @@
super(parent, DELETE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getRangeVariableDeclaration().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getRangeVariableDeclaration());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -143,9 +131,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -178,9 +163,6 @@
return (fromIdentifier != null) ? fromIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(DeleteClauseBNF.ID);
@@ -237,9 +219,6 @@
return hasSpaceAfterFrom;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -268,9 +247,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseBNF.java
index 750dcd6..ce1545c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseFactory.java
index e584637..ce5bc59 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.DELETE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseRangeVariableDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseRangeVariableDeclarationBNF.java
index efff4e7..c0c08be 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseRangeVariableDeclarationBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseRangeVariableDeclarationBNF.java
@@ -40,9 +40,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatement.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatement.java
index e8e7bf3..5130ecf 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatement.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatement.java
@@ -55,26 +55,17 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getDeleteClause().accept(visitor);
getWhereClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getDeleteClause());
@@ -88,9 +79,6 @@
return deleteClause = new DeleteClause(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -103,9 +91,6 @@
children.add(whereClause);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -129,9 +114,6 @@
return deleteClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(DeleteStatementBNF.ID);
@@ -170,9 +152,6 @@
!whereClause.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -192,9 +171,6 @@
accept(new FullyQualifyPathExpressionVisitor());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatementBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatementBNF.java
index c54dac1..e9da514 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatementBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatementBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatementFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatementFactory.java
index c038012..c51e3d8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatementFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteStatementFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,9 +43,6 @@
Expression.DELETE_FROM);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DerivedCollectionMemberDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DerivedCollectionMemberDeclarationBNF.java
index 32c1bc3..12cf570 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DerivedCollectionMemberDeclarationBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DerivedCollectionMemberDeclarationBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DivisionExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DivisionExpression.java
index ce2ffca..ce2eed3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DivisionExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DivisionExpression.java
@@ -38,17 +38,11 @@
super(parent, DIVISION);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkAnonymousExpressionVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkAnonymousExpressionVisitor.java
index 4afc085..d3a9399 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkAnonymousExpressionVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkAnonymousExpressionVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,97 +31,61 @@
public abstract class EclipseLinkAnonymousExpressionVisitor extends AnonymousExpressionVisitor
implements EclipseLinkExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
visit((Expression) expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
visit((Expression) expression);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar1.java
index 566abf3..495767e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar1.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,62 +61,38 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
return new JPQLGrammar1_0();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_1_0;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultEclipseLinkJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return VERSION.getVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "EclipseLink 1.x";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_0.java
index f9f5310..96c3123 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_0.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_0.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,9 +59,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultEclipseLinkJPQLGrammar.PROVIDER_NAME;
@@ -97,33 +94,21 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
return new JPQLGrammar2_0();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_2_0;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return VERSION.getVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
@@ -132,23 +117,14 @@
addChildBNF(InExpressionExpressionBNF.ID, InputParameterBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "EclipseLink 2.0";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_1.java
index 95babb1..c5665bd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_1.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -130,9 +130,6 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
@@ -145,33 +142,21 @@
return jpqlGrammar;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_2_0;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultEclipseLinkJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return VERSION.getVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
@@ -211,9 +196,6 @@
addChildBNF(PatternValueBNF.ID, ArithmeticExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -221,9 +203,6 @@
registerFactory(new TreatExpressionFactory());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -239,9 +218,6 @@
registerIdentifierVersion(TREAT, JPAVersion.VERSION_2_0);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "EclipseLink 2.1";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_2.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_2.java
index 061f0d0..7c8ec70 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_2.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -82,62 +82,38 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
return new EclipseLinkJPQLGrammar2_1();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_2_0;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultEclipseLinkJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return VERSION.getVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "EclipseLink 2.2";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_3.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_3.java
index 356d5e6..b4d649f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_3.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_3.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -82,62 +82,38 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
return new EclipseLinkJPQLGrammar2_2();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_2_0;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultEclipseLinkJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return VERSION.getVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "EclipseLink 2.3";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_4.java
index 0d2986e..15ac6fb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_4.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_4.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -137,9 +137,6 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
@@ -155,33 +152,21 @@
return jpqlGrammar;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_2_1;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultEclipseLinkJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return VERSION.getVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
@@ -238,9 +223,6 @@
setHandleSubExpression(RangeVariableDeclarationBNF.ID, true);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -268,9 +250,6 @@
setFallbackExpressionFactoryId(JoinAssociationPathExpressionBNF.ID, JoinCollectionValuedPathExpressionFactory.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -313,9 +292,6 @@
registerIdentifierRole("LAST", IdentifierRole.CLAUSE); // Part of NULLS LAST
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "EclipseLink 2.4";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_5.java
index bc48caf..319e658 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_5.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_5.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -108,41 +108,26 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
return new EclipseLinkJPQLGrammar2_4();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_2_1;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultEclipseLinkJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return VERSION.getVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
@@ -161,9 +146,6 @@
addChildBNF(InExpressionExpressionBNF.ID, ScalarExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -174,9 +156,6 @@
registerFactory(new StartWithClauseFactory());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -200,9 +179,6 @@
registerIdentifierVersion("WITH", JPAVersion.VERSION_2_1);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "EclipseLink 2.5";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_6.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_6.java
index f7a1290..0e7aaa1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_6.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EclipseLinkJPQLGrammar2_6.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -85,62 +85,38 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
return new EclipseLinkJPQLGrammar2_5();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_2_1;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultEclipseLinkJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return VERSION.getVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "EclipseLink 2.6";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ElseExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ElseExpressionBNF.java
index 07b3016..628051e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ElseExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ElseExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EmptyCollectionComparisonExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EmptyCollectionComparisonExpression.java
index f7c37de..bcffa8b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EmptyCollectionComparisonExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EmptyCollectionComparisonExpression.java
@@ -85,33 +85,21 @@
updateExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -146,9 +134,6 @@
return new StateFieldPathToCollectionValuedPathConverter(this, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -228,9 +213,6 @@
return EMPTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(EmptyCollectionComparisonExpressionBNF.ID);
@@ -264,9 +246,6 @@
return hasSpaceAfterIs;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -308,9 +287,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
@@ -381,9 +357,6 @@
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
this.expression = new CollectionValuedPathExpression(parent, expression.getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EmptyCollectionComparisonExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EmptyCollectionComparisonExpressionBNF.java
index b95c413..42e8cf0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EmptyCollectionComparisonExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EmptyCollectionComparisonExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EncapsulatedIdentificationVariableExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EncapsulatedIdentificationVariableExpression.java
index c7f7e63..86d4ac6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EncapsulatedIdentificationVariableExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EncapsulatedIdentificationVariableExpression.java
@@ -41,25 +41,16 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public final String getEncapsulatedExpressionQueryBNFId() {
return IdentificationVariableBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(GeneralIdentificationVariableBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression parse(WordParser wordParser, String queryBNFId, boolean tolerant) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityExpressionBNF.java
index dd51ad1..3c2a96d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityExpressionBNF.java
@@ -45,9 +45,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityOrValueExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityOrValueExpressionBNF.java
index f02107f..0dfb1f6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityOrValueExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityOrValueExpressionBNF.java
@@ -40,9 +40,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeExpressionBNF.java
index c561099..2d93a9b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeExpressionBNF.java
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteral.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteral.java
index a9ead5b..7973e0e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteral.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteral.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,24 +37,15 @@
super(parent, entityTypeName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(getText()));
@@ -69,33 +60,21 @@
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(EntityTypeLiteralBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
wordParser.moveForward(getText());
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteralBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteralBNF.java
index e10e769..97db65c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteralBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteralBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteralFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteralFactory.java
index 3d73d27..1a344b3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteralFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntityTypeLiteralFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntryExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntryExpression.java
index 843c1cf..26c69aa 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntryExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntryExpression.java
@@ -42,9 +42,6 @@
super(parent, ENTRY);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntryExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntryExpressionFactory.java
index eaecce0..c2d146f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntryExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EntryExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.ENTRY);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumExpressionBNF.java
index 63a344c..c7a0b4b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumLiteralBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumLiteralBNF.java
index 01bfdd7..1e98439 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumLiteralBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumLiteralBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumPrimaryBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumPrimaryBNF.java
index 47f2d29..4a9a4dd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumPrimaryBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/EnumPrimaryBNF.java
@@ -48,9 +48,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpression.java
index 1ba9550..d7956ca 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpression.java
@@ -44,17 +44,11 @@
super(parent, EXISTS);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return SubqueryBNF.ID;
@@ -71,9 +65,6 @@
return (notIdentifier != null) ? notIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ExistsExpressionBNF.ID);
@@ -88,9 +79,6 @@
return (notIdentifier != null);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -104,9 +92,6 @@
super.parse(wordParser, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression parse(WordParser wordParser, String queryBNFId, boolean tolerant) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpressionBNF.java
index 41767ef..b199a23 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpressionFactory.java
index df97962..19abd5f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExistsExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.EXISTS);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExpressionFactory.java
index 8a27aaf..9446a56 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,7 +80,7 @@
/**
* Adds the given JPQL identifiers to this factory.
*
- * @param identifier The JPQL identifiers this factory will parse
+ * @param identifiers The JPQL identifiers this factory will parse
*/
void addIdentifiers(String... identifiers) {
@@ -113,17 +113,11 @@
AbstractExpression expression,
boolean tolerant);
- /**
- * {@inheritDoc}
- */
@Override
public final int compareTo(ExpressionFactory expressionFactory) {
return id.compareTo(expressionFactory.getId());
}
- /**
- * {@inheritDoc}
- */
@Override
public final boolean equals(Object object) {
if (object == null) {
@@ -158,9 +152,6 @@
return id;
}
- /**
- * {@inheritDoc}
- */
@Override
public final int hashCode() {
return id.hashCode();
@@ -185,9 +176,6 @@
this.expressionRegistry = expressionRegistry;
}
- /**
- * {@inheritDoc}
- */
@Override
public final String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExpressionVisitorWrapper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExpressionVisitorWrapper.java
index 01a2ebd..ae1613c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExpressionVisitorWrapper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExpressionVisitorWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,9 +62,6 @@
return delegate;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.accept(delegate);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpression.java
index f6fe7c0..35e89b9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,17 +67,11 @@
super(parent, EXTRACT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List<Expression> children) {
@@ -103,9 +97,6 @@
super.addOrderedEncapsulatedExpressionTo(children);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return ScalarExpressionBNF.ID;
@@ -132,9 +123,6 @@
return datePart;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ExtractExpressionBNF.ID);
@@ -149,9 +137,6 @@
return ExpressionTools.stringIsNotEmpty(datePart);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasDatePart() || (fromIdentifier != null) || hasExpression();
@@ -185,18 +170,12 @@
return hasSpaceAfterFrom;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(FROM) ||
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -236,9 +215,6 @@
super.parseEncapsulatedExpression(wordParser, whitespaceCount, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
super.removeEncapsulatedExpression();
@@ -248,9 +224,6 @@
hasSpaceAfterDatePart = false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedTextEncapsulatedExpression(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpressionBNF.java
index 245e86b..2ebfb40 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpressionBNF.java
@@ -40,9 +40,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpressionFactory.java
index 2986c53..5a16304 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ExtractExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.EXTRACT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClause.java
index 6a87363..40b84b6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClause.java
@@ -43,25 +43,16 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getDeclarationQueryBNFId() {
return InternalFromClauseBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FromClauseBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClauseBNF.java
index 12d2d36..99f819c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClauseFactory.java
index fd7a25b..c0b2625 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FromClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.FROM);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FullyQualifyPathExpressionVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FullyQualifyPathExpressionVisitor.java
index 5322196..360c575 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FullyQualifyPathExpressionVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FullyQualifyPathExpressionVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,42 +48,27 @@
return visitor;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
// The "virtual" variable name will be the entity name
variableName = expression.toActualText().toLowerCase(Locale.ROOT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
// Do nothing, prevent to do anything for invalid queries
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
visitAbstractPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
expression.getRangeVariableDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
@@ -95,9 +80,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -106,17 +88,11 @@
expression.setVirtualIdentificationVariable(variableName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
// Do nothing, prevent to do anything for invalid queries
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -128,34 +104,22 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
// Nothing to do because a SELECT query has to have its path expressions fully qualified
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
// Nothing to do because a subquery query has to have its path expressions fully qualified
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
// A null check is required because the query could be invalid/incomplete
visitAbstractPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
@@ -167,9 +131,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
@@ -205,25 +166,16 @@
*/
private Expression expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
this.expression = expression;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpression.java
index fd70e4d..d82b61f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpression.java
@@ -93,17 +93,11 @@
this.parameterQueryBNFId = parameterQueryBNFId;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List<Expression> children) {
@@ -120,9 +114,6 @@
super.addOrderedEncapsulatedExpressionTo(children);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return parameterQueryBNFId;
@@ -148,9 +139,6 @@
return parameterCount;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionExpressionBNF.ID);
@@ -175,9 +163,6 @@
return hasComma;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasFunctionName() || hasComma || super.hasEncapsulatedExpression();
@@ -201,9 +186,6 @@
return hasSpaceAfterComma;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -248,9 +230,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedTextEncapsulatedExpression(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpressionBNF.java
index a8b5099..316ad66 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpressionFactory.java
index a389656..ba2323e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -78,9 +78,6 @@
this(id, ParameterCount.ZERO_OR_MANY, FunctionItemBNF.ID, identifiers);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionItemBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionItemBNF.java
index 4c6f499..6bbd166 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionItemBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionItemBNF.java
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningDatetimeBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningDatetimeBNF.java
index 7cec683..faadf40 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningDatetimeBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningDatetimeBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningNumericsBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningNumericsBNF.java
index 8263f79..487c17a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningNumericsBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningNumericsBNF.java
@@ -52,9 +52,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningStringsBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningStringsBNF.java
index 7903417..f5d11a8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningStringsBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/FunctionsReturningStringsBNF.java
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralCaseExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralCaseExpressionBNF.java
index daf86fa..d5c3342 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralCaseExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralCaseExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralIdentificationExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralIdentificationExpressionFactory.java
index b5b62a1..2386209 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralIdentificationExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralIdentificationExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,9 +48,6 @@
*/
protected abstract AbstractExpression buildExpression(AbstractExpression parent);
- /**
- * {@inheritDoc}
- */
@Override
protected final AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralIdentificationVariableBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralIdentificationVariableBNF.java
index a7502d4..707d460 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralIdentificationVariableBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GeneralIdentificationVariableBNF.java
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClause.java
index 3e111a8..1fd6654 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClause.java
@@ -56,33 +56,21 @@
super(parent, GROUP_BY);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getGroupByItems().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getGroupByItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -116,9 +104,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -151,9 +136,6 @@
return groupByItems;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(GroupByClauseBNF.ID);
@@ -178,9 +160,6 @@
return hasSpace;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -193,9 +172,6 @@
groupByItems = parse(wordParser, GroupByItemBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClauseBNF.java
index 2c682a7..1d14625 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClauseFactory.java
index ba50398..4a92bcf 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.GROUP_BY);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByItemBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByItemBNF.java
index e524aa6..2a9f96b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByItemBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByItemBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByItemFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByItemFactory.java
index 2dabc2a..3729dcb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByItemFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/GroupByItemFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,9 +40,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClause.java
index de497b8..0a8ca8b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClause.java
@@ -36,17 +36,11 @@
super(parent, HAVING);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(HavingClauseBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClauseBNF.java
index b6f772d..185f3f3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClauseFactory.java
index 6d24446..3f4ba14 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HavingClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.HAVING);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClause.java
index 5b9bced..8abe6cd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClause.java
@@ -74,17 +74,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getStartWithClause().accept(visitor);
@@ -92,9 +86,6 @@
getOrderSiblingsByClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
super.addChildrenTo(children);
@@ -103,9 +94,6 @@
children.add(getOrderSiblingsByClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -133,9 +121,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -178,9 +163,6 @@
return orderSiblingsByClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(HierarchicalQueryClauseBNF.ID);
@@ -250,9 +232,6 @@
!startWithClause.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -298,9 +277,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClauseBNF.java
index 03ce18f..bf47749 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClauseBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,9 +35,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClauseFactory.java
index 526528d..4750bb5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/HierarchicalQueryClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.START_WITH, Expression.CONNECT_BY);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariable.java
index c391462..5c2a88d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariable.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -109,33 +109,21 @@
this.virtual = virtual;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
// Nothing to traverse
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(getText()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(IdentificationVariableBNF.ID);
@@ -157,9 +145,6 @@
return stateFieldPathExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getText() {
return super.getText();
@@ -178,17 +163,11 @@
return variableName;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isVirtual() {
return virtual;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
wordParser.moveForward(getText());
@@ -212,17 +191,11 @@
rebuildParsedText();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableBNF.java
index 8ac4d4d..a2af423 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclaration.java
index c2fe3b5..bdc2557 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclaration.java
@@ -66,35 +66,23 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getRangeVariableDeclaration().accept(visitor);
getJoins().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getRangeVariableDeclaration());
children.add(getJoins());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -130,9 +118,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -159,9 +144,6 @@
return joins;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(IdentificationVariableDeclarationBNF.ID);
@@ -212,9 +194,6 @@
return hasSpace;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -235,9 +214,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -268,17 +244,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean shouldParseWithFactoryFirst() {
return parsingJoinExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclarationBNF.java
index b93bd39..830a575 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclarationBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclarationBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclarationFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclarationFactory.java
index 3581332..1b6865c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclarationFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableDeclarationFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,9 +43,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableFactory.java
index ae09ac1..2b4432c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IdentificationVariableFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpression.java
index 31f54ae..b17d915 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpression.java
@@ -119,35 +119,23 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
getInItems().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
children.add(getInItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -185,9 +173,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -276,9 +261,6 @@
return inItems;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(InExpressionBNF.ID);
@@ -346,9 +328,6 @@
return hasSpaceAfterIn;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(AND) ||
@@ -386,9 +365,6 @@
return singleInputParameter;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -437,9 +413,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionBNF.java
index 9cee481..fc62020 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionExpressionBNF.java
index 5f1751d..ae29032 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionExpressionBNF.java
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionFactory.java
index a9fb84c..fd66f3b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
Expression.NOT_IN);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionItemBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionItemBNF.java
index 0d2b28b..19b3a77 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionItemBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionItemBNF.java
@@ -45,9 +45,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IndexExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IndexExpression.java
index be3713b..41bf8d8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IndexExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IndexExpression.java
@@ -37,17 +37,11 @@
super(parent, INDEX);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningNumericsBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IndexExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IndexExpressionFactory.java
index 83a4fd3..980959a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IndexExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IndexExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.INDEX);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InputParameter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InputParameter.java
index 0151c82..d4a08d4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InputParameter.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InputParameter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,25 +49,16 @@
super(parent, parameter);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
// Does not have children
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(getText()));
@@ -97,9 +88,6 @@
return parameterName;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(InputParameterBNF.ID);
@@ -129,33 +117,21 @@
return (positional == Boolean.TRUE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
wordParser.moveForward(getText());
}
- /**
- * {@inheritDoc}
- */
@Override
public String toActualText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InputParameterBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InputParameterBNF.java
index ff67f55..a206edc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InputParameterBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InputParameterBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalAggregateFunctionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalAggregateFunctionBNF.java
index 9c486b5..b668c48 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalAggregateFunctionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalAggregateFunctionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalBetweenExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalBetweenExpressionBNF.java
index 5f38120..7d5c704 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalBetweenExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalBetweenExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalCoalesceExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalCoalesceExpressionBNF.java
index 8a07d1d..3ab1c5c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalCoalesceExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalCoalesceExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalColumnExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalColumnExpressionBNF.java
index 0f926e0..6ce96be 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalColumnExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalColumnExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalConcatExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalConcatExpressionBNF.java
index f01fbfd..76c5d04 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalConcatExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalConcatExpressionBNF.java
@@ -47,9 +47,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalConnectByClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalConnectByClauseBNF.java
index edd3c46..ae676e1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalConnectByClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalConnectByClauseBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,9 +35,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalCountBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalCountBNF.java
index fda029d..74dc35e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalCountBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalCountBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalEntityTypeExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalEntityTypeExpressionBNF.java
index 528910e..6f5caba 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalEntityTypeExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalEntityTypeExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalFromClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalFromClauseBNF.java
index bebb814..1856e14 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalFromClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalFromClauseBNF.java
@@ -48,9 +48,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalJoinBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalJoinBNF.java
index 507af04..f855ddb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalJoinBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalJoinBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLengthExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLengthExpressionBNF.java
index 7f03272..df30b58 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLengthExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLengthExpressionBNF.java
@@ -44,9 +44,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLocateStringExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLocateStringExpressionBNF.java
index 828a8e5..69942bf 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLocateStringExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLocateStringExpressionBNF.java
@@ -44,9 +44,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLocateThirdExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLocateThirdExpressionBNF.java
index 9917dc7..003141a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLocateThirdExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLocateThirdExpressionBNF.java
@@ -44,9 +44,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLowerExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLowerExpressionBNF.java
index d6aa6d0..1e51d08 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLowerExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalLowerExpressionBNF.java
@@ -44,9 +44,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalModExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalModExpressionBNF.java
index adf234a..457211e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalModExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalModExpressionBNF.java
@@ -44,9 +44,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByClauseBNF.java
index 9ccabb9..9b309a2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByClauseBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByItemBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByItemBNF.java
index f6895f6..751788f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByItemBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByItemBNF.java
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByItemFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByItemFactory.java
index ef1530f..7fb6214 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByItemFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalOrderByItemFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSelectExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSelectExpressionBNF.java
index 15b5e53..7eac14c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSelectExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSelectExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,9 +35,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSimpleFromClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSimpleFromClauseBNF.java
index e0ab253..ca6c497 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSimpleFromClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSimpleFromClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSimpleSelectExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSimpleSelectExpressionBNF.java
index 8d10175..eeb9aa4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSimpleSelectExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSimpleSelectExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,9 +35,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSqrtExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSqrtExpressionBNF.java
index 68c3907..72b91a5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSqrtExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSqrtExpressionBNF.java
@@ -44,9 +44,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSubstringPositionExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSubstringPositionExpressionBNF.java
index 2b8d97a..e1f08da 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSubstringPositionExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSubstringPositionExpressionBNF.java
@@ -47,9 +47,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSubstringStringExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSubstringStringExpressionBNF.java
index bb8cdcb..a60c9ac 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSubstringStringExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalSubstringStringExpressionBNF.java
@@ -47,9 +47,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalUpdateClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalUpdateClauseBNF.java
index 97f85f5..6499f6b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalUpdateClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalUpdateClauseBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalUpperExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalUpperExpressionBNF.java
index 8df4530..7d82afb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalUpperExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalUpperExpressionBNF.java
@@ -44,9 +44,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalWhenClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalWhenClauseBNF.java
index b04db34..afa79a7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalWhenClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InternalWhenClauseBNF.java
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IsExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IsExpressionFactory.java
index d8711f6..b489b79 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IsExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/IsExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,9 +47,6 @@
IS_NULL);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLExpression.java
index f2b3c69..bbeadc0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,7 +49,7 @@
private JPQLGrammar jpqlGrammar;
/**
- * By default, this is {@link JPQLStatementBNF.ID} but it can be any other unique identifier of
+ * By default, this is {@link JPQLStatementBNF#ID} but it can be any other unique identifier of
* a {@link JPQLQueryBNF} when a portion of a JPQL query needs to be parsed.
*/
private String queryBNFId;
@@ -130,35 +130,23 @@
this.jpqlGrammar = jpqlGrammar;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getQueryStatement().accept(visitor);
getUnknownEndingStatement().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getQueryStatement());
children.add(getUnknownEndingStatement());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -204,25 +192,16 @@
return queryPosition.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return jpqlGrammar;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return jpqlGrammar.getJPAVersion();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(queryBNFId);
@@ -276,17 +255,11 @@
!unknownEndingStatement.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isTolerant() {
return tolerant;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -342,9 +315,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar1_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar1_0.java
index b605ea5..631a486 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar1_0.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar1_0.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -285,41 +285,26 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_1_0;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
@@ -436,9 +421,6 @@
registerBNF(new WhereClauseBNF());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -506,9 +488,6 @@
registerFactory(new WhereClauseFactory());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -617,9 +596,6 @@
registerIdentifierRole("ORDER", IdentifierRole.CLAUSE); // Part of ORDERY BY
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "JPQLGrammar 1.0";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar2_0.java
index e26f05f..7c22a40 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar2_0.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar2_0.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -383,41 +383,26 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
return new JPQLGrammar1_0();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_2_0;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
@@ -459,9 +444,6 @@
addChildBNF(StringPrimaryBNF.ID, CaseExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -486,9 +468,6 @@
setFallbackExpressionFactoryId(InExpressionItemBNF.ID, EntityTypeLiteralFactory.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -519,9 +498,6 @@
registerIdentifierVersion(WHEN, JPAVersion.VERSION_2_0);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "JPQLGrammar 2.0";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar2_1.java
index ee573c6..c7c2317 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar2_1.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLGrammar2_1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -408,41 +408,26 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
return new JPQLGrammar2_0();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPAVersion getJPAVersion() {
return JPAVersion.VERSION_2_1;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultJPQLGrammar.PROVIDER_NAME;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProviderVersion() {
return ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeBNFs() {
@@ -496,9 +481,6 @@
addChildBNF(EnumExpressionBNF.ID, SubqueryBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -507,9 +489,6 @@
registerFactory(new TreatExpressionFactory());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -522,9 +501,6 @@
registerIdentifierVersion(TREAT, JPAVersion.VERSION_2_1);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "JPQLGrammar 2.1";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLQueryBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLQueryBNF.java
index 34fcba1..34f02a5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLQueryBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLQueryBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -143,7 +143,7 @@
private JPQLQueryBNF[] nonCompoundChildren;
/**
- * Only keep one instance of the {@link Filter} used when initializing {@link #childNonCompoundQueryBNFs}.
+ * Only keep one instance of the {@link Filter} used when initializing {@link #nonCompoundChildren} JPQLQueryBNF.
* This should help with performance since the filter won't be created for each <code>JPQLQueryBNF</code>.
*/
private static final Filter<JPQLQueryBNF> nonCompoundFilter = buildNonCompoundFilter();
@@ -753,9 +753,6 @@
this.handleSubExpression = handleSubExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLStatementBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLStatementBNF.java
index 4fc81c7..3ac1cbc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLStatementBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JPQLStatementBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/Join.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/Join.java
index 1a634be..3119f78 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/Join.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/Join.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -104,17 +104,11 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getJoinAssociationPath().accept(visitor);
@@ -122,9 +116,6 @@
getOnClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getJoinAssociationPath());
@@ -132,9 +123,6 @@
children.add(getOnClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -190,9 +178,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -278,9 +263,6 @@
return onClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(JoinBNF.ID);
@@ -396,9 +378,6 @@
identifier == LEFT_OUTER_JOIN_FETCH;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -418,9 +397,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -511,9 +487,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinAssociationPathExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinAssociationPathExpressionBNF.java
index 847b421..5dad365 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinAssociationPathExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinAssociationPathExpressionBNF.java
@@ -40,9 +40,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinBNF.java
index 4e65c6a..966ca9e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinCollectionValuedPathExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinCollectionValuedPathExpressionFactory.java
index 56c1e12..992756b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinCollectionValuedPathExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinCollectionValuedPathExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
@@ -52,9 +49,6 @@
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isCollection() {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinFactory.java
index e226e56..26861d2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/JoinFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,9 +47,6 @@
FETCH);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeyExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeyExpression.java
index 2a53941..b34d701 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeyExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeyExpression.java
@@ -42,9 +42,6 @@
super(parent, KEY);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeyExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeyExpressionFactory.java
index 3f244ed..9bdaa37 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeyExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeyExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,6 @@
super(ID, Expression.KEY);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent) {
return new KeyExpression(parent);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeywordExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeywordExpression.java
index d09472a..88a24a1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeywordExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeywordExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,24 +44,15 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(getText()));
@@ -77,33 +68,21 @@
return identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(BooleanLiteralBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getText() {
return super.getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
identifier = wordParser.moveForward(getText());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(actual ? identifier : getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeywordExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeywordExpressionFactory.java
index 3d9edb8..f5535c9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeywordExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/KeywordExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,9 +47,6 @@
Expression.TRUE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LengthExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LengthExpression.java
index 0fa9dd4..b012ac8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LengthExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LengthExpression.java
@@ -40,25 +40,16 @@
super(parent, LENGTH);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalLengthExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningNumericsBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LengthExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LengthExpressionFactory.java
index 0044e77..b6aa05a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LengthExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LengthExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.LENGTH);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpression.java
index 2de019b..ab9671f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpression.java
@@ -100,17 +100,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getStringExpression().accept(visitor);
@@ -118,9 +112,6 @@
getEscapeCharacter().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getStringExpression());
@@ -128,9 +119,6 @@
children.add(getEscapeCharacter());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -178,9 +166,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -261,9 +246,6 @@
return patternValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(LikeExpressionBNF.ID);
@@ -367,9 +349,6 @@
!stringExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -388,9 +367,6 @@
expression != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -455,9 +431,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionBNF.java
index 649ca7f..e61e0d8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionEscapeCharacterBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionEscapeCharacterBNF.java
index 112f9cb..89dd24e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionEscapeCharacterBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionEscapeCharacterBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionFactory.java
index 5faee55..de40f96 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LikeExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
Expression.NOT_LIKE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LiteralBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LiteralBNF.java
index 5c7d574..6d88bc9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LiteralBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LiteralBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,9 +38,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LiteralExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LiteralExpressionFactory.java
index 3afdc23..af5f6a6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LiteralExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LiteralExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,9 +46,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LocateExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LocateExpression.java
index 669c9ba..315c901 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LocateExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LocateExpression.java
@@ -46,17 +46,11 @@
super(parent, LOCATE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getParameterQueryBNFId(int index) {
switch (index) {
@@ -65,17 +59,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningNumericsBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isThirdExpressionOptional() {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LocateExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LocateExpressionFactory.java
index a0c90a4..875d422 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LocateExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LocateExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.LOCATE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LogicalExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LogicalExpression.java
index 748d596..37e0547 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LogicalExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LogicalExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,17 +37,11 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ConditionalExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.character() == RIGHT_PARENTHESIS ||
@@ -55,9 +49,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected String parseIdentifier(WordParser wordParser) {
return getText();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LowerExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LowerExpression.java
index 632a4ff..04d6a04 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LowerExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LowerExpression.java
@@ -40,25 +40,16 @@
super(parent, LOWER);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalLowerExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningStringsBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LowerExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LowerExpressionFactory.java
index c0dbe52..cc39edf 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LowerExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/LowerExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.LOWER);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MaxFunction.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MaxFunction.java
index cefdfd8..d67cfb1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MaxFunction.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MaxFunction.java
@@ -37,9 +37,6 @@
super(parent, MAX);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MaxFunctionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MaxFunctionFactory.java
index df7d7b9..185ce0b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MaxFunctionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MaxFunctionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.MAX);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MinFunction.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MinFunction.java
index 364e622..e134fb5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MinFunction.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MinFunction.java
@@ -37,9 +37,6 @@
super(parent, MIN);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MinFunctionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MinFunctionFactory.java
index 0f437d6..df2b47f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MinFunctionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MinFunctionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.MIN);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ModExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ModExpression.java
index abe0e4c..fb50ba7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ModExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ModExpression.java
@@ -42,25 +42,16 @@
super(parent, MOD);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningNumericsBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String parameterExpressionBNF(int index) {
return InternalModExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ModExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ModExpressionFactory.java
index 75552c5..1e17a72 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ModExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ModExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,9 +40,6 @@
super(ID, Expression.MOD);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MultiplicationExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MultiplicationExpression.java
index 125497b..7998f21 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MultiplicationExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/MultiplicationExpression.java
@@ -38,17 +38,11 @@
super(parent, MULTIPLICATION);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NewValueBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NewValueBNF.java
index 2425784..45c890e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NewValueBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NewValueBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NotExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NotExpression.java
index eafa85b..b271c95 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NotExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NotExpression.java
@@ -52,33 +52,21 @@
super(parent, NOT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -93,9 +81,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -128,9 +113,6 @@
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ConditionalPrimaryBNF.ID);
@@ -157,9 +139,6 @@
return hasSpaceAfterNot;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.startsWithIdentifier(AND) ||
@@ -167,9 +146,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
identifier = wordParser.moveForward(NOT);
@@ -177,9 +153,6 @@
expression = parse(wordParser, ConditionalPrimaryBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NotExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NotExpressionFactory.java
index a82f705..1f610aa 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NotExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NotExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(ID, Expression.NOT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullComparisonExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullComparisonExpression.java
index d04c42a..8cd6154 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullComparisonExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullComparisonExpression.java
@@ -70,33 +70,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -110,9 +98,6 @@
children.add(buildStringExpression(getIdentifier()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -175,9 +160,6 @@
return (notIdentifier != null) ? IS_NOT_NULL : IS_NULL;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(NullComparisonExpressionBNF.ID);
@@ -203,9 +185,6 @@
return notIdentifier != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -228,9 +207,6 @@
nullIdentifier = wordParser.moveForward(NULL);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullComparisonExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullComparisonExpressionBNF.java
index 970e895..68c0848 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullComparisonExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullComparisonExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullExpression.java
index fd8c3b0..c1132fb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,56 +37,35 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getParent().findQueryBNF(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getParent().getQueryBNF();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isNull() {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
throw new IllegalAccessError("This method shouln't be invoked, WordParser has " + wordParser);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpression.java
index 2946fc1..4a55366 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpression.java
@@ -41,25 +41,16 @@
super(parent, NULLIF);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(NullIfExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String parameterExpressionBNF(int index) {
return ScalarExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpressionBNF.java
index 36011ac..9b15488 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpressionFactory.java
index de45683..20bbe70 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NullIfExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.NULLIF);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NumericLiteral.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NumericLiteral.java
index f961ee5..5098eb6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NumericLiteral.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NumericLiteral.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,48 +53,30 @@
super(parent, numeric);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(getText()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(NumericLiteralBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getText() {
return super.getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -108,25 +90,16 @@
wordParser.moveForward(numeric);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toActualText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NumericLiteralBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NumericLiteralBNF.java
index c83a685..23b302b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NumericLiteralBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/NumericLiteralBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpression.java
index e63d474..668bc91 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpression.java
@@ -37,17 +37,11 @@
super(parent, OBJECT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ObjectExpressionBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpressionBNF.java
index 216f73c..1792f4d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpressionFactory.java
index 7eb5eeb..c627c4a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ObjectExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.OBJECT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClause.java
index 002d615..e9726dd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClause.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,25 +41,16 @@
super(parent, ON);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(OnClauseBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(LEFT) ||
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClauseBNF.java
index 506664b..3370097 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClauseFactory.java
index b7e0c68..1c298dd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OnClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.ON);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrExpression.java
index b2814d9..608ecf2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrExpression.java
@@ -51,25 +51,16 @@
super(parent, OR);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getLeftExpressionQueryBNFId() {
return ConditionalExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getRightExpressionQueryBNFId() {
return ConditionalTermBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrExpressionFactory.java
index 2a07a23..0de7a1c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.OR);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClause.java
index 2fda390..332dd6b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClause.java
@@ -35,17 +35,11 @@
super(parent, ORDER_BY);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(OrderByClauseBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClauseBNF.java
index 24c7b43..cce2be1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClauseFactory.java
index ec92878..9f594f2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.ORDER_BY);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItem.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItem.java
index 7d07d3e..4a225c2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItem.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItem.java
@@ -125,33 +125,21 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -192,9 +180,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -281,9 +266,6 @@
return ordering;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(OrderByItemBNF.ID);
@@ -397,9 +379,6 @@
return nullOrdering == NullOrdering.NULLS_LAST;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(ASC) ||
@@ -408,9 +387,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -476,9 +452,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
@@ -562,9 +535,6 @@
return identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return identifier;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItemBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItemBNF.java
index ecb2324..3ff78be 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItemBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItemBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItemFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItemFactory.java
index d6535a7..f2dfc06 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItemFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderByItemFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClause.java
index 3afdc37..e6c9b36 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClause.java
@@ -38,17 +38,11 @@
super(parent, ORDER_SIBLINGS_BY);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(OrderSiblingsByClauseBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClauseBNF.java
index 2b19077..dcf5a99 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClauseFactory.java
index cd8d664..da32653 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/OrderSiblingsByClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.ORDER_SIBLINGS_BY);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/PatternValueBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/PatternValueBNF.java
index 5cba7f2..a885525 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/PatternValueBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/PatternValueBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/QualifiedIdentificationVariableBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/QualifiedIdentificationVariableBNF.java
index 286c58f..e51e1e5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/QualifiedIdentificationVariableBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/QualifiedIdentificationVariableBNF.java
@@ -40,9 +40,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/QueryPosition.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/QueryPosition.java
index 9246f66..5fe81a2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/QueryPosition.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/QueryPosition.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -104,9 +104,6 @@
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return positions.toString();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeDeclarationBNF.java
index b31d12a..cff3145 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeDeclarationBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeDeclarationBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,9 +35,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeDeclarationFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeDeclarationFactory.java
index 1447255..bd83fff 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeDeclarationFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeDeclarationFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclaration.java
index a9fbc2c..7778f0f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -92,35 +92,23 @@
identificationVariable = new IdentificationVariable(this, variableName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getRootObject().accept(visitor);
getIdentificationVariable().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getRootObject());
children.add(getIdentificationVariable());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -149,9 +137,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -189,9 +174,6 @@
return identificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(RangeVariableDeclarationBNF.ID);
@@ -269,9 +251,6 @@
return virtualIdentificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(AS) ||
@@ -282,9 +261,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -348,17 +324,11 @@
rootObject = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean shouldParseWithFactoryFirst() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclarationBNF.java
index fb5ecff..832e270 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclarationBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclarationBNF.java
@@ -44,9 +44,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclarationFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclarationFactory.java
index 918e3fb..4bde7a5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclarationFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RangeVariableDeclarationFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpression.java
index e5550ea..b24cc73 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,35 +70,23 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getStringExpression().accept(visitor);
getPatternValue().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getStringExpression());
children.add(getPatternValue());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -121,9 +109,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -160,9 +145,6 @@
return patternValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(RegexpExpressionBNF.ID);
@@ -220,9 +202,6 @@
!stringExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -240,9 +219,6 @@
expression != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -255,9 +231,6 @@
patternValue = parse(wordParser, PatternValueBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpressionBNF.java
index 57b9114..95819bf 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpressionFactory.java
index fecd9ec..f0335dc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/RegexpExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.REGEXP);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariable.java
index 05d3e7e..a0fa1e8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariable.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariable.java
@@ -67,35 +67,23 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getSelectExpression().accept(visitor);
getResultVariable().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getSelectExpression());
children.add(getResultVariable());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -120,9 +108,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -147,9 +132,6 @@
return (asIdentifier != null) ? asIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ResultVariableBNF.ID);
@@ -218,9 +200,6 @@
return hasSpaceAfterAs;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -240,9 +219,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariableBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariableBNF.java
index 54556d1..8da8a8a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariableBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariableBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariableFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariableFactory.java
index 64011a5..655b837 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariableFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariableFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,9 +48,6 @@
super(ID, Expression.AS);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
@@ -113,25 +110,16 @@
*/
boolean supported;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
this.supported = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
this.supported = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
this.supported = true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ScalarExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ScalarExpressionBNF.java
index 640266a..dc03d01 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ScalarExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ScalarExpressionBNF.java
@@ -53,9 +53,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClause.java
index 8e296a3..11ead99 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClause.java
@@ -37,25 +37,16 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(SelectClauseBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getSelectItemQueryBNFId() {
return InternalSelectExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClauseBNF.java
index 25f4ef2..dee0518 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClauseFactory.java
index a3ced4e..125ab33 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.SELECT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectExpressionBNF.java
index 7738515..5402d60 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectExpressionBNF.java
@@ -53,9 +53,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatement.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatement.java
index 447ca28..58c9857 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatement.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatement.java
@@ -96,17 +96,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
super.acceptChildren(visitor);
@@ -114,9 +108,6 @@
getUnionClauses().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
super.addChildrenTo(children);
@@ -124,9 +115,6 @@
children.add(getUnionClauses());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -147,25 +135,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected FromClause buildFromClause() {
return new FromClause(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected SelectClause buildSelectClause() {
return new SelectClause(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -192,9 +171,6 @@
return orderByClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(SelectStatementBNF.ID);
@@ -254,9 +230,6 @@
!unionClauses.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -270,9 +243,6 @@
return super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -293,9 +263,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatementBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatementBNF.java
index 12750d6..ba1370a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatementBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatementBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatementFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatementFactory.java
index ee550d1..804bc8e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatementFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatementFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(ID, Expression.SELECT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleArithmeticExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleArithmeticExpressionBNF.java
index 08eb31a..05f7208 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleArithmeticExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleArithmeticExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleCaseExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleCaseExpressionBNF.java
index 053e067..eeecc0d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleCaseExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleCaseExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleConditionalExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleConditionalExpressionBNF.java
index 773be5a..6a6512c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleConditionalExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleConditionalExpressionBNF.java
@@ -47,9 +47,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleEntityExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleEntityExpressionBNF.java
index a597772..5633f2a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleEntityExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleEntityExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleEntityOrValueExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleEntityOrValueExpressionBNF.java
index d4bfea7..bd971c0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleEntityOrValueExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleEntityOrValueExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleFromClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleFromClause.java
index fb3dcdc..f91d547 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleFromClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleFromClause.java
@@ -39,25 +39,16 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getDeclarationQueryBNFId() {
return InternalSimpleFromClauseBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(SubqueryFromClauseBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleResultVariableBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleResultVariableBNF.java
index ac8ad1b..a14e4a3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleResultVariableBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleResultVariableBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,9 +36,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectClause.java
index 0d6f1d5..b90becb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectClause.java
@@ -38,25 +38,16 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(SimpleSelectClauseBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getSelectItemQueryBNFId() {
return InternalSimpleSelectExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectClauseBNF.java
index 22e0058..d575004 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectExpressionBNF.java
index f0893e1..8fc4ff7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectExpressionBNF.java
@@ -43,9 +43,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectStatement.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectStatement.java
index c859aac..9e81f6b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectStatement.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectStatement.java
@@ -33,41 +33,26 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected SimpleFromClause buildFromClause() {
return new SimpleFromClause(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected SimpleSelectClause buildSelectClause() {
return new SimpleSelectClause(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(SubqueryBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean shouldManageSpaceAfterClause() {
return false;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectStatementFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectStatementFactory.java
index cd0a3fd..79aa265 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectStatementFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SimpleSelectStatementFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(ID, Expression.SELECT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SingleValuedObjectPathExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SingleValuedObjectPathExpressionBNF.java
index d679229..0a104c4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SingleValuedObjectPathExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SingleValuedObjectPathExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SingleValuedPathExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SingleValuedPathExpressionBNF.java
index ead4804..e589615 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SingleValuedPathExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SingleValuedPathExpressionBNF.java
@@ -46,9 +46,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SizeExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SizeExpression.java
index eb459af..5a1b1e1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SizeExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SizeExpression.java
@@ -38,33 +38,21 @@
super(parent, SIZE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return CollectionValuedPathExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningNumericsBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression parse(WordParser wordParser, String queryBNFId, boolean tolerant) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SizeExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SizeExpressionFactory.java
index 61e69b6..d995866 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SizeExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SizeExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.SIZE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SqrtExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SqrtExpression.java
index 1bbfd05..b7f5f31 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SqrtExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SqrtExpression.java
@@ -40,25 +40,16 @@
super(parent, SQRT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalSqrtExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningNumericsBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SqrtExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SqrtExpressionFactory.java
index 6d317ac..4248914 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SqrtExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SqrtExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.SQRT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClause.java
index 6bffef0..902c0fc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClause.java
@@ -39,17 +39,11 @@
super(parent, Expression.START_WITH);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(StartWithClauseBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClauseBNF.java
index 7f1db8c..e054f73 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClauseBNF.java
@@ -38,9 +38,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClauseFactory.java
index 43f3281..d378641 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StartWithClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.START_WITH);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpression.java
index bec8616..ec5eb59 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpression.java
@@ -72,17 +72,11 @@
super(parent, expression, paths);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(StateFieldPathExpressionBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpressionBNF.java
index 2685fe4..3f00b86 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpressionFactory.java
index db9a03d..7c51daa 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StateFieldPathExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringExpressionBNF.java
index b0c9d8a..49f5408 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteral.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteral.java
index 26fe596..8a0225e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteral.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteral.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,40 +51,25 @@
super(parent, literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(getText()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(StringLiteralBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getText() {
return super.getText();
@@ -114,33 +99,21 @@
return hasCloseQuote;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
wordParser.moveForward(getText());
}
- /**
- * {@inheritDoc}
- */
@Override
public String toActualText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteralBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteralBNF.java
index de1f817..89cb6a5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteralBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteralBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteralFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteralFactory.java
index d3fec6f..4abf450 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteralFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringLiteralFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.QUOTE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringPrimaryBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringPrimaryBNF.java
index d808c3e..0dc675a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringPrimaryBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/StringPrimaryBNF.java
@@ -64,9 +64,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubExpression.java
index 9b5c314..ba614d0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubExpression.java
@@ -44,33 +44,21 @@
this.queryBNF = queryBNF;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean areLogicalIdentifiersSupported() {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return queryBNF.getId();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -81,17 +69,11 @@
return getParent().findQueryBNF(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return queryBNF;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean handleCollection(JPQLQueryBNF queryBNF) {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubSelectIdentificationVariableDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubSelectIdentificationVariableDeclarationBNF.java
index 6611e42..3bc58a8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubSelectIdentificationVariableDeclarationBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubSelectIdentificationVariableDeclarationBNF.java
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubqueryBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubqueryBNF.java
index c3e67c7..e58b1d5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubqueryBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubqueryBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubqueryFromClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubqueryFromClauseBNF.java
index 7bb4f82..7bea8a1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubqueryFromClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubqueryFromClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubstringExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubstringExpression.java
index 8dfcb12..226c5ea 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubstringExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubstringExpression.java
@@ -46,17 +46,11 @@
super(parent, SUBSTRING);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getParameterQueryBNFId(int index) {
switch (index) {
@@ -65,17 +59,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningStringsBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isThirdExpressionOptional() {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubstringExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubstringExpressionFactory.java
index 6ca8016..fe789cb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubstringExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubstringExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.SUBSTRING);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubtractionExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubtractionExpression.java
index 5cc5110..1fed11a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubtractionExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SubtractionExpression.java
@@ -36,9 +36,6 @@
super(parent, MINUS);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SumFunction.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SumFunction.java
index 24676d5..3ddf8a5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SumFunction.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SumFunction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,9 +44,6 @@
super(parent, SUM);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SumFunctionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SumFunctionFactory.java
index 2b29ba3..78266b6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SumFunctionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SumFunctionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.SUM);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpression.java
index c5004e4..d64c299 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,25 +36,16 @@
super(parent, TABLE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return StringLiteralBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(TableExpressionBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpressionBNF.java
index be25a7b..291ae52 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpressionFactory.java
index 5e21a03..e7a1443 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.TABLE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclaration.java
index 574f66d..14c5f03 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,35 +66,23 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getTableExpression().accept(visitor);
getIdentificationVariable().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getTableExpression());
children.add(getIdentificationVariable());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -121,9 +109,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -160,9 +145,6 @@
return identificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(TableVariableDeclarationBNF.ID);
@@ -216,18 +198,12 @@
return hasSpaceAfterTableExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(AS) ||
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -253,9 +229,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclarationBNF.java
index 11cbf0a..425d354 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclarationBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclarationBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclarationFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclarationFactory.java
index 7a0187c..ca53908 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclarationFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclarationFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.TABLE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpression.java
index d0ee89e..aeedae8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -75,35 +75,23 @@
super(parent, TREAT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getCollectionValuedPathExpression().accept(visitor);
getEntityType().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getCollectionValuedPathExpression());
children.add(getEntityType());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List<Expression> children) {
@@ -131,9 +119,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -184,9 +169,6 @@
return entityType;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(TreatExpressionBNF.ID);
@@ -212,9 +194,6 @@
!collectionValuedPathExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasCollectionValuedPathExpression() || hasAs() || hasEntityType();
@@ -251,9 +230,6 @@
return hasSpaceAfterCollectionValuedPathExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -272,9 +248,6 @@
return super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -314,9 +287,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
entityType = null;
@@ -326,9 +296,6 @@
hasSpaceAfterCollectionValuedPathExpression = false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedTextEncapsulatedExpression(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpressionBNF.java
index 7644fab..2612184 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpressionFactory.java
index b95be76..8aff485 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TreatExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.TREAT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TrimExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TrimExpression.java
index 08a6612..f41d5d5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TrimExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TrimExpression.java
@@ -93,26 +93,17 @@
super(parent, TRIM);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getTrimCharacter().accept(visitor);
super.acceptChildren(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List<Expression> children) {
@@ -147,9 +138,6 @@
super.addOrderedEncapsulatedExpressionTo(children);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return StringPrimaryBNF.ID;
@@ -177,9 +165,6 @@
return (specificationIdentifier != null) ? specificationIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningStringsBNF.ID);
@@ -207,9 +192,6 @@
return trimCharacter;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasSpecification() || hasTrimCharacter() || hasFrom || hasExpression();
@@ -274,9 +256,6 @@
!trimCharacter.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -344,9 +323,6 @@
return Specification.DEFAULT;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedTextEncapsulatedExpression(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TrimExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TrimExpressionFactory.java
index ed56ee8..9c1d25a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TrimExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TrimExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.TRIM);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpression.java
index 5a9da14..c2779a5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpression.java
@@ -42,33 +42,21 @@
super(parent, TYPE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalEntityTypeExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(TypeExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression parse(WordParser wordParser, String queryBNFId, boolean tolerant) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpressionBNF.java
index 181b982..4a0ffc8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpressionBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpressionFactory.java
index 3fa7440..8516062 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TypeExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.TYPE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClause.java
index 6b4db6a..771a823 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClause.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,33 +66,21 @@
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getQuery().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getQuery());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -118,9 +106,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -172,9 +157,6 @@
return query;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(UnionClauseBNF.ID);
@@ -236,9 +218,6 @@
return getText() == INTERSECT;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(UNION) ||
@@ -256,9 +235,6 @@
return getText() == UNION;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -300,9 +276,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClauseBNF.java
index d0dc74f..5787da6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClauseBNF.java
@@ -40,9 +40,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClauseFactory.java
index 70b2fb2..a1a0da3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnionClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
Expression.EXCEPT);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnknownExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnknownExpression.java
index a2ae4cb..45e784a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnknownExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnknownExpression.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,81 +38,51 @@
super(parent, text);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
// No children to visit
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
children.add(buildStringExpression(getText()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getParent().findQueryBNF(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getParent().getQueryBNF();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getText() {
return super.getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isUnknown() {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
wordParser.moveForward(getText());
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
return getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
writer.append(getText());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnknownExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnknownExpressionFactory.java
index 03656fd..ff691df 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnknownExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UnknownExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClause.java
index 06780a5..7265c16 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClause.java
@@ -83,35 +83,23 @@
super(parent, UPDATE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getRangeVariableDeclaration().accept(visitor);
getUpdateItems().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getRangeVariableDeclaration());
children.add(getUpdateItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -165,9 +153,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -202,9 +187,6 @@
return updateIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(UpdateClauseBNF.ID);
@@ -293,18 +275,12 @@
!updateItems.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(SET) ||
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -338,9 +314,6 @@
updateItems = parse(wordParser, InternalUpdateClauseBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClauseBNF.java
index e462878..181a1d4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClauseFactory.java
index a63afba..af720bb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.UPDATE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItem.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItem.java
index 4beb808..afbc7e7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItem.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItem.java
@@ -67,35 +67,23 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getStateFieldPathExpression().accept(visitor);
getNewValue().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getStateFieldPathExpression());
children.add(getNewValue());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -123,9 +111,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -152,9 +137,6 @@
return newValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(UpdateItemBNF.ID);
@@ -221,18 +203,12 @@
!stateFieldExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equals(EQUAL) ||
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -266,9 +242,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemBNF.java
index b4bff82..9eb783c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemFactory.java
index dafc99c..d1664ab 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemStateFieldPathExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemStateFieldPathExpressionBNF.java
index 6377ee4..be720b3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemStateFieldPathExpressionBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemStateFieldPathExpressionBNF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemStateFieldPathExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemStateFieldPathExpressionFactory.java
index f6cade5..8813286 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemStateFieldPathExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemStateFieldPathExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,9 +45,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatement.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatement.java
index 2caa5f1..c4f3096 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatement.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatement.java
@@ -60,35 +60,23 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getUpdateClause().accept(visitor);
getWhereClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getUpdateClause());
children.add(getWhereClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -105,9 +93,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -122,9 +107,6 @@
return super.findQueryBNF(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(UpdateStatementBNF.ID);
@@ -172,9 +154,6 @@
!whereClause.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -194,9 +173,6 @@
accept(new FullyQualifyPathExpressionVisitor());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatementBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatementBNF.java
index b1e1583..cfd48e1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatementBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatementBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatementFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatementFactory.java
index 2b921fa..fbe6468 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatementFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateStatementFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(ID, Expression.UPDATE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpperExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpperExpression.java
index f3c3a05..f4605d6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpperExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpperExpression.java
@@ -40,25 +40,16 @@
super(parent, UPPER);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalUpperExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningStringsBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpperExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpperExpressionFactory.java
index 7dbf719..7d9b42e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpperExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpperExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.UPPER);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ValueExpression.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ValueExpression.java
index 74f915f..faa7e7e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ValueExpression.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ValueExpression.java
@@ -42,9 +42,6 @@
super(parent, VALUE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ValueExpressionFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ValueExpressionFactory.java
index 04d167e..1723381 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ValueExpressionFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ValueExpressionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,6 @@
super(ID, Expression.VALUE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent) {
return new ValueExpression(parent);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClause.java
index d6fe26f..3fbc8c5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClause.java
@@ -79,35 +79,23 @@
super(parent, WHEN);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getWhenExpression().accept(visitor);
getThenExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection<Expression> children) {
children.add(getWhenExpression());
children.add(getThenExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List<Expression> children) {
@@ -162,9 +150,6 @@
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -199,9 +184,6 @@
return whenIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(WhenClauseBNF.ID);
@@ -290,9 +272,6 @@
!whenExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(WHEN) ||
@@ -302,9 +281,6 @@
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -326,9 +302,6 @@
thenExpression = parse(wordParser, ScalarExpressionBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClauseBNF.java
index aa944d7..6df07fc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClauseFactory.java
index 698116a..6433ba0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhenClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.WHEN);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClause.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClause.java
index 369d428..c6b5c1a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClause.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClause.java
@@ -39,9 +39,6 @@
super(parent, WHERE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -54,17 +51,11 @@
return super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(WhereClauseBNF.ID);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClauseBNF.java
index 4b3a261..3ff4e72 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClauseBNF.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClauseBNF.java
@@ -39,9 +39,6 @@
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClauseFactory.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClauseFactory.java
index b4f3d03..6469498 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClauseFactory.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/WhereClauseFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,9 +41,6 @@
super(ID, Expression.WHERE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/AbstractContentAssistVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/AbstractContentAssistVisitor.java
index 65a3a0f..ace4ac1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/AbstractContentAssistVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/AbstractContentAssistVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -2395,26 +2395,17 @@
virtualSpaces.pop();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return proposals.toString();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
@@ -2427,36 +2418,24 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
super.visit(expression);
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.NONE, ALL, ANY, SOME);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
super.visit(expression);
visitLogicalExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
super.visit(expression);
@@ -2477,27 +2456,18 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
super.visit(expression);
visitAggregateFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
super.visit(expression);
visitInvalidExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
super.visit(expression);
@@ -2579,9 +2549,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
super.visit(expression);
@@ -2655,9 +2622,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
super.visit(expression);
@@ -2685,9 +2649,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
if (!isLocked(expression)) {
@@ -2695,9 +2656,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
super.visit(expression);
@@ -2757,9 +2715,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
super.visit(expression);
@@ -2794,9 +2749,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
super.visit(expression);
@@ -2811,9 +2763,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
super.visit(expression);
@@ -2844,18 +2793,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
super.visit(expression);
visitCollectionExpression(expression, CONCAT, getConcatExpressionCollectionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
super.visit(expression);
@@ -2891,18 +2834,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
super.visit(expression);
visitAggregateFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
super.visit(expression);
@@ -2921,9 +2858,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
if (!isLocked(expression)) {
@@ -2932,9 +2866,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
if (!isLocked(expression)) {
@@ -2943,18 +2874,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
super.visit(expression);
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
super.visit(expression);
@@ -2972,9 +2897,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
@@ -2987,35 +2909,23 @@
addEntities();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.COLLECTION);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.NONE, EXISTS, NOT_EXISTS);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
if (!isLocked(expression)) {
@@ -3024,18 +2934,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
if (!isLocked(expression)) {
@@ -3044,9 +2948,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
if (!isLocked(expression)) {
@@ -3055,9 +2956,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -3070,9 +2968,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
super.visit(expression);
@@ -3094,18 +2989,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
expression.accept(getVisitParentVisitor());
@@ -3140,18 +3029,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
// No content assist can be provider for an input parameter
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
super.visit(expression);
@@ -3261,9 +3144,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
@@ -3277,18 +3157,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.LEFT_COLLECTION);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
super.visit(expression);
@@ -3310,18 +3184,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
super.visit(expression);
@@ -3354,63 +3222,42 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
super.visit(expression);
visitCollectionExpression(expression, LOCATE, getTripleEncapsulatedCollectionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
super.visit(expression);
visitAggregateFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
super.visit(expression);
visitAggregateFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
super.visit(expression);
visitCollectionExpression(expression, MOD, getDoubleEncapsulatedCollectionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
super.visit(expression);
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
super.visit(expression);
@@ -3422,9 +3269,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
super.visit(expression);
@@ -3442,45 +3286,30 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// No content assist can be provider
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
super.visit(expression);
visitCollectionExpression(expression, NULLIF, getDoubleEncapsulatedCollectionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
// No content assist can be provider for a numerical value
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
if (!isLocked(expression)) {
@@ -3489,9 +3318,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
if (!isLocked(expression)) {
@@ -3500,9 +3326,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
super.visit(expression);
@@ -3547,18 +3370,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
super.visit(expression);
visitLogicalExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
super.visit(expression);
@@ -3584,9 +3401,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
super.visit(expression);
@@ -3623,9 +3437,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
if (!isLocked(expression)) {
@@ -3634,9 +3445,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
if (!isLocked(expression)) {
@@ -3645,9 +3453,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
if (!isLocked(expression)) {
@@ -3656,9 +3461,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
if (!isLocked(expression)) {
@@ -3667,9 +3469,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
if (!isLocked(expression)) {
@@ -3679,27 +3478,18 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
expression.accept(getVisitParentVisitor());
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
super.visit(expression);
@@ -3708,18 +3498,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
// No content assist required
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
super.visit(expression);
@@ -3730,36 +3514,24 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
super.visit(expression);
visitCollectionExpression(expression, SUBSTRING, getTripleEncapsulatedCollectionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
super.visit(expression);
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
super.visit(expression);
visitAggregateFunction(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
super.visit(expression);
@@ -3832,9 +3604,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
super.visit(expression);
@@ -3943,27 +3712,18 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
super.visit(expression);
visitInvalidExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
super.visit(expression);
@@ -4047,9 +3807,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
super.visit(expression);
@@ -4092,9 +3849,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
if (!isLocked(expression)) {
@@ -4103,27 +3857,18 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.ALL);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
super.visit(expression);
visitSingleEncapsulatedExpression(expression, IdentificationVariableType.LEFT_COLLECTION);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
super.visit(expression);
@@ -4187,9 +3932,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
if (!isLocked(expression)) {
@@ -4950,9 +4692,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(Expression expression,
CollectionExpression collectionExpression,
@@ -5010,17 +4749,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(Expression expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(Expression expression,
CollectionExpression collectionExpression,
@@ -5043,9 +4776,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(Expression expression,
CollectionExpression collectionExpression,
@@ -5135,9 +4865,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(Expression expression) {
// The actual number is 0 but an incomplete fragment like "WHERE e.phoneNumbers IS N"
@@ -5145,17 +4872,11 @@
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(Expression expression) {
return 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(Expression expression, int index) {
return visitor.getQueryBNF(ConditionalExpressionBNF.ID);
@@ -5170,57 +4891,36 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addIdentifier(FROM);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(T expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(T expression) {
return expression.getFromClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(T expression) {
return expression.hasFromClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(T expression) {
return expression.hasSpaceAfterFrom();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(T expression) {
return visitor.isComplete(expression.getFromClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return true;
@@ -5235,57 +4935,36 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addCompositeIdentifier(GROUP_BY, -1);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(T expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(T expression) {
return expression.getGroupByClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(T expression) {
return expression.hasGroupByClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(T expression) {
return expression.hasSpaceAfterGroupBy();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(T expression) {
return visitor.isComplete(expression.getGroupByClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return false;
@@ -5300,49 +4979,31 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addIdentifier(HAVING);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(T expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(T expression) {
return expression.getHavingClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(T expression) {
return expression.hasHavingClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(T expression) {
return visitor.isComplete(expression.getHavingClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return false;
@@ -5357,9 +5018,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(T expression,
CollectionExpression collectionExpression,
@@ -5380,17 +5038,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(T expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(T expression,
CollectionExpression collectionExpression,
@@ -5403,9 +5055,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(T expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getSelectExpression());
@@ -5415,41 +5064,26 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(T expression, CollectionExpression collectionExpression, int index) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(T expression) {
return expression.hasSpaceAfterSelect();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(T expression) {
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(T expression) {
return 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(T expression, int index) {
return visitor.getQueryBNF(expression.getSelectItemQueryBNFId());
@@ -5464,57 +5098,36 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addIdentifier(SELECT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(AbstractSelectStatement expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(AbstractSelectStatement expression) {
return expression.getSelectClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(AbstractSelectStatement expression) {
return expression.hasSelectClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(AbstractSelectStatement expression) {
return expression.hasSpaceAfterSelect();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(AbstractSelectStatement expression) {
return visitor.isComplete(expression.getSelectClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return true;
@@ -5530,57 +5143,36 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addIdentifier(WHERE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(T expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(T expression) {
return expression.getWhereClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(T expression) {
return expression.hasWhereClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(T expression) {
return expression.hasSpaceAfterWhere();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(T expression) {
return visitor.isComplete(expression.getWhereClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return false;
@@ -5606,17 +5198,11 @@
type = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getParent().accept(this);
@@ -5694,26 +5280,17 @@
this.positionInCollection = -1;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
appendable = !conditionalExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
if (expression.hasRightExpression()) {
@@ -5721,18 +5298,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
if (expression.hasRightExpression()) {
@@ -5740,9 +5311,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
if (expression.hasExpression()) {
@@ -5750,26 +5318,17 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
appendable = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
@@ -5797,27 +5356,18 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
appendable = !conditionalExpression &&
expression.hasEnd();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -5839,9 +5389,6 @@
collectionExpression = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -5862,9 +5409,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
@@ -5881,18 +5425,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
appendable = !conditionalExpression &&
!expression.endsWithDot();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
@@ -5918,36 +5456,24 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -5966,9 +5492,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
if (expression.hasRangeVariableDeclaration()) {
@@ -5976,9 +5499,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
@@ -5990,9 +5510,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
if (expression.hasRightExpression()) {
@@ -6000,9 +5517,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
@@ -6012,26 +5526,17 @@
appendableType == AppendableType.LOGICAL;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
appendable = !conditionalExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
@@ -6042,9 +5547,6 @@
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
@@ -6053,9 +5555,6 @@
appendable = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
@@ -6072,18 +5571,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
@@ -6094,9 +5587,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
if (expression.hasConditionalExpression()) {
@@ -6106,9 +5596,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -6162,9 +5649,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
@@ -6185,18 +5669,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -6207,17 +5685,11 @@
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
appendable = !conditionalExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -6237,18 +5709,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
// Nothing can be added right after NULL, TRUE, FALSE
@@ -6257,18 +5723,12 @@
appendableType == AppendableType.COMPLETE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
@@ -6293,54 +5753,36 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
if (expression.hasRightExpression()) {
@@ -6348,9 +5790,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
@@ -6374,9 +5813,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -6386,35 +5822,23 @@
appendableType == AppendableType.LOGICAL;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
appendable = !conditionalExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
if (expression.hasConditionalExpression()) {
@@ -6424,9 +5848,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
if (expression.hasOrderByItems()) {
@@ -6436,9 +5857,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
appendable = expression.hasSpaceAfterExpression() &&
@@ -6447,9 +5865,6 @@
!expression.isNullsFirst() && !expression.isNullsLast();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
if (expression.hasRightExpression()) {
@@ -6457,9 +5872,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -6484,9 +5896,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
// The result variable is parsed without AS
@@ -6495,9 +5904,6 @@
expression.hasResultVariable();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
if (expression.hasSelectExpression()) {
@@ -6507,9 +5913,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -6536,9 +5939,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
@@ -6555,9 +5955,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
@@ -6568,9 +5965,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -6597,27 +5991,18 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
@@ -6670,18 +6055,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
appendable = !conditionalExpression &&
expression.hasCloseQuote();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
@@ -6707,18 +6086,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
if (expression.hasRightExpression()) {
@@ -6726,45 +6099,30 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
if (expression.hasUpdateItems()) {
@@ -6772,17 +6130,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
expression.getNewValue().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
if (expression.hasWhereClause()) {
@@ -6793,27 +6145,18 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
if (expression.hasWhenExpression()) {
@@ -6823,9 +6166,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
if (expression.hasConditionalExpression()) {
@@ -7011,9 +6351,6 @@
expression = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
this.expression = expression;
@@ -7023,9 +6360,6 @@
// Made static final for performance reasons.
protected static final class CollectionMappingFilter implements Filter<IMapping> {
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(IMapping value) {
// Both association and collection field are accepted
@@ -7043,9 +6377,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(ConcatExpression expression,
CollectionExpression collectionExpression,
@@ -7079,9 +6410,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(ConcatExpression expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
@@ -7089,9 +6417,6 @@
visitor.addFunctionIdentifiers(expression.getParent().findQueryBNF(expression));
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(ConcatExpression expression,
CollectionExpression collectionExpression,
@@ -7102,9 +6427,6 @@
visitor.addFunctionIdentifiers(queryBNF(expression, index));
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(ConcatExpression expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getExpression());
@@ -7114,9 +6436,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(ConcatExpression expression,
CollectionExpression collectionExpression,
@@ -7125,34 +6444,22 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(ConcatExpression expression) {
return expression.hasSpaceAfterIdentifier() ||
expression.hasLeftParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(ConcatExpression expression) {
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(ConcatExpression expression) {
return 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(ConcatExpression expression, int index) {
return visitor.getQueryBNF(expression.getEncapsulatedExpressionQueryBNFId());
@@ -7170,9 +6477,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(AbstractConditionalClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getConditionalExpression());
@@ -7182,9 +6486,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(AbstractConditionalClause expression) {
return expression.hasSpaceAfterIdentifier();
@@ -7199,9 +6500,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(ConstructorExpression expression,
CollectionExpression collectionExpression,
@@ -7235,17 +6533,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(ConstructorExpression expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(ConstructorExpression expression,
CollectionExpression collectionExpression,
@@ -7256,9 +6548,6 @@
visitor.addFunctionIdentifiers(ConstructorItemBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(ConstructorExpression expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getConstructorItems());
@@ -7268,9 +6557,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(ConstructorExpression expression,
CollectionExpression collectionExpression,
@@ -7279,25 +6565,16 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(ConstructorExpression expression) {
return expression.hasLeftParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(ConstructorExpression expression) {
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(ConstructorExpression expression) {
if (expression.hasSpaceAfterNew()) {
@@ -7306,9 +6583,6 @@
return expression.getClassName().length();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(ConstructorExpression expression, int index) {
return visitor.getQueryBNF(ConstructorItemBNF.ID);
@@ -7342,17 +6616,11 @@
return declaration;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
declaration = true;
@@ -7365,9 +6633,6 @@
*/
protected static final class DefaultMappingCollector implements MappingCollector {
- /**
- * {@inheritDoc}
- */
@Override
public Collection<IMapping> buildProposals() {
return Collections.emptyList();
@@ -7382,9 +6647,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(DeleteClause expression,
CollectionExpression collectionExpression,
@@ -7393,17 +6655,11 @@
boolean virtualSpace) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(DeleteClause expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(DeleteClause expression,
CollectionExpression collectionExpression,
@@ -7415,9 +6671,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(DeleteClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getRangeVariableDeclaration());
@@ -7427,9 +6680,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(DeleteClause expression,
CollectionExpression collectionExpression,
@@ -7438,33 +6688,21 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(DeleteClause expression) {
return expression.hasSpaceAfterFrom();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(DeleteClause expression) {
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(DeleteClause expression) {
return 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(DeleteClause expression, int index) {
return visitor.getQueryBNF(RangeVariableDeclarationBNF.ID);
@@ -7479,65 +6717,41 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addIdentifier(DELETE_FROM);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(DeleteStatement expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(DeleteStatement expression) {
return expression.getDeleteClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public WhereClauseDeleteStatementHelper getNextHelper() {
return visitor.getWhereClauseDeleteStatementHelper();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(DeleteStatement expression) {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(DeleteStatement expression) {
return expression.hasSpaceAfterDeleteClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(DeleteStatement expression) {
return visitor.isComplete(expression.getDeleteClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return true;
@@ -7553,9 +6767,6 @@
*/
protected boolean valid;
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(Expression expression) {
try {
@@ -7567,17 +6778,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
valid = false;
@@ -7592,9 +6797,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(AbstractDoubleEncapsulatedExpression expression,
CollectionExpression collectionExpression,
@@ -7628,9 +6830,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(AbstractDoubleEncapsulatedExpression expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
@@ -7638,9 +6837,6 @@
visitor.addFunctionIdentifiers(expression.getParent().findQueryBNF(expression));
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(AbstractDoubleEncapsulatedExpression expression,
CollectionExpression collectionExpression,
@@ -7651,17 +6847,11 @@
visitor.addFunctionIdentifiers(queryBNF(expression, index));
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(AbstractDoubleEncapsulatedExpression expression) {
return expression.buildCollectionExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(AbstractDoubleEncapsulatedExpression expression,
CollectionExpression collectionExpression,
@@ -7670,35 +6860,23 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(AbstractDoubleEncapsulatedExpression expression) {
return expression.hasSpaceAfterIdentifier() ||
expression.hasLeftParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(AbstractDoubleEncapsulatedExpression expression) {
// Both MOD and NULLIF allows a fixed 2 encapsulated expressions
return 2;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(AbstractDoubleEncapsulatedExpression expression) {
return 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(AbstractDoubleEncapsulatedExpression expression, int index) {
return visitor.getQueryBNF(expression.parameterExpressionBNF(index));
@@ -7735,9 +6913,6 @@
return encapsulated;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
if (!visited) {
@@ -7747,9 +6922,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
encapsulated = true;
@@ -7861,17 +7033,11 @@
this.queryPosition = new QueryPosition(oldQueryPosition.getPosition(invalidExpression.getParent()));
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
@@ -7885,33 +7051,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
@@ -7929,17 +7083,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
badExpression = true;
@@ -7947,9 +7095,6 @@
badExpression = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
@@ -7982,9 +7127,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
@@ -8018,17 +7160,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -8085,9 +7221,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -8116,9 +7249,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
@@ -8146,9 +7276,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
@@ -8162,25 +7289,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
@@ -8207,17 +7325,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -8234,9 +7346,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
@@ -8261,9 +7370,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
@@ -8283,17 +7389,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
@@ -8315,9 +7415,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
@@ -8331,41 +7428,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
visitAbstractFromClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
@@ -8390,17 +7472,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
visitAbstractConditionalClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -8412,9 +7488,6 @@
queryPosition.addPosition(expression, positionWithinInvalidExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
@@ -8435,17 +7508,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -8474,9 +7541,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
@@ -8489,9 +7553,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -8527,9 +7588,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
@@ -8544,17 +7602,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
@@ -8569,17 +7621,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
@@ -8611,57 +7657,36 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
visitAbstractTripleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
visitAbstractDoubleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
@@ -8686,9 +7711,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -8713,9 +7735,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
@@ -8728,17 +7747,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
visitAbstractDoubleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
@@ -8751,25 +7764,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
visitAbstractConditionalClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
@@ -8794,9 +7798,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
@@ -8814,17 +7815,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -8845,9 +7840,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -8881,9 +7873,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
@@ -8908,9 +7897,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -8964,17 +7950,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
visitAbstractFromClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
@@ -8992,9 +7972,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -9036,25 +8013,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
@@ -9068,9 +8036,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
@@ -9083,41 +8048,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
visitAbstractTripleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
@@ -9149,34 +8099,22 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
// Nothing to do, this is the expression that needs
// to be handled by the valid portion of the JPQL query
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
@@ -9204,9 +8142,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
@@ -9229,9 +8164,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
@@ -9255,25 +8187,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
@@ -9303,9 +8226,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
visitAbstractConditionalClause(expression);
@@ -9536,99 +8456,63 @@
return valid;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
valid = (pathExpression == expression.getElseExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
// TODO
valid = (pathExpression == expression.getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
valid = (pathExpression == expression.getEntityExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
String identifier = expression.getComparisonOperator();
valid = ((identifier == EQUAL) || (identifier == DIFFERENT));
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
valid = (pathExpression != expression.getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
valid = (pathExpression == expression.getSecondExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
valid = (pathExpression == expression.getNewValue());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
valid = (pathExpression == expression.getThenExpression() ||
@@ -9703,9 +8587,6 @@
};
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<IMapping> buildProposals() {
@@ -9762,9 +8643,6 @@
return (afterIdentifier != FROM) && expression.hasFromClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -9860,17 +8738,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -9967,9 +8839,6 @@
return followingInvalidExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -9995,9 +8864,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
this.expression = expression;
@@ -10013,9 +8879,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(AbstractFromClause expression,
CollectionExpression collectionExpression,
@@ -10054,17 +8917,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(AbstractFromClause expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(AbstractFromClause expression,
CollectionExpression collectionExpression,
@@ -10093,9 +8950,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(AbstractFromClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getDeclaration());
@@ -10105,9 +8959,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(AbstractFromClause expression,
CollectionExpression collectionExpression,
@@ -10116,33 +8967,21 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(AbstractFromClause expression) {
return expression.hasSpaceAfterFrom();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(AbstractFromClause expression) {
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(AbstractFromClause expression) {
return 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(AbstractFromClause expression, int index) {
return visitor.getQueryBNF(expression.getDeclarationQueryBNFId());
@@ -10156,9 +8995,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public WhereClauseSelectStatementHelper getNextHelper() {
return visitor.getWhereClauseSelectStatementHelper();
@@ -10173,9 +9009,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(GroupByClause expression,
CollectionExpression collectionExpression,
@@ -10184,17 +9017,11 @@
boolean virtualSpace) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(GroupByClause expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(GroupByClause expression,
CollectionExpression collectionExpression,
@@ -10207,9 +9034,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(GroupByClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getGroupByItems());
@@ -10219,9 +9043,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(GroupByClause expression,
CollectionExpression collectionExpression,
@@ -10230,33 +9051,21 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(GroupByClause expression) {
return expression.hasSpaceAfterGroupBy();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(GroupByClause expression) {
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(GroupByClause expression) {
return 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(GroupByClause expression, int index) {
return visitor.getQueryBNF(GroupByItemBNF.ID);
@@ -10270,9 +9079,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public HavingClauseStatementHelper getNextHelper() {
return visitor.getHavingClauseStatementHelper();
@@ -10286,17 +9092,11 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public OrderByClauseStatementHelper getNextHelper() {
return visitor.getOrderByClauseStatementHelper();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(SelectStatement expression) {
return expression.hasSpaceBeforeOrderBy();
@@ -10316,9 +9116,7 @@
*/
ALL {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10351,9 +9149,7 @@
*/
COLLECTION {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10381,9 +9177,7 @@
*/
LEFT {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10427,9 +9221,7 @@
*/
LEFT_COLLECTION {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10470,9 +9262,7 @@
*/
NONE {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10588,9 +9378,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -10604,9 +9391,6 @@
insideCollection = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
clause = FROM;
@@ -10614,9 +9398,6 @@
clause = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
clause = GROUP_BY;
@@ -10624,9 +9405,6 @@
clause = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
clause = HAVING;
@@ -10634,17 +9412,11 @@
clause = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
complete = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
if (insideCollection && !expression.hasJoins()) {
@@ -10652,9 +9424,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
clause = ORDER_BY;
@@ -10662,9 +9431,6 @@
clause = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -10682,9 +9448,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
clause = WHERE;
@@ -10722,17 +9485,11 @@
return expression != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
this.expression = expression;
@@ -10747,9 +9504,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(IdentificationVariableDeclaration expression,
CollectionExpression collectionExpression,
@@ -10758,17 +9512,11 @@
boolean virtualSpace) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(IdentificationVariableDeclaration expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(IdentificationVariableDeclaration expression,
CollectionExpression collectionExpression,
@@ -10778,9 +9526,6 @@
visitor.addJoinIdentifiers();
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(IdentificationVariableDeclaration expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getJoins());
@@ -10790,9 +9535,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(IdentificationVariableDeclaration expression,
CollectionExpression collectionExpression,
@@ -10801,33 +9543,21 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(IdentificationVariableDeclaration expression) {
return expression.hasSpace();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(IdentificationVariableDeclaration expression) {
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(IdentificationVariableDeclaration expression) {
return expression.getRangeVariableDeclaration().getLength();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(IdentificationVariableDeclaration expression, int index) {
return visitor.getQueryBNF(InternalJoinBNF.ID);
@@ -10879,89 +9609,56 @@
filter = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
filter = visitor.getMappingCollectionFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
filter = visitor.getMappingCollectionFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
filter = visitor.getMappingCollectionFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
// No need to filter, everything is allowed
@@ -10972,81 +9669,51 @@
filter = NullFilter.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
filter = visitor.getMappingCollectionFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
// No need to filter, everything is allowed
@@ -11057,65 +9724,41 @@
filter = NullFilter.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
filter = visitor.getMappingCollectionFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
filter = visitor.getMappingCollectionFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
filter = visitor.getMappingPropertyFilter();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
// No need to filter, everything is allowed
@@ -11126,9 +9769,6 @@
filter = NullFilter.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
// No need to filter, everything is allowed
@@ -11163,9 +9803,6 @@
this.type = type;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(IMapping value) {
@@ -11208,9 +9845,6 @@
return expression != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
this.expression = expression;
@@ -11225,9 +9859,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(AbstractOrderByClause expression,
CollectionExpression collectionExpression,
@@ -11243,17 +9874,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(AbstractOrderByClause expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(AbstractOrderByClause expression,
CollectionExpression collectionExpression,
@@ -11266,9 +9891,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(AbstractOrderByClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getOrderByItems());
@@ -11278,9 +9900,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(AbstractOrderByClause expression,
CollectionExpression collectionExpression,
@@ -11289,33 +9908,21 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(AbstractOrderByClause expression) {
return expression.hasSpaceAfterIdentifier();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(AbstractOrderByClause expression) {
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(AbstractOrderByClause expression) {
return 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(AbstractOrderByClause expression, int index) {
return visitor.getQueryBNF(OrderByItemBNF.ID);
@@ -11330,65 +9937,41 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addCompositeIdentifier(ORDER_BY, -1);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(SelectStatement expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(SelectStatement expression) {
return expression.getOrderByClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper<SelectStatement> getNextHelper() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(SelectStatement expression) {
return expression.hasOrderByClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(SelectStatement expression) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(SelectStatement expression) {
return visitor.isComplete(expression.getOrderByClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return false;
@@ -11398,9 +9981,6 @@
// Made static final for performance reasons.
protected static final class PropertyMappingFilter implements Filter<IMapping> {
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(IMapping value) {
return !value.isTransient() &&
@@ -11423,9 +10003,6 @@
expression = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
this.expression = expression;
@@ -11447,9 +10024,6 @@
expression = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
this.expression = expression;
@@ -11463,9 +10037,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(SelectClause expression,
CollectionExpression collectionExpression,
@@ -11484,9 +10055,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(SelectClause expression,
CollectionExpression collectionExpression,
@@ -11500,9 +10068,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(SelectClause expression) {
@@ -11527,9 +10092,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public FromClauseStatementHelper getNextHelper() {
return visitor.getFromClauseStatementHelper();
@@ -11543,9 +10105,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleWhereClauseSelectStatementHelper getNextHelper() {
return visitor.getSimpleWhereClauseSelectStatementHelper();
@@ -11559,9 +10118,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleHavingClauseStatementHelper getNextHelper() {
return visitor.getSimpleHavingClauseStatementHelper();
@@ -11575,17 +10131,11 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper<SimpleSelectStatement> getNextHelper() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(SimpleSelectStatement expression) {
return false;
@@ -11608,9 +10158,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper<SimpleSelectStatement> getNextHelper() {
return visitor.getSimpleFromClauseStatementHelper();
@@ -11624,9 +10171,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper<SimpleSelectStatement> getNextHelper() {
return visitor.getSimpleGroupByClauseStatementHelper();
@@ -11719,25 +10263,16 @@
*/
protected boolean subExpression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
this.appendable = subExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
this.appendable = subExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
subExpression = true;
@@ -11775,9 +10310,6 @@
return expression != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
this.expression = expression;
@@ -11792,9 +10324,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(AbstractTripleEncapsulatedExpression expression,
CollectionExpression collectionExpression,
@@ -11828,18 +10357,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(AbstractTripleEncapsulatedExpression expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
visitor.addFunctionIdentifiers(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(AbstractTripleEncapsulatedExpression expression,
CollectionExpression collectionExpression,
@@ -11850,17 +10373,11 @@
visitor.addFunctionIdentifiers(queryBNF(expression, index));
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(AbstractTripleEncapsulatedExpression expression) {
return expression.buildCollectionExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(AbstractTripleEncapsulatedExpression expression,
CollectionExpression collectionExpression,
@@ -11869,35 +10386,23 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(AbstractTripleEncapsulatedExpression expression) {
return expression.hasSpaceAfterIdentifier() ||
expression.hasLeftParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(AbstractTripleEncapsulatedExpression expression) {
// Both LOCATE and SUBSTRING can allow up to 3 encapsulated expressions
return 3;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(AbstractTripleEncapsulatedExpression expression) {
return 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(AbstractTripleEncapsulatedExpression expression, int index) {
return visitor.getQueryBNF(expression.getParameterQueryBNFId(index));
@@ -11912,65 +10417,41 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addIdentifier(UPDATE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(UpdateStatement expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(UpdateStatement expression) {
return expression.getUpdateClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper<UpdateStatement> getNextHelper() {
return visitor.getWhereClauseUpdateStatementHelper();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(UpdateStatement expression) {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(UpdateStatement expression) {
return expression.hasSpaceAfterUpdateClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(UpdateStatement expression) {
return visitor.isComplete(expression.getUpdateClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return true;
@@ -11985,9 +10466,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(UpdateClause expression,
CollectionExpression collectionExpression,
@@ -11998,17 +10476,11 @@
visitor.addAggregateIdentifiers(NewValueBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(UpdateClause expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(UpdateClause expression,
CollectionExpression collectionExpression,
@@ -12018,9 +10490,6 @@
visitor.addIdentificationVariables();
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(UpdateClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getUpdateItems());
@@ -12030,9 +10499,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(UpdateClause expression,
CollectionExpression collectionExpression,
@@ -12041,25 +10507,16 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(UpdateClause expression) {
return expression.hasSpaceAfterUpdate();
}
- /**
- * {@inheritDoc}
- */
@Override
public int maxCollectionSize(UpdateClause expression) {
return Integer.MAX_VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(UpdateClause expression) {
// There is a SPACE_LENGTH less, it's added automatically
@@ -12070,9 +10527,6 @@
SET.length();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(UpdateClause expression, int index) {
return visitor.getQueryBNF(NewValueBNF.ID);
@@ -12100,17 +10554,11 @@
this.visitor = visitor;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.getParent().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -12153,9 +10601,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(WhenClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getWhenExpression());
@@ -12165,9 +10610,6 @@
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(WhenClause expression) {
return expression.hasSpaceAfterWhen();
@@ -12182,65 +10624,41 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addIdentifier(WHERE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(DeleteStatement expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(DeleteStatement expression) {
return expression.getWhereClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper<? extends DeleteStatement> getNextHelper() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(DeleteStatement expression) {
return expression.hasWhereClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(DeleteStatement expression) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(DeleteStatement expression) {
return visitor.isComplete(expression.getWhereClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return false;
@@ -12254,9 +10672,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper<SelectStatement> getNextHelper() {
return visitor.getGroupByClauseStatementHelper();
@@ -12271,65 +10686,41 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
visitor.addIdentifier(WHERE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(UpdateStatement expression) {
// Does not have internal clauses
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(UpdateStatement expression) {
return expression.getWhereClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper<? extends UpdateStatement> getNextHelper() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(UpdateStatement expression) {
return expression.hasWhereClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(UpdateStatement expression) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(UpdateStatement expression) {
return visitor.isComplete(expression.getWhereClause());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return false;
@@ -12362,17 +10753,11 @@
return withinInvalidExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
withinInvalidExpression = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
withinInvalidExpression = true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/BasicRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/BasicRefactoringTool.java
index 71d6129..10a7b94 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/BasicRefactoringTool.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/BasicRefactoringTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -351,9 +351,6 @@
delta.addTextEdits(renamer.textEdits);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toActualText() {
return getDelta().applyChanges();
@@ -540,17 +537,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
rename(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
rename(expression);
@@ -584,9 +575,6 @@
this.newClassName = newClassName;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
// Test for a fully qualified class name in a range variable declaration
@@ -595,9 +583,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
visit(expression, expression.getClassName(), 4); // 4 = "NEW "
@@ -640,9 +625,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
// A fully qualified enum constant is parsed as a state field path expression
@@ -704,9 +686,6 @@
this.newEntityName = newEntityName;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
if (oldEntityName.equals(expression.getText())) {
@@ -714,9 +693,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
if (oldEntityName.equals(expression.getEntityTypeName())) {
@@ -724,9 +700,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
if (oldEntityName.equals(expression.getText())) {
@@ -788,17 +761,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
renameEnumConstant(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
renameEnumConstant(expression);
@@ -832,17 +799,11 @@
setExpression(jpqlQuery);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getExpression() {
return jpqlQuery;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedTypeProvider getProvider() {
return provider;
@@ -857,9 +818,6 @@
this.jpqlQuery = (jpqlQuery != null) ? jpqlQuery.toString() : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -902,9 +860,6 @@
this.newVariableName = newVariableName;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -915,9 +870,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -932,9 +884,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -981,9 +930,6 @@
this.newVariableName = newVariableName;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
if (oldVariableName.equalsIgnoreCase(expression.getText())) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultBasicRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultBasicRefactoringTool.java
index 217c317..df6b61d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultBasicRefactoringTool.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultBasicRefactoringTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -78,9 +78,6 @@
super(jpqlFragment, jpqlGrammar, managedTypeProvider, jpqlQueryBNFId);
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildJPQLQueryContext() {
return new DefaultJPQLQueryContext(getGrammar());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistProposals.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistProposals.java
index e140903..35011df 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistProposals.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistProposals.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -238,9 +238,6 @@
return identifiers;
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<IEntity> abstractSchemaTypes() {
return new SnapshotCloneIterable<IEntity>(entities);
@@ -324,9 +321,6 @@
rangeIdentificationVariables.put(identificationVariable, entity);
}
- /**
- * {@inheritDoc}
- */
@Override
public Result buildEscapedQuery(String jpqlQuery, String proposal, int position, boolean insert) {
@@ -464,9 +458,6 @@
return new int[] { startPosition, startPosition + length };
}
- /**
- * {@inheritDoc}
- */
@Override
public Result buildQuery(String jpqlQuery, String proposal, int position, boolean insert) {
@@ -489,9 +480,6 @@
return new Result(sb.toString(), positions[0] + proposal.length());
}
- /**
- * {@inheritDoc}
- */
@Override
public ResultQuery buildXmlQuery(String jpqlQuery, String proposal, int position, boolean insert) {
@@ -524,9 +512,6 @@
return new Result(sb.toString(), proposalPositions[0] + proposal.length());
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<String> classNames() {
if (classNamePrefix == null) {
@@ -535,9 +520,6 @@
return extension.classNames(classNamePrefix, classType);
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<String> columnNames() {
if (tableName == null) {
@@ -546,17 +528,11 @@
return extension.columnNames(tableName, columnNamePrefix);
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<EnumProposals> enumConstant() {
return new SnapshotCloneIterable<EnumProposals>(enumProposals.values());
}
- /**
- * {@inheritDoc}
- */
@Override
public IEntity getAbstractSchemaType(String identificationVariable) {
return rangeIdentificationVariables.get(identificationVariable);
@@ -573,9 +549,6 @@
return classNamePrefix;
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassType getClassType() {
return classType;
@@ -602,9 +575,6 @@
return jpqlGrammar;
}
- /**
- * {@inheritDoc}
- */
@Override
public IdentifierRole getIdentifierRole(String identifier) {
return jpqlGrammar.getExpressionRegistry().getIdentifierRole(identifier);
@@ -632,9 +602,6 @@
return tableNamePrefix;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasProposals() {
return !mappings.isEmpty() ||
@@ -648,9 +615,6 @@
!rangeIdentificationVariables.isEmpty();
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<String> identificationVariables() {
List<String> variables = new ArrayList<String>(identificationVariables.size() + rangeIdentificationVariables.size());
@@ -659,9 +623,6 @@
return new SnapshotCloneIterable<String>(variables);
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<String> identifiers() {
return new SnapshotCloneIterable<String>(identifiers);
@@ -750,9 +711,6 @@
return LONGUEST_IDENTIFIERS.containsKey(proposal) ? LONGUEST_IDENTIFIERS.get(proposal) : proposal;
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<IMapping> mappings() {
return new SnapshotCloneIterable<IMapping>(mappings);
@@ -819,9 +777,6 @@
return -1;
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<String> tableNames() {
if (tableNamePrefix == null) {
@@ -830,9 +785,6 @@
return extension.tableNames(tableNamePrefix);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
@@ -928,17 +880,11 @@
this.constants = new HashSet<String>();
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<String> enumConstants() {
return new SnapshotCloneIterable<String>(constants);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType enumType() {
return enumType;
@@ -975,25 +921,16 @@
this.position = position;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getPosition() {
return position;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getQuery() {
return jpqlQuery;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistVisitor.java
index aa420e2..af1b817 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -84,25 +84,16 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AcceptableTypeVisitor buildAcceptableTypeVisitor() {
return new AcceptableTypeVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar getLatestGrammar() {
return DefaultJPQLGrammar.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
// Generic JPA does not support identifying a JOIN FETCH with an identification variable
@@ -114,108 +105,69 @@
*/
protected class AcceptableTypeVisitor extends AbstractContentAssistVisitor.AcceptableTypeVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
type = queryContext.getType(Number.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
type = queryContext.getType(Number.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
type = queryContext.getType(Number.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
type = queryContext.getType(CharSequence.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
type = queryContext.getType(CharSequence.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
// TODO: Handle the position
type = queryContext.getType(CharSequence.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
type = queryContext.getType(CharSequence.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
// In theory we would only allow Long and Integer
type = queryContext.getType(Number.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
type = queryContext.getType(Number.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
// TODO: Handle the position
type = queryContext.getType(CharSequence.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
type = queryContext.getType(Number.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
type = queryContext.getType(CharSequence.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
type = queryContext.getType(CharSequence.class);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultGrammarValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultGrammarValidator.java
index 7a710d0..dcf0e0b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultGrammarValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultGrammarValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,33 +49,21 @@
super(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected LiteralVisitor buildLiteralVisitor() {
return new DefaultLiteralVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected OwningClauseVisitor buildOwningClauseVisitor() {
return new OwningClauseVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isSubqueryAllowedAnywhere() {
return getJPAVersion().isNewerThanOrEqual(JPAVersion.VERSION_2_1);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryContext.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryContext.java
index 7ab9c1c..a3c5beb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryContext.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,9 +58,6 @@
super(parent, currentQuery);
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildJPQLQueryContext(JPQLQueryContext currentContext,
Expression currentQuery) {
@@ -68,33 +65,21 @@
return new DefaultJPQLQueryContext(currentContext, currentQuery);
}
- /**
- * {@inheritDoc}
- */
@Override
protected DefaultLiteralVisitor buildLiteralVisitor() {
return new DefaultLiteralVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected DefaultParameterTypeVisitor buildParameterTypeVisitor() {
return new DefaultParameterTypeVisitor(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected DefaultResolverBuilder buildResolverBuilder() {
return new DefaultResolverBuilder(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultJPQLQueryContext getParent() {
return (DefaultJPQLQueryContext) super.getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryHelper.java
index 168e8fd..2d485c6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -81,9 +81,6 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
public BasicRefactoringTool buildBasicRefactoringTool() {
return new DefaultBasicRefactoringTool(
@@ -93,25 +90,16 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractContentAssistVisitor buildContentAssistVisitor(JPQLQueryContext queryContext) {
return new DefaultContentAssistVisitor(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
protected DefaultGrammarValidator buildGrammarValidator(JPQLGrammar jpqlGrammar) {
return new DefaultGrammarValidator(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildJPQLQueryContext(JPQLGrammar jpqlGrammar) {
return new DefaultJPQLQueryContext(jpqlGrammar);
@@ -130,9 +118,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public RefactoringTool buildRefactoringTool() {
@@ -145,9 +130,6 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
protected DefaultSemanticValidator buildSemanticValidator(JPQLQueryContext queryContext) {
return new DefaultSemanticValidator(queryContext);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultParameterTypeVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultParameterTypeVisitor.java
index 4f21bb7..88ed521 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultParameterTypeVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultParameterTypeVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,9 +48,6 @@
this.queryContext = queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringDelta.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringDelta.java
index 4d97286..bba3892 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringDelta.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringDelta.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -89,9 +89,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public String applyChanges() {
@@ -137,9 +134,6 @@
return position;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasTextEdits() {
return !textEdits.isEmpty();
@@ -158,25 +152,16 @@
this.textEdits = new LinkedList<TextEdit>();
}
- /**
- * {@inheritDoc}
- */
@Override
public int size() {
return textEdits.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<TextEdit> textEdits() {
return new SnapshotCloneListIterable<TextEdit>(textEdits);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return textEdits.toString();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringTool.java
index e754961..251eda5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringTool.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -79,17 +79,11 @@
super(managedTypeProvider, jpqlQueryBuilder, jpqlFragment, jpqlQueryBNFId);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IJPQLQueryFormatter buildFormatter() {
return new DefaultActualJPQLQueryFormatter(true);
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildJPQLQueryContext() {
return new DefaultJPQLQueryContext(getGrammar());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultSemanticValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultSemanticValidator.java
index 586fbcb..29a86e9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultSemanticValidator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultSemanticValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -207,17 +207,11 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected LiteralVisitor buildLiteralVisitor() {
return new DefaultLiteralVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected OwningClauseVisitor buildOwningClauseVisitor() {
return new OwningClauseVisitor();
@@ -274,9 +268,6 @@
return validator;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -440,17 +431,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected PathType selectClausePathExpressionPathType() {
return PathType.ANY_FIELD;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateAbsExpression(AbsExpression expression) {
@@ -464,9 +449,6 @@
return valid;
}
- /**
- * {@inheritDoc}
- */
@Override
protected int validateArithmeticExpression(ArithmeticExpression expression,
String leftExpressionWrongTypeMessageKey,
@@ -491,9 +473,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateAvgFunction(AvgFunction expression) {
@@ -507,9 +486,6 @@
return valid;
}
- /**
- * {@inheritDoc}
- */
@Override
protected int validateBetweenExpression(BetweenExpression expression) {
@@ -549,9 +525,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected int validateCollectionMemberExpression(CollectionMemberExpression expression) {
@@ -572,9 +545,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateComparisonExpression(ComparisonExpression expression) {
@@ -596,9 +566,6 @@
return valid;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateConcatExpression(ConcatExpression expression) {
@@ -619,9 +586,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateConstructorExpression(ConstructorExpression expression) {
@@ -689,9 +653,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateCountFunction(CountFunction expression) {
@@ -717,18 +678,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateEntryExpression(EntryExpression expression) {
validateMapIdentificationVariable(expression);
super.validateEntryExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateIdentificationVariable(IdentificationVariable expression, String variable) {
@@ -778,18 +733,12 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateKeyExpression(KeyExpression expression) {
validateMapIdentificationVariable(expression);
super.validateKeyExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateLengthExpression(LengthExpression expression) {
@@ -802,9 +751,6 @@
return valid;
}
- /**
- * {@inheritDoc}
- */
@Override
protected int validateLocateExpression(LocateExpression expression) {
@@ -831,9 +777,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateLowerExpression(LowerExpression expression) {
@@ -872,9 +815,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected int validateModExpression(ModExpression expression) {
@@ -907,18 +847,12 @@
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateNotExpression(NotExpression expression) {
super.validateNotExpression(expression);
validateBooleanType(expression.getExpression(), NotExpression_WrongType);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateNullComparisonExpression(NullComparisonExpression expression) {
@@ -958,9 +892,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateSqrtExpression(SqrtExpression expression) {
@@ -996,9 +927,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected int validateSubstringExpression(SubstringExpression expression) {
@@ -1040,9 +968,6 @@
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateSumFunction(SumFunction expression) {
@@ -1056,9 +981,6 @@
return valid;
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("null")
protected boolean validateUpdateItem(UpdateItem expression) {
@@ -1153,9 +1075,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean validateUpperExpression(UpperExpression expression) {
@@ -1170,9 +1089,6 @@
return valid;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateValueExpression(ValueExpression expression) {
validateMapIdentificationVariable(expression);
@@ -1185,106 +1101,70 @@
*/
protected class BooleanTypeValidator extends TypeValidator {
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isRightType(Object type) {
return getTypeHelper().isBooleanType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
// ALL|ANY|SOME always returns a boolean value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
// AND always returns a boolean value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
// BETWEEN always returns a boolean value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
// A comparison always returns a boolean value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
// IS EMPTY always returns a boolean value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
// EXISTS always returns a boolean value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
// LIKE always returns a boolean value
valid = true;
}
- /**
- * {@inheritDoc}
- */
- @Override
+ @Override
public void visit(NotExpression expression) {
// NOT always returns a boolean value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
// IS NULL always returns a boolean value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
// OR always returns a boolean value
@@ -1299,9 +1179,6 @@
*/
protected boolean valid;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
valid = expression.getText() == Expression.NULL;
@@ -1314,170 +1191,113 @@
*/
protected class NumericTypeValidator extends TypeValidator {
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isRightType(Object type) {
return getTypeHelper().isNumericType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
// ABS always returns a numeric value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
// An addition expression always returns a numeric value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
// +/- is always numeric value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
// AVG always returns a double
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
// COUNT always returns a long
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
// A division expression always returns a numeric value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
// INDEX always returns an integer
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
// LENGTH always returns an integer
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
// LOCATE always returns an integer
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
// SUM always returns a numeric value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
// SUM always returns a numeric value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
// MOD always returns an integer
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
// A multiplication expression always returns a numeric value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
// A numeric literal is by definition valid
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
// SIZE always returns an integer
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
// SQRT always returns a double
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
// A subtraction expression always returns a numeric value
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
// SUM always returns a long
@@ -1489,25 +1309,16 @@
public boolean result;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
result = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
expression.getParent().accept(this);
@@ -1520,62 +1331,41 @@
*/
protected class StringTypeValidator extends TypeValidator {
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isRightType(Object type) {
return getTypeHelper().isStringType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
// CONCAT always returns a string
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
// LOWER always returns a string
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
// A string literal is by definition valid
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
// SUBSTRING always returns a string
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
// TRIM always returns a string
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
// UPPER always returns a string
@@ -1602,27 +1392,18 @@
*/
protected abstract boolean isRightType(Object type);
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(CaseExpression expression) {
Object type = getType(expression);
valid = isRightType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(CoalesceExpression expression) {
Object type = getType(expression);
valid = isRightType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(InputParameter expression) {
// An input parameter can't be validated until the query
@@ -1630,35 +1411,23 @@
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// The missing expression is validated by GrammarValidator
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(NullIfExpression expression) {
expression.getFirstExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(StateFieldPathExpression expression) {
Object type = getType(expression);
valid = isRightType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SubExpression expression) {
expression.getExpression().accept(this);
@@ -1669,41 +1438,26 @@
protected AbstractSchemaName expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
expression.getRootObject().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
expression.getRangeVariableDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
expression.getParent().accept(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultTextEdit.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultTextEdit.java
index 7948ef9..327578e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultTextEdit.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultTextEdit.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,41 +55,26 @@
this.newValue = newValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getLength() {
return oldValue.length();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getNewValue() {
return newValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getOffset() {
return offset;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getOldValue() {
return oldValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkBasicRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkBasicRefactoringTool.java
index b28c7fa..439312b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkBasicRefactoringTool.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkBasicRefactoringTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -79,9 +79,6 @@
super(jpqlFragment, jpqlGrammar, managedTypeProvider, jpqlQueryBNFId);
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildJPQLQueryContext() {
return new EclipseLinkJPQLQueryContext(getGrammar());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkContentAssistVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkContentAssistVisitor.java
index 5d899f1..f3c00cc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkContentAssistVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkContentAssistVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -101,81 +101,51 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AcceptableTypeVisitor buildAcceptableTypeVisitor() {
return new AcceptableTypeVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected AppendableExpressionVisitor buildAppendableExpressionVisitor() {
return new AppendableExpressionVisitor(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected EndingQueryPositionBuilder buildEndingQueryPositionBuilder() {
return new EndingQueryPositionBuilder(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected FollowingClausesVisitor buildFollowingClausesVisitor() {
return new FollowingClausesVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected FromClauseCollectionHelper buildFromClauseCollectionHelper() {
return new FromClauseCollectionHelper(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected FromClauseStatementHelper buildFromClauseStatementHelper() {
return new FromClauseStatementHelper(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected GroupByClauseCollectionHelper buildGroupByClauseCollectionHelper() {
return new GroupByClauseCollectionHelper(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IncompleteCollectionExpressionVisitor buildIncompleteCollectionExpressionVisitor() {
return new IncompleteCollectionExpressionVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected OrderByClauseStatementHelper buildOrderByClauseStatementHelper() {
return new OrderByClauseStatementHelper(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected SimpleFromClauseStatementHelper buildSimpleFromClauseStatementHelper() {
return new SimpleFromClauseStatementHelper(this);
@@ -200,9 +170,6 @@
return EclipseLinkVersion.value(queryContext.getProviderVersion());
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar getLatestGrammar() {
return DefaultEclipseLinkJPQLGrammar.instance();
@@ -238,9 +205,6 @@
return helper;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -248,9 +212,6 @@
identifierFilters.put(NOT_EQUAL, VALID_IDENTIFIER_FILTER);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
EclipseLinkVersion version = EclipseLinkVersion.value(queryContext.getProviderVersion());
@@ -270,9 +231,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
super.visit(expression);
@@ -332,9 +290,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
super.visit(expression);
@@ -380,9 +335,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
super.visit(expression);
@@ -405,18 +357,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
super.visit(expression);
// Nothing to do, this is database specific
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
super.visit(expression);
@@ -493,9 +439,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
super.visit(expression);
@@ -548,9 +491,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
super.visit(expression);
@@ -600,9 +540,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
if (!isLocked(expression)) {
@@ -611,9 +548,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
super.visit(expression);
@@ -647,9 +581,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
if (!isLocked(expression)) {
@@ -658,9 +589,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
super.visit(expression);
@@ -698,9 +626,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
super.visit(expression);
@@ -722,9 +647,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
super.visit(expression);
@@ -777,9 +699,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visitThirdPartyPathExpression(AbstractPathExpression expression,
String variableName) {
@@ -814,9 +733,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
if (expression.hasExpression()) {
@@ -824,18 +740,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
if (expression.hasExpression()) {
@@ -843,26 +753,17 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
// Always complete since it's a single word
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
@@ -877,9 +778,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
@@ -890,9 +788,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
if (expression.hasPatternValue()) {
@@ -900,9 +795,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
@@ -913,18 +805,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
if (expression.hasIdentificationVariable()) {
@@ -932,9 +818,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
if (expression.hasQuery()) {
@@ -951,9 +834,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
@@ -972,9 +852,6 @@
queryPosition.addPosition(expression, expression.getLength() - correction);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
@@ -997,9 +874,6 @@
queryPosition.addPosition(expression, expression.getLength() - correction);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
@@ -1018,25 +892,16 @@
queryPosition.addPosition(expression, expression.getLength() - correction);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
visitAbstractDoubleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
@@ -1067,9 +932,6 @@
queryPosition.addPosition(expression, expression.getLength() - correction);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
@@ -1088,9 +950,6 @@
queryPosition.addPosition(expression, expression.getLength() - correction);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
@@ -1109,25 +968,16 @@
queryPosition.addPosition(expression, expression.getLength() - correction);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
visitAbstractConditionalClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
@@ -1149,9 +999,6 @@
queryPosition.addPosition(expression, expression.getLength() - correction);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
@@ -1183,9 +1030,6 @@
protected boolean hasStartWithClause;
protected boolean introspect;
- /**
- * {@inheritDoc}
- */
@Override
public void dispose() {
super.dispose();
@@ -1195,9 +1039,6 @@
hasOrderSiblingsByClause = false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean hasFromClause(AbstractSelectStatement expression) {
@@ -1299,9 +1140,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
@@ -1329,9 +1167,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
@@ -1354,9 +1189,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(AbstractFromClause expression,
CollectionExpression collectionExpression,
@@ -1414,9 +1246,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(AbstractFromClause expression,
CollectionExpression collectionExpression,
@@ -1472,9 +1301,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(SelectStatement expression) {
super.addInternalClauseProposals(expression);
@@ -1502,9 +1328,6 @@
*/
protected class IncompleteCollectionExpressionVisitor extends AbstractContentAssistVisitor.IncompleteCollectionExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> compositeIdentifiersAfter(String clause) {
@@ -1528,17 +1351,11 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public UnionClauseStatementHelper getNextHelper() {
return getUnionClauseStatementHelper();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(SelectStatement expression) {
return expression.hasSpaceBeforeUnion();
@@ -1551,9 +1368,6 @@
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(SimpleSelectStatement expression) {
super.addInternalClauseProposals(expression);
@@ -1586,9 +1400,6 @@
*/
protected boolean valid;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
valid = (this.expression == expression);
@@ -1597,9 +1408,6 @@
protected class UnionClauseStatementHelper implements StatementHelper<SelectStatement> {
- /**
- * {@inheritDoc}
- */
@Override
public void addClauseProposals() {
addIdentifier(EXCEPT);
@@ -1607,56 +1415,35 @@
addIdentifier(UNION);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addInternalClauseProposals(SelectStatement expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getClause(SelectStatement expression) {
return expression.getUnionClauses();
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper<? extends SelectStatement> getNextHelper() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasClause(SelectStatement expression) {
return expression.hasUnionClauses();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(SelectStatement expression) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isClauseComplete(SelectStatement expression) {
return isComplete(expression.getUnionClauses());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRequired() {
return false;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryContext.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryContext.java
index 6f092bf..c3c5d79 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryContext.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,17 +65,11 @@
super(parent, currentQuery);
}
- /**
- * {@inheritDoc}
- */
@Override
protected DeclarationResolver buildDeclarationResolver(DeclarationResolver parent) {
return new EclipseLinkDeclarationResolver(parent, this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildJPQLQueryContext(JPQLQueryContext currentContext,
Expression currentQuery) {
@@ -83,33 +77,21 @@
return new EclipseLinkJPQLQueryContext(currentContext, currentQuery);
}
- /**
- * {@inheritDoc}
- */
@Override
protected LiteralVisitor buildLiteralVisitor() {
return new EclipseLinkLiteralVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected EclipseLinkParameterTypeVisitor buildParameterTypeVisitor() {
return new EclipseLinkParameterTypeVisitor(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected ResolverBuilder buildResolverBuilder() {
return new EclipseLinkResolverBuilder(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public EclipseLinkJPQLQueryContext getParent() {
return (EclipseLinkJPQLQueryContext) super.getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryHelper.java
index 982ee2a..476477e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,9 +83,6 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
public BasicRefactoringTool buildBasicRefactoringTool() {
return new EclipseLinkBasicRefactoringTool(
@@ -95,9 +92,6 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractContentAssistVisitor buildContentAssistVisitor(JPQLQueryContext queryContext) {
return new EclipseLinkContentAssistVisitor(queryContext);
@@ -114,17 +108,11 @@
return EclipseLinkSemanticValidatorExtension.NULL_EXTENSION;
}
- /**
- * {@inheritDoc}
- */
@Override
protected EclipseLinkGrammarValidator buildGrammarValidator(JPQLGrammar jpqlGrammar) {
return new EclipseLinkGrammarValidator(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildJPQLQueryContext(JPQLGrammar jpqlGrammar) {
return new EclipseLinkJPQLQueryContext(jpqlGrammar);
@@ -139,9 +127,6 @@
return new EclipseLinkJPQLQueryBuilder(getGrammar());
}
- /**
- * {@inheritDoc}
- */
@Override
public RefactoringTool buildRefactoringTool() {
@@ -154,9 +139,6 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractEclipseLinkSemanticValidator buildSemanticValidator(JPQLQueryContext queryContext) {
return new EclipseLinkSemanticValidator(
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkParameterTypeVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkParameterTypeVisitor.java
index 934bb37..98dc45f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkParameterTypeVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkParameterTypeVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,9 +48,6 @@
this.queryContext = queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkRefactoringTool.java
index cdebe3d..c3c71dd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkRefactoringTool.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkRefactoringTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,17 +80,11 @@
super(managedTypeProvider, jpqlQueryBuilder, jpqlFragment, jpqlQueryBNFId);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IJPQLQueryFormatter buildFormatter() {
return new EclipseLinkActualJPQLQueryFormatter(true);
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildJPQLQueryContext() {
return new EclipseLinkJPQLQueryContext(getGrammar());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkResolverBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkResolverBuilder.java
index 36a319c..c4eff81 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkResolverBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkResolverBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,97 +54,61 @@
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
resolver = buildClassResolver(Object.class);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericSemanticValidatorHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericSemanticValidatorHelper.java
index 956fe8d..4748806 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericSemanticValidatorHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericSemanticValidatorHelper.java
@@ -105,9 +105,6 @@
return new IdentificationVariableVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
public void collectAllDeclarationIdentificationVariables(Map<String, List<IdentificationVariable>> identificationVariables) {
@@ -144,25 +141,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void collectLocalDeclarationIdentificationVariables(Map<String, List<IdentificationVariable>> identificationVariables) {
collectLocalDeclarationIdentificationVariables(queryContext.getCurrentContext(), identificationVariables);
}
- /**
- * {@inheritDoc}
- */
@Override
public void disposeSubqueryContext() {
queryContext.disposeSubqueryContext();
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] entityNames() {
@@ -175,9 +163,6 @@
return names.toArray(new String[names.size()]);
}
- /**
- * {@inheritDoc}
- */
@Override
public List<JPQLQueryDeclaration> getAllDeclarations() {
@@ -192,50 +177,32 @@
return declarations;
}
- /**
- * {@inheritDoc}
- */
@Override
public IConstructor[] getConstructors(Object type) {
return CollectionTools.array(IConstructor.class, ((IType) type).constructors());
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public List getDeclarations() {
return queryContext.getDeclarations();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getEmbeddable(Object type) {
return queryContext.getProvider().getEmbeddable((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IEntity getEntityNamed(String entityName) {
return queryContext.getProvider().getEntityNamed(entityName);
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] getEnumConstants(Object type) {
return ((IType) type).getEnumConstants();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return queryContext.getGrammar();
@@ -259,33 +226,21 @@
return identificationVariableVisitor;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType(Expression expression) {
return queryContext.getResolver(expression).getManagedType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IMapping getMappingNamed(Object managedType, String path) {
return ((IManagedType) managedType).getMappingNamed(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getMappingType(Object mapping) {
return (mapping != null) ? ((IMapping) mapping).getType() : queryContext.getTypeHelper().unknownType();
}
- /**
- * {@inheritDoc}
- */
@Override
public ITypeDeclaration[] getMethodParameterTypeDeclarations(Object constructor) {
return ((IConstructor) constructor).getParameterTypes();
@@ -300,9 +255,6 @@
return queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getReferenceManagedType(Object relationshipMapping) {
@@ -314,41 +266,26 @@
return mapping.getParent().getProvider().getManagedType(mapping.getType());
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType(Expression expression) {
return queryContext.getType(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType(Object typeDeclaration) {
return ((ITypeDeclaration) typeDeclaration).getType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType(String typeName) {
return queryContext.getType(typeName);
}
- /**
- * {@inheritDoc}
- */
@Override
public ITypeDeclaration getTypeDeclaration(Expression expression) {
return queryContext.getTypeDeclaration(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public ITypeHelper getTypeHelper() {
if (typeHelper == null) {
@@ -357,33 +294,21 @@
return typeHelper;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getTypeName(Object type) {
return ((IType) type).getName();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isAssignableTo(Object type1, Object type2) {
return ((IType) type1).isAssignableTo((IType) type2) ;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isCollectionIdentificationVariable(String variableName) {
return queryContext.isCollectionIdentificationVariable(variableName);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isCollectionMapping(Object mapping) {
return (mapping != null) && ((IMapping) mapping).isCollection();
@@ -394,65 +319,41 @@
return (mapping != null) && ((IMapping) mapping).isEmbeddable();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEnumType(Object type) {
return ((IType) type).isEnum();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isIdentificationVariableValidInComparison(IdentificationVariable expression) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isManagedTypeResolvable(Object managedType) {
return ((IManagedType) managedType).getType().isResolvable();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isPropertyMapping(Object mapping) {
return (mapping != null) && ((IMapping) mapping).isProperty();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRelationshipMapping(Object mapping) {
return (mapping != null) && ((IMapping) mapping).isRelationship();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isResultVariable(String variableName) {
return queryContext.isResultVariable(variableName);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTransient(Object mapping) {
return (mapping != null) && ((IMapping) mapping).isTransient();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTypeDeclarationAssignableTo(Object typeDeclaration1, Object typeDeclaration2) {
@@ -474,33 +375,21 @@
return isAssignableTo(declaration1.getType(), declaration2.getType());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTypeResolvable(Object type) {
return ((IType) type).isResolvable();
}
- /**
- * {@inheritDoc}
- */
@Override
public void newSubqueryContext(SimpleSelectStatement expression) {
queryContext.newSubqueryContext(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public IMapping resolveMapping(Expression expression) {
return queryContext.getResolver(expression).getMapping();
}
- /**
- * {@inheritDoc}
- */
@Override
public IMapping resolveMapping(String variableName, String name) {
@@ -522,9 +411,6 @@
*/
protected IdentificationVariable identificationVariable;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
identificationVariable = expression;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericTypeHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericTypeHelper.java
index 5a681b6..f51c2a2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericTypeHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericTypeHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,401 +45,251 @@
this.delegate = delegate;
}
- /**
- * {@inheritDoc}
- */
@Override
public IType bigDecimal() {
return delegate.bigDecimal();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType bigInteger() {
return delegate.bigInteger();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType booleanType() {
return delegate.booleanType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType byteType() {
return delegate.byteType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType characterType() {
return delegate.characterType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType collectionType() {
return delegate.collectionType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType convertPrimitive(Object type) {
return delegate.convertPrimitive((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType dateType() {
return delegate.dateType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType doubleType() {
return delegate.doubleType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType enumType() {
return delegate.enumType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType floatType() {
return delegate.floatType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType(Class<?> type) {
return delegate.getType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType(String typeName) {
return delegate.getType(typeName);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType integerType() {
return delegate.integerType();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isBooleanType(Object type) {
return delegate.isBooleanType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isCollectionType(Object type) {
return delegate.isCollectionType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isDateType(Object type) {
return delegate.isDateType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEnumType(Object type) {
return delegate.isEnumType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isFloatingType(Object type) {
return delegate.isFloatingType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isIntegralType(Object type) {
return delegate.isIntegralType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isMapType(Object type) {
return delegate.isMapType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isNumericType(Object type) {
return delegate.isNumericType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isObjectType(Object type) {
return delegate.isObjectType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isPrimitiveType(Object type) {
return delegate.isPrimitiveType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isStringType(Object type) {
return delegate.isStringType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType longType() {
return delegate.longType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType longType(Object type) {
return delegate.longType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType mapType() {
return delegate.mapType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType numberType() {
return delegate.numberType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType objectType() {
return delegate.objectType();
}
- /**
- * {@inheritDoc}
- */
@Override
public ITypeDeclaration objectTypeDeclaration() {
return delegate.objectTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType primitiveBoolean() {
return delegate.primitiveBoolean();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType primitiveByte() {
return delegate.primitiveByte();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType primitiveChar() {
return delegate.primitiveChar();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType primitiveDouble() {
return delegate.primitiveDouble();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType primitiveFloat() {
return delegate.primitiveFloat();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType primitiveInteger() {
return delegate.primitiveInteger();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType primitiveLong() {
return delegate.primitiveLong();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType primitiveShort() {
return delegate.primitiveShort();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType shortType() {
return delegate.shortType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType stringType() {
return delegate.stringType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType timestampType() {
return delegate.timestampType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType toBooleanType(Object type) {
return delegate.toBooleanType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType toByteType(Object type) {
return delegate.toByteType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType toDoubleType(Object type) {
return delegate.toDoubleType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType toFloatType(Object type) {
return delegate.toFloatType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType toIntegerType(Object type) {
return delegate.toIntegerType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType toShortType(Object type) {
return delegate.toShortType((IType) type);
}
- /**
- * {@inheritDoc}
- */
@Override
public IType unknownType() {
return delegate.unknownType();
}
- /**
- * {@inheritDoc}
- */
@Override
public ITypeDeclaration unknownTypeDeclaration() {
return delegate.unknownTypeDeclaration();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/JPQLQueryContext.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/JPQLQueryContext.java
index 88c4b5f..7fc0657 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/JPQLQueryContext.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/JPQLQueryContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -897,9 +897,6 @@
this.contexts.put(currentQuery, this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -930,9 +927,6 @@
*/
protected String parameterName;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
if (parameterName.equals(expression.getParameter())) {
@@ -940,9 +934,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
newSubqueryContext(expression);
@@ -967,17 +958,11 @@
*/
protected Expression expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
this.expression = expression;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/NumericTypeComparator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/NumericTypeComparator.java
index d88790b..981c488 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/NumericTypeComparator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/NumericTypeComparator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
this.typeHelper = typeHelper;
}
- /**
- * {@inheritDoc}
- */
@Override
public int compare(IType type1, IType type2) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/RefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/RefactoringTool.java
index 032fd63..58dfc21 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/RefactoringTool.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/RefactoringTool.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -364,9 +364,6 @@
this.jpqlQueryFormatter = jpqlQueryFormatter;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toActualText() {
return getFormatter().toString(getStateObject());
@@ -441,17 +438,11 @@
return pathExpressionUpdater;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpressionStateObject stateObject) {
visit(stateObject, stateObject.getClassName(), constructorUpdater());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpressionStateObject stateObject) {
visit(stateObject, stateObject.getPath(), pathExpressionUpdater());
@@ -554,9 +545,6 @@
this.newEntityName = newEntityName;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaNameStateObject stateObject) {
if (oldEntityName.equals(stateObject.getText())) {
@@ -564,9 +552,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteralStateObject stateObject) {
if (oldEntityName.equals(stateObject.getText())) {
@@ -574,9 +559,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableStateObject stateObject) {
if (oldEntityName.equals(stateObject.getText())) {
@@ -584,9 +566,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpressionStateObject stateObject) {
if (oldEntityName.equals(stateObject.getEntityTypeName())) {
@@ -646,17 +625,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpressionStateObject stateObject) {
renameEnumConstant(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpressionStateObject stateObject) {
renameEnumConstant(stateObject);
@@ -739,17 +712,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpressionStateObject stateObject) {
rename(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpressionStateObject stateObject) {
rename(stateObject);
@@ -788,9 +755,6 @@
this.newVariableName = newVariableName;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableStateObject stateObject) {
@@ -801,9 +765,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLQueryStateObject stateObject) {
if (stateObject.hasQueryStatement()) {
@@ -811,9 +772,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItemStateObject stateObject) {
if (stateObject.hasStateObject()) {
@@ -821,9 +779,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariableStateObject stateObject) {
if (oldVariableName.equalsIgnoreCase(stateObject.getResultVariable())) {
@@ -831,9 +786,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatementStateObject stateObject) {
@@ -894,9 +846,6 @@
this.newVariableName = newVariableName;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpressionStateObject stateObject) {
@@ -906,9 +855,6 @@
super.visit(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableStateObject stateObject) {
if (oldVariableName.equalsIgnoreCase(stateObject.getText())) {
@@ -916,9 +862,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpressionStateObject stateObject) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractActualJPQLQueryFormatter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractActualJPQLQueryFormatter.java
index a6d624c..c806900 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractActualJPQLQueryFormatter.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractActualJPQLQueryFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -718,49 +718,31 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaNameStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpressionStateObject stateObject) {
toStringCompound(stateObject, PLUS);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpressionStateObject stateObject) {
toStringCompound(stateObject, AND);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactorStateObject stateObject) {
@@ -776,25 +758,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpressionStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpressionStateObject stateObject) {
@@ -848,9 +821,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpressionStateObject stateObject) {
@@ -910,9 +880,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpressionStateObject stateObject) {
@@ -942,9 +909,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclarationStateObject stateObject) {
@@ -999,9 +963,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpressionStateObject stateObject) {
@@ -1044,25 +1005,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpressionStateObject stateObject) {
toStringPathExpression(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpressionStateObject stateObject) {
toStringCompound(stateObject, stateObject.getIdentifier());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpressionStateObject stateObject) {
@@ -1089,9 +1041,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpressionStateObject stateObject) {
@@ -1125,17 +1074,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTimeStateObject stateObject) {
@@ -1148,9 +1091,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClauseStateObject stateObject) {
@@ -1181,41 +1121,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatementStateObject stateObject) {
toStringModifyStatement(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DerivedPathIdentificationVariableDeclarationStateObject stateObject) {
toStringIdentificationVariableDeclaration(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DerivedPathVariableDeclarationStateObject stateObject) {
toStringRangeVariableDeclaration(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpressionStateObject stateObject) {
toStringCompound(stateObject, DIVISION);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) {
@@ -1243,33 +1168,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteralStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpressionStateObject stateObject) {
toStringEncapsulatedIdentificationVariable(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EnumTypeStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpressionStateObject stateObject) {
@@ -1311,17 +1224,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClauseStateObject stateObject) {
toStringFromClause(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpressionStateObject stateObject) {
@@ -1366,9 +1273,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClauseStateObject stateObject) {
@@ -1392,9 +1296,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClauseStateObject stateObject) {
@@ -1420,33 +1321,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclarationStateObject stateObject) {
toStringIdentificationVariableDeclaration(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpressionStateObject stateObject) {
toStringEncapsulatedIdentificationVariable(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpressionStateObject stateObject) {
@@ -1487,17 +1376,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameterStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JoinStateObject stateObject) {
@@ -1545,9 +1428,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLQueryStateObject stateObject) {
@@ -1559,17 +1439,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpressionStateObject stateObject) {
toStringEncapsulatedIdentificationVariable(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpressionStateObject stateObject) {
@@ -1582,17 +1456,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpressionStateObject stateObject) {
@@ -1651,57 +1519,36 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpressionStateObject stateObject) {
toStringTripleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpressionStateObject stateObject) {
toStringDoubleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpressionStateObject stateObject) {
toStringCompound(stateObject, MULTIPLICATION);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpressionStateObject stateObject) {
@@ -1725,9 +1572,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpressionStateObject stateObject) {
@@ -1758,33 +1602,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpressionStateObject stateObject) {
toStringDoubleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteralStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpressionStateObject stateObject) {
toStringEncapsulatedIdentificationVariable(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClauseStateObject stateObject) {
@@ -1808,9 +1640,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItemStateObject stateObject) {
@@ -1844,25 +1673,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpressionStateObject stateObject) {
toStringCompound(stateObject, OR);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclarationStateObject stateObject) {
toStringRangeVariableDeclaration(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariableStateObject stateObject) {
@@ -1903,9 +1723,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClauseStateObject stateObject) {
@@ -1938,9 +1755,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatementStateObject stateObject) {
@@ -1967,17 +1781,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClauseStateObject stateObject) {
toStringFromClause(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClauseStateObject stateObject) {
@@ -2010,9 +1818,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatementStateObject stateObject) {
@@ -2024,73 +1829,46 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpressionStateObject stateObject) {
toStringPathExpression(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteralStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpressionStateObject stateObject) {
toStringTripleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpressionStateObject stateObject) {
toStringCompound(stateObject, MINUS);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpressionStateObject stateObject) {
@@ -2135,9 +1913,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpressionStateObject stateObject) {
@@ -2206,25 +1981,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpressionStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClauseStateObject stateObject) {
@@ -2264,9 +2030,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItemStateObject stateObject) {
@@ -2299,33 +2062,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatementStateObject stateObject) {
toStringModifyStatement(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpressionStateObject stateObject) {
toStringEncapsulatedIdentificationVariable(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClauseStateObject stateObject) {
@@ -2367,9 +2118,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClauseStateObject stateObject) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractCaseExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractCaseExpressionStateObjectBuilder.java
index 9a81230..9c0b8df 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractCaseExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractCaseExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,9 +47,6 @@
caseExpressionStateObject = new CaseExpressionStateObject(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public CaseExpressionStateObject buildStateObject() {
caseExpressionStateObject.setElse(pop());
@@ -59,9 +56,6 @@
return caseExpressionStateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public ICaseExpressionStateObjectBuilder when(ICaseExpressionStateObjectBuilder when,
ICaseExpressionStateObjectBuilder then) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalExpressionStateObjectBuilder.java
index ab1cb27..5193a3b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,9 +63,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public T all(SimpleSelectStatementStateObject subquery) {
allOrAny(ALL, subquery);
@@ -77,9 +74,6 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T and(T builder) {
@@ -98,9 +92,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T any(SimpleSelectStatementStateObject subquery) {
allOrAny(ANY, subquery);
@@ -124,9 +115,6 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T between(T lowerBoundExpression, T upperBoundExpression) {
checkBuilders(lowerBoundExpression, upperBoundExpression);
@@ -134,9 +122,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T collectionPath(String path) {
StateObject stateObject = buildCollectionPath(path);
@@ -162,27 +147,18 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T different(Number number) {
comparison(DIFFERENT, buildNumeric(number));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T different(String literal) {
comparison(DIFFERENT, literal(literal));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T different(T builder) {
checkBuilder(builder);
@@ -190,27 +166,18 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T equal(Number number) {
comparison(EQUAL, buildNumeric(number));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T equal(String literal) {
comparison(EQUAL, literal(literal));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T equal(T builder) {
checkBuilder(builder);
@@ -223,45 +190,30 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T exists(SimpleSelectStatementStateObject subquery) {
exists(false, subquery);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T FALSE() {
keyword(FALSE);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T greaterThan(Number number) {
comparison(GREATER_THAN, buildNumeric(number));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T greaterThan(String literal) {
comparison(GREATER_THAN, literal(literal));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T greaterThan(T builder) {
checkBuilder(builder);
@@ -269,27 +221,18 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T greaterThanOrEqual(Number number) {
comparison(GREATER_THAN_OR_EQUAL, buildNumeric(number));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T greaterThanOrEqual(String literal) {
comparison(GREATER_THAN_OR_EQUAL, literal(literal));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T greaterThanOrEqual(T builder) {
checkBuilder(builder);
@@ -319,27 +262,18 @@
in(false, stateObjects(inItems));
}
- /**
- * {@inheritDoc}
- */
@Override
public T in(SimpleSelectStatementStateObject subquery) {
in(false, Collections.<StateObject>singletonList(subquery));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T in(String... inItems) {
in(false, inItems);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T in(T... inItems) {
checkBuilders(inItems);
@@ -358,27 +292,18 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T isEmpty(String path) {
isEmpty(false, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T isNotEmpty(String path) {
isEmpty(true, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T isNotNull(String path) {
isNull(true, path);
@@ -405,9 +330,6 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T isNull(String path) {
isNull(false, path);
@@ -435,18 +357,12 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T like(String patternValue) {
like(string(patternValue));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T like(T patternValue) {
checkBuilder(patternValue);
@@ -454,9 +370,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T like(T patternValue, String escapeCharacter) {
checkBuilder(patternValue);
@@ -464,9 +377,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T lower(T builder) {
checkBuilder(builder);
@@ -475,27 +385,18 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T lowerThan(Number number) {
comparison(LOWER_THAN, buildNumeric(number));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T lowerThan(String literal) {
comparison(LOWER_THAN, literal(literal));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T lowerThan(T builder) {
checkBuilder(builder);
@@ -503,27 +404,18 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T lowerThanOrEqual(Number number) {
comparison(LOWER_THAN_OR_EQUAL, buildNumeric(number));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T lowerThanOrEqual(String literal) {
comparison(LOWER_THAN_OR_EQUAL, literal(literal));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T lowerThanOrEqual(T builder) {
checkBuilder(builder);
@@ -546,27 +438,18 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T member(String path) {
member(false, false, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T memberOf(String path) {
member(false, true, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notBetween(T lowerBoundExpression, T upperBoundExpression) {
checkBuilders(lowerBoundExpression, upperBoundExpression);
@@ -574,36 +457,24 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notExists(SimpleSelectStatementStateObject subquery) {
exists(true, subquery);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notIn(SimpleSelectStatementStateObject subquery) {
in(true, Collections.<StateObject>singletonList(subquery));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notIn(String... inItems) {
in(true, inItems);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notIn(T... inItems) {
checkBuilders(inItems);
@@ -611,18 +482,12 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notLike(String patternValue) {
notLike(string(patternValue));
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notLike(T builder) {
checkBuilder(builder);
@@ -630,9 +495,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notLike(T builder, String escapeCharacter) {
checkBuilder(builder);
@@ -640,36 +502,24 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notMember(String path) {
member(true, false, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T notMemberOf(String path) {
member(true, true, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T NULL() {
keyword(NULL);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T or(T builder) {
@@ -688,18 +538,12 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T some(SimpleSelectStatementStateObject subquery) {
allOrAny(SOME, subquery);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T sub(StateObject stateObject) {
stateObject = new SubExpressionStateObject(getParent(), stateObject);
@@ -707,9 +551,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T substring(T parameter1, T parameter2, T parameter3) {
@@ -730,9 +571,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T trim(Specification specification, String trimCharacter, T builder) {
@@ -750,26 +588,17 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T trim(Specification specification, T builder) {
return trim(specification, null, builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public T TRUE() {
keyword(TRUE);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T upper(T builder) {
checkBuilder(builder);
@@ -778,9 +607,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T variable(String variable) {
StateObject stateObject = buildIdentificationVariable(variable);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalStateObjectBuilderWrapper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalStateObjectBuilderWrapper.java
index 47b8285..b747bf0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalStateObjectBuilderWrapper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalStateObjectBuilderWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,65 +46,41 @@
this.delegate = delegate;
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder abs(IConditionalExpressionStateObjectBuilder builder) {
return delegate.abs(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder add(IConditionalExpressionStateObjectBuilder builder) {
return delegate.add(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder all(SimpleSelectStatementStateObject subquery) {
return delegate.all(subquery);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder and(IConditionalExpressionStateObjectBuilder builder) {
return delegate.and(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder any(SimpleSelectStatementStateObject subquery) {
return delegate.any(subquery);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder avg(String path) {
return delegate.avg(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder avgDistinct(String path) {
return delegate.avgDistinct(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder between(IConditionalExpressionStateObjectBuilder lowerBoundExpression,
IConditionalExpressionStateObjectBuilder upperBoundExpression) {
@@ -112,281 +88,176 @@
return delegate.between(lowerBoundExpression, upperBoundExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder collectionPath(String path) {
return delegate.collectionPath(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void commit() {
delegate.commit();
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder count(String path) {
return delegate.count(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder countDistinct(String path) {
return delegate.countDistinct(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder currentDate() {
return delegate.currentDate();
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder currentTime() {
return delegate.currentTime();
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder currentTimestamp() {
return delegate.currentTimestamp();
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder date(String jdbcDate) {
return delegate.date(jdbcDate);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder different(IConditionalExpressionStateObjectBuilder builder) {
return delegate.different(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder different(Number number) {
return delegate.different(number);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder different(String literal) {
return delegate.different(literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder divide(IConditionalExpressionStateObjectBuilder builder) {
return delegate.divide(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder entityType(String entityTypeName) {
return delegate.entityType(entityTypeName);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder equal(IConditionalExpressionStateObjectBuilder builder) {
return delegate.equal(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder equal(Number number) {
return delegate.equal(number);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder equal(String literal) {
return delegate.equal(literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder exists(SimpleSelectStatementStateObject subquery) {
return delegate.exists(subquery);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder FALSE() {
return delegate.FALSE();
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder greaterThan(IConditionalExpressionStateObjectBuilder builder) {
return delegate.greaterThan(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder greaterThan(Number number) {
return delegate.greaterThan(number);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder greaterThan(String literal) {
return delegate.greaterThan(literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder greaterThanOrEqual(IConditionalExpressionStateObjectBuilder builder) {
return delegate.greaterThanOrEqual(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder greaterThanOrEqual(Number number) {
return delegate.greaterThanOrEqual(number);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder greaterThanOrEqual(String literal) {
return delegate.greaterThanOrEqual(literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder in(IConditionalExpressionStateObjectBuilder... inItems) {
return delegate.in(inItems);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder in(SimpleSelectStatementStateObject subquery) {
return delegate.in(subquery);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder in(String... inItems) {
return delegate.in(inItems);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder index(String variable) {
return delegate.index(variable);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder isEmpty(String path) {
return delegate.isEmpty(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder isNotEmpty(String path) {
return delegate.isNotEmpty(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder isNotNull(String path) {
return delegate.isNotNull(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder isNull(String path) {
return delegate.isNull(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder length(IConditionalExpressionStateObjectBuilder builder) {
return delegate.length(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder like(IConditionalExpressionStateObjectBuilder patternValue) {
return delegate.like(patternValue);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder like(IConditionalExpressionStateObjectBuilder patternValue,
String escapeCharacter) {
@@ -394,17 +265,11 @@
return delegate.like(patternValue, escapeCharacter);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder like(String patternValue) {
return delegate.like(patternValue);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder locate(IConditionalExpressionStateObjectBuilder parameter1,
IConditionalExpressionStateObjectBuilder parameter2) {
@@ -412,9 +277,6 @@
return delegate.locate(parameter1, parameter2);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder locate(IConditionalExpressionStateObjectBuilder parameter1,
IConditionalExpressionStateObjectBuilder parameter2, IConditionalExpressionStateObjectBuilder parameter3) {
@@ -422,121 +284,76 @@
return delegate.locate(parameter1, parameter2);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder lower(IConditionalExpressionStateObjectBuilder builder) {
return delegate.lower(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder lowerThan(IConditionalExpressionStateObjectBuilder builder) {
return delegate.lowerThan(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder lowerThan(Number number) {
return delegate.lowerThan(number);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder lowerThan(String literal) {
return delegate.lowerThan(literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder lowerThanOrEqual(IConditionalExpressionStateObjectBuilder builder) {
return delegate.lowerThanOrEqual(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder lowerThanOrEqual(Number number) {
return delegate.lowerThanOrEqual(number);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder lowerThanOrEqual(String literal) {
return delegate.lowerThanOrEqual(literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder max(String path) {
return delegate.max(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder maxDistinct(String path) {
return delegate.maxDistinct(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder member(String path) {
return delegate.member(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder memberOf(String path) {
return delegate.memberOf(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder min(String path) {
return delegate.min(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder minDistinct(String path) {
return delegate.minDistinct(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder minus(IConditionalExpressionStateObjectBuilder builder) {
return delegate.minus(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder mod(IConditionalExpressionStateObjectBuilder parameter1,
IConditionalExpressionStateObjectBuilder parameter2) {
@@ -544,17 +361,11 @@
return delegate.mod(parameter1, parameter2);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder multiply(IConditionalExpressionStateObjectBuilder builder) {
return delegate.multiply(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notBetween(IConditionalExpressionStateObjectBuilder lowerBoundExpression,
IConditionalExpressionStateObjectBuilder upperBoundExpression) {
@@ -562,49 +373,31 @@
return delegate.notBetween(lowerBoundExpression, upperBoundExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notExists(SimpleSelectStatementStateObject subquery) {
return delegate.notExists(subquery);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notIn(IConditionalExpressionStateObjectBuilder... inItems) {
return delegate.notIn(inItems);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notIn(SimpleSelectStatementStateObject subquery) {
return delegate.notIn(subquery);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notIn(String... inItems) {
return delegate.notIn(inItems);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notLike(IConditionalExpressionStateObjectBuilder builder) {
return delegate.notLike(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notLike(IConditionalExpressionStateObjectBuilder builder,
String escapeCharacter) {
@@ -612,161 +405,101 @@
return delegate.notLike(builder, escapeCharacter);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notLike(String patternValue) {
return delegate.notLike(patternValue);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notMember(String path) {
return delegate.notMember(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder notMemberOf(String path) {
return delegate.notMemberOf(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder NULL() {
return delegate.NULL();
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder numeric(Number numeric) {
return delegate.numeric(numeric);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder or(IConditionalExpressionStateObjectBuilder builder) {
return delegate.or(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder parameter(String parameter) {
return delegate.parameter(parameter);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder path(String path) {
return delegate.path(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder plus(IConditionalExpressionStateObjectBuilder builder) {
return delegate.plus(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder size(String path) {
return delegate.size(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder some(SimpleSelectStatementStateObject subquery) {
return delegate.some(subquery);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder sqrt(IConditionalExpressionStateObjectBuilder builder) {
return delegate.sqrt(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder string(String literal) {
return delegate.string(literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder sub(IConditionalExpressionStateObjectBuilder builder) {
return delegate.sub(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder sub(StateObject stateObject) {
return delegate.sub(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder substring(IConditionalExpressionStateObjectBuilder parameter1, IConditionalExpressionStateObjectBuilder parameter2, IConditionalExpressionStateObjectBuilder parameter3) {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder subtract(IConditionalExpressionStateObjectBuilder builder) {
return delegate.subtract(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder sum(String path) {
return delegate.sum(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder sumDistinct(String path) {
return delegate.sumDistinct(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder trim(Specification specification,
IConditionalExpressionStateObjectBuilder builder) {
@@ -774,9 +507,6 @@
return delegate.trim(specification, builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder trim(Specification specification,
String trimCharacter,
@@ -785,33 +515,21 @@
return delegate.trim(specification, trimCharacter, builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder TRUE() {
return delegate.TRUE();
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder type(String path) {
return delegate.type(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder upper(IConditionalExpressionStateObjectBuilder builder) {
return delegate.upper(builder);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder variable(String variable) {
return delegate.variable(variable);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSelectExpressionStateObjectBuilder.java
index f6db40e..c3e6fb2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSelectExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSelectExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,17 +35,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public IEclipseLinkSelectExpressionStateObjectBuilder append() {
return (IEclipseLinkSelectExpressionStateObjectBuilder) super.append();
}
- /**
- * {@inheritDoc}
- */
@Override
public IEclipseLinkSelectExpressionStateObjectBuilder new_(String className,
ISelectExpressionStateObjectBuilder... parameters) {
@@ -53,33 +47,21 @@
return (IEclipseLinkSelectExpressionStateObjectBuilder) super.new_(className, parameters);
}
- /**
- * {@inheritDoc}
- */
@Override
public IEclipseLinkSelectExpressionStateObjectBuilder object(String identificationVariable) {
return (IEclipseLinkSelectExpressionStateObjectBuilder) super.object(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public IEclipseLinkSelectExpressionStateObjectBuilder resultVariable(String resultVariable) {
return (IEclipseLinkSelectExpressionStateObjectBuilder) super.resultVariable(resultVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public IEclipseLinkSelectExpressionStateObjectBuilder resultVariableAs(String resultVariable) {
return (IEclipseLinkSelectExpressionStateObjectBuilder) super.resultVariableAs(resultVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public IEclipseLinkSelectExpressionStateObjectBuilder variable(String variable) {
StateObject stateObject = buildIdentificationVariable(variable);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSimpleSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSimpleSelectExpressionStateObjectBuilder.java
index 062a883..105f5b9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSimpleSelectExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSimpleSelectExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,25 +34,16 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void commit() {
getParent().setSelectItem(pop());
}
- /**
- * {@inheritDoc}
- */
@Override
protected SimpleSelectClauseStateObject getParent() {
return (SimpleSelectClauseStateObject) super.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public IEclipseLinkSimpleSelectExpressionStateObjectBuilder variable(String variable) {
return (IEclipseLinkSimpleSelectExpressionStateObjectBuilder) super.variable(variable);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryBuilder.java
index 89e8f8e..73a8d14 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,17 +46,11 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public ICaseExpressionStateObjectBuilder buildCaseExpressionStateObjectBuilder(StateObject parent) {
return new DefaultCaseExpressionStateObjectBuilder(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider,
CharSequence jpqlQuery,
@@ -65,9 +59,6 @@
return buildStateObject(provider, jpqlQuery, JPQLStatementBNF.ID, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider,
CharSequence jpqlQuery,
@@ -96,9 +87,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject buildStateObject(StateObject parent,
CharSequence jpqlFragment,
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryFormatter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryFormatter.java
index f186f86..ff523a5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryFormatter.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -424,49 +424,31 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaNameStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpressionStateObject stateObject) {
toStringCompound(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpressionStateObject stateObject) {
toStringCompound(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactorStateObject stateObject) {
if (stateObject.isDecorated()) {
@@ -480,25 +462,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpressionStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpressionStateObject stateObject) {
@@ -533,9 +506,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpressionStateObject stateObject) {
@@ -568,9 +538,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpressionStateObject stateObject) {
@@ -595,9 +562,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclarationStateObject stateObject) {
@@ -633,9 +597,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpressionStateObject stateObject) {
@@ -666,25 +627,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpressionStateObject stateObject) {
toStringPathExpression(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpressionStateObject stateObject) {
toStringCompound(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpressionStateObject stateObject) {
@@ -700,9 +652,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpressionStateObject stateObject) {
@@ -729,17 +678,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTimeStateObject stateObject) {
@@ -751,9 +694,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClauseStateObject stateObject) {
@@ -767,41 +707,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatementStateObject stateObject) {
toStringModifyStatement(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DerivedPathIdentificationVariableDeclarationStateObject stateObject) {
toStringIdentificationVariableDeclaration(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DerivedPathVariableDeclarationStateObject stateObject) {
toStringRangeVariableDeclaration(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpressionStateObject stateObject) {
toStringCompound(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) {
@@ -815,33 +740,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteralStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpressionStateObject stateObject) {
toStringEncapsulatedIdentificationVariable(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EnumTypeStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpressionStateObject stateObject) {
@@ -872,17 +785,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClauseStateObject stateObject) {
toStringFromClause(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpressionStateObject stateObject) {
@@ -906,9 +813,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClauseStateObject stateObject) {
@@ -926,33 +830,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClauseStateObject stateObject) {
toStringConditional(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclarationStateObject stateObject) {
toStringIdentificationVariableDeclaration(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpressionStateObject stateObject) {
@@ -969,9 +861,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpressionStateObject stateObject) {
@@ -1010,17 +899,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameterStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JoinStateObject stateObject) {
@@ -1043,25 +926,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLQueryStateObject stateObject) {
toText(stateObject.getQueryStatement());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpressionStateObject stateObject) {
toStringEncapsulatedIdentificationVariable(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpressionStateObject stateObject) {
@@ -1073,17 +947,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpressionStateObject stateObject) {
@@ -1113,57 +981,36 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpressionStateObject stateObject) {
toStringTripleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpressionStateObject stateObject) {
toStringDoubleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpressionStateObject stateObject) {
toStringCompound(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpressionStateObject stateObject) {
@@ -1181,9 +1028,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpressionStateObject stateObject) {
@@ -1201,33 +1045,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpressionStateObject stateObject) {
toStringDoubleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteralStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpressionStateObject stateObject) {
toStringEncapsulatedIdentificationVariable(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClauseStateObject stateObject) {
@@ -1245,9 +1077,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItemStateObject stateObject) {
@@ -1267,25 +1096,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpressionStateObject stateObject) {
toStringCompound(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclarationStateObject stateObject) {
toStringRangeVariableDeclaration(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariableStateObject stateObject) {
@@ -1313,9 +1133,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClauseStateObject stateObject) {
@@ -1338,9 +1155,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatementStateObject stateObject) {
@@ -1352,17 +1166,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClauseStateObject stateObject) {
toStringFromClause(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClauseStateObject stateObject) {
@@ -1385,81 +1193,51 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatementStateObject stateObject) {
toStringSelectStatement(stateObject, false);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpressionStateObject stateObject) {
toStringPathExpression(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteralStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpressionStateObject stateObject) {
toStringTripleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpressionStateObject stateObject) {
toStringCompound(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunctionStateObject stateObject) {
toStringAggregateFunction(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpressionStateObject stateObject) {
@@ -1492,9 +1270,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpressionStateObject stateObject) {
@@ -1539,25 +1314,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpressionStateObject stateObject) {
toStringSimpleStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClauseStateObject stateObject) {
@@ -1579,9 +1345,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItemStateObject stateObject) {
@@ -1602,33 +1365,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatementStateObject stateObject) {
toStringModifyStatement(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpressionStateObject stateObject) {
toStringSingleEncapsulated(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpressionStateObject stateObject) {
toStringEncapsulatedIdentificationVariable(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClauseStateObject stateObject) {
@@ -1654,9 +1405,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClauseStateObject stateObject) {
toStringConditional(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractNewValueStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractNewValueStateObjectBuilder.java
index e5162a7..02e924c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractNewValueStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractNewValueStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,25 +38,16 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void commit() {
getParent().setNewValue(pop());
}
- /**
- * {@inheritDoc}
- */
@Override
protected UpdateItemStateObject getParent() {
return (UpdateItemStateObject) super.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public INewValueStateObjectBuilder NULL() {
StateObject stateObject = new KeywordExpressionStateObject(getParent(), NULL);
@@ -64,9 +55,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public INewValueStateObjectBuilder variable(String variable) {
StateObject stateObject = buildIdentificationVariable(variable);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractScalarExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractScalarExpressionStateObjectBuilder.java
index 8fa569e..88ac4fa 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractScalarExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractScalarExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,9 +88,6 @@
this.parent = parent;
}
- /**
- * {@inheritDoc}
- */
@Override
public T abs(T builder) {
@@ -101,9 +98,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T add(T builder) {
@@ -132,18 +126,12 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T avg(String path) {
avg(false, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T avgDistinct(String path) {
avg(true, path);
@@ -178,9 +166,6 @@
return new StringLiteralStateObject(parent, literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public T case_(ICaseExpressionStateObjectBuilder builder) {
Assert.isEqual(caseBuilder, builder, "The Case expression builder is not the same as the current one");
@@ -189,9 +174,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T coalesce(T builder1, T builder2, T... builders) {
@@ -208,9 +190,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T concat(T builder1, T builder2, T... builders) {
@@ -232,51 +211,33 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T count(String path) {
count(false, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T countDistinct(String path) {
count(true, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T currentDate() {
return date(CURRENT_DATE);
}
- /**
- * {@inheritDoc}
- */
@Override
public T currentTime() {
return date(CURRENT_TIME);
}
- /**
- * {@inheritDoc}
- */
@Override
public T currentTimestamp() {
return date(CURRENT_TIMESTAMP);
}
- /**
- * {@inheritDoc}
- */
@Override
public T date(String jdbcDate) {
StateObject stateObject = new DateTimeStateObject(parent, jdbcDate);
@@ -284,9 +245,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T divide(T builder) {
@@ -305,9 +263,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T entityType(String entityTypeName) {
StateObject stateObject = new EntityTypeLiteralStateObject(parent,entityTypeName);
@@ -315,9 +270,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T enumLiteral(Enum<? extends Enum<?>> enumConstant) {
StateObject stateObject = new EnumTypeStateObject(parent, enumConstant);
@@ -325,9 +277,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T function(String identifier, String functionName, String... arguments) {
@@ -342,9 +291,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T function(String identifier, String functionName, T... arguments) {
@@ -361,9 +307,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public ICaseExpressionStateObjectBuilder getCaseBuilder() {
if (caseBuilder == null) {
@@ -382,9 +325,6 @@
return parent;
}
- /**
- * {@inheritDoc}
- */
@Override
public T index(String variable) {
StateObject stateObject = new IndexExpressionStateObject(parent, variable);
@@ -392,9 +332,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T length(T builder) {
@@ -442,17 +379,11 @@
return stateObjects;
}
- /**
- * {@inheritDoc}
- */
@Override
public T locate(T parameter1, T parameter2) {
return locate(parameter1, parameter2, null);
}
- /**
- * {@inheritDoc}
- */
@Override
public T locate(T parameter1, T parameter2, T parameter3) {
@@ -482,18 +413,12 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T max(String path) {
max(false, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T maxDistinct(String path) {
max(true, path);
@@ -505,27 +430,18 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T min(String path) {
min(false, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T minDistinct(String path) {
min(true, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T minus(T builder) {
checkBuilders(builder);
@@ -533,9 +449,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T mod(T parameter1, T parameter2) {
@@ -554,9 +467,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T multiply(T builder) {
@@ -575,9 +485,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T nullIf(T builder1, T builder2) {
@@ -596,9 +503,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T numeric(Number number) {
StateObject stateObject = buildNumeric(number);
@@ -606,9 +510,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T numeric(String number) {
StateObject stateObject = buildNumeric(number);
@@ -616,9 +517,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T parameter(String parameter) {
StateObject stateObject = buildInputParameter(parameter);
@@ -626,9 +524,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T path(String path) {
StateObject stateObject = buildStateFieldPath(path);
@@ -636,9 +531,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T plus(T builder) {
checkBuilders(builder);
@@ -646,9 +538,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T size(String path) {
StateObject stateObject = new SizeExpressionStateObject(parent, buildCollectionPath(path));
@@ -656,9 +545,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T sqrt(T builder) {
@@ -701,9 +587,6 @@
return stateObjects(builders.length);
}
- /**
- * {@inheritDoc}
- */
@Override
public T string(String literal) {
StateObject stateObject = buildStringLiteral(literal);
@@ -711,9 +594,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T sub(T builder) {
@@ -724,9 +604,6 @@
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T subtract(T builder) {
@@ -750,27 +627,18 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T sum(String path) {
sum(false, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T sumDistinct(String path) {
sum(true, path);
return (T) this;
}
- /**
- * {@inheritDoc}
- */
@Override
public T type(String path) {
StateObject stateObject = new TypeExpressionStateObject(parent, path);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSelectExpressionStateObjectBuilder.java
index ed078ba..9ea6389 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSelectExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSelectExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,18 +46,12 @@
stateObjectList = new ArrayList<StateObject>();
}
- /**
- * {@inheritDoc}
- */
@Override
public ISelectExpressionStateObjectBuilder append() {
stateObjectList.add(pop());
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public void commit() {
if (hasStateObjects()) {
@@ -66,17 +60,11 @@
getParent().addItems(stateObjectList);
}
- /**
- * {@inheritDoc}
- */
@Override
protected SelectClauseStateObject getParent() {
return (SelectClauseStateObject) super.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public ISelectExpressionStateObjectBuilder new_(String className,
ISelectExpressionStateObjectBuilder... parameters) {
@@ -92,9 +80,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public ISelectExpressionStateObjectBuilder object(String identificationVariable) {
StateObject stateObject = new ObjectExpressionStateObject(getParent(), identificationVariable);
@@ -102,9 +87,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public ISelectExpressionStateObjectBuilder resultVariable(String resultVariable) {
resultVariable(resultVariable, false);
@@ -123,18 +105,12 @@
add(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public ISelectExpressionStateObjectBuilder resultVariableAs(String resultVariable) {
resultVariable(resultVariable, true);
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public ISelectExpressionStateObjectBuilder variable(String variable) {
StateObject stateObject = buildIdentificationVariable(variable);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSimpleSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSimpleSelectExpressionStateObjectBuilder.java
index 8c58121..c5c7646 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSimpleSelectExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSimpleSelectExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,17 +38,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSelectClauseStateObject getParent() {
return (AbstractSelectClauseStateObject) super.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public ISimpleSelectExpressionStateObjectBuilder variable(String variable) {
StateObject stateObject = buildIdentificationVariable(variable);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BaseJPQLQueryFormatter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BaseJPQLQueryFormatter.java
index dd50a98..c5e681e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BaseJPQLQueryFormatter.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BaseJPQLQueryFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -102,17 +102,11 @@
return style;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return writer.toString();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString(StateObject stateObject) {
writer.delete(0, writer.length());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BasicStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BasicStateObjectBuilder.java
index cb18612..fd56876 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BasicStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BasicStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -517,9 +517,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
@@ -530,9 +527,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
@@ -545,9 +539,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
@@ -567,9 +558,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
@@ -585,9 +573,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
@@ -607,9 +592,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
@@ -625,9 +607,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
@@ -643,9 +622,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
@@ -658,9 +634,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
@@ -685,9 +658,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
@@ -710,9 +680,6 @@
this.stateObject = caseExpressionStateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
@@ -725,9 +692,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -742,18 +706,12 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
// Not done here
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
@@ -772,9 +730,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
@@ -787,9 +742,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
@@ -810,9 +762,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
@@ -825,9 +774,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
@@ -841,9 +787,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
@@ -859,9 +802,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
DateTimeStateObject stateObject = new DateTimeStateObject(parent, expression.getText());
@@ -869,26 +809,17 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
// Done via DeleteStatementBuilder
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
stateObject = getDeleteStatementBuilder().buildStateObject(parent, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
@@ -908,9 +839,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
@@ -924,9 +852,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
@@ -939,9 +864,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
@@ -954,9 +876,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
@@ -972,18 +891,12 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(FromClause expression) {
// Not done here
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
@@ -998,26 +911,17 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(GroupByClause expression) {
// Not done here
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
expression.getConditionalExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -1031,9 +935,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(final IdentificationVariableDeclaration expression) {
@@ -1051,9 +952,6 @@
stateObject.accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
@@ -1066,9 +964,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -1086,9 +981,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
@@ -1101,9 +993,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(Join expression) {
stateObject = getJoinBuilder().buildStateObject(
@@ -1112,9 +1001,6 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
@@ -1125,9 +1011,6 @@
parent.setQueryStatement(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
@@ -1140,9 +1023,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
@@ -1155,9 +1035,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
@@ -1172,9 +1049,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
@@ -1196,9 +1070,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
@@ -1222,9 +1093,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
@@ -1239,9 +1107,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
@@ -1257,9 +1122,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
@@ -1275,9 +1137,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
@@ -1297,9 +1156,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
@@ -1319,9 +1175,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
@@ -1336,9 +1189,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -1354,17 +1204,11 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
@@ -1384,9 +1228,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
@@ -1399,9 +1240,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
@@ -1414,26 +1252,17 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
expression.getConditionalExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(OrderByClause expression) {
// Not done here
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(OrderByItem expression) {
@@ -1446,9 +1275,6 @@
orderByItem.setStateObject(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
@@ -1468,18 +1294,12 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(RangeVariableDeclaration expression) {
// Not done here
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(final ResultVariable expression) {
@@ -1496,52 +1316,34 @@
stateObject.accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SelectClause expression) {
// Not done here
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
stateObject = getSelectStatementBuilder().buildStateObject(parent, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SimpleFromClause expression) {
// Done via SimpleSelectStatementBuilder
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(SimpleSelectClause expression) {
// Done via SimpleSelectStatementBuilder
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
stateObject = getSimpleSelectStatementBuilder().buildStateObject(parent, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
@@ -1556,9 +1358,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
@@ -1573,9 +1372,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
@@ -1588,9 +1384,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
@@ -1603,9 +1396,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
@@ -1620,9 +1410,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
@@ -1646,9 +1433,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
@@ -1668,9 +1452,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
@@ -1686,17 +1467,11 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
// Done by JoinBuilder
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
@@ -1717,9 +1492,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
@@ -1734,9 +1506,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
@@ -1749,33 +1518,21 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(UpdateClause expression) {
// Done via UpdateStatementBuilder
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(UpdateItem expression) {
// Done via UpdateStatementBuilder
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
stateObject = getUpdateStatementBuilder().buildStateObject(parent, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
@@ -1790,9 +1547,6 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
@@ -1805,18 +1559,12 @@
this.stateObject = stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void visit(WhenClause expression) {
// Done throw WhenClauseBuilder
stateObject = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
expression.getConditionalExpression().accept(this);
@@ -1866,9 +1614,6 @@
*/
protected abstract AbstractIdentificationVariableDeclarationStateObject addRangeDeclaration(IdentificationVariableDeclaration expression);
- /**
- * {@inheritDoc}
- */
@Override
public AbstractIdentificationVariableDeclarationStateObject buildStateObject(S parent, Expression expression) {
try {
@@ -1882,17 +1627,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
stateObject.setRootPath(expression.getText());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -1903,9 +1642,6 @@
variable.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
@@ -1917,9 +1653,6 @@
expression.getRangeVariableDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
AbstractRangeVariableDeclarationStateObject declaration = stateObject.getRangeVariableDeclaration();
@@ -1947,9 +1680,6 @@
*/
protected T stateObject;
- /**
- * {@inheritDoc}
- */
@Override
public T buildStateObject(P parent, Expression expression) {
@@ -1963,17 +1693,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
getCollectionDeclarationBuilder().buildStateObject(stateObject.getFromClause(), expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
GroupByClauseStateObject groupByClause = stateObject.addGroupByClause();
@@ -1981,9 +1705,6 @@
groupByClause.addItems(buildChildren(expression.getGroupByItems()));
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
HavingClauseStateObject havingClause = stateObject.addHavingClause();
@@ -1991,15 +1712,9 @@
havingClause.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public abstract void visit(IdentificationVariableDeclaration expression);
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
WhereClauseStateObject whereClause = stateObject.addWhereClause();
@@ -2021,17 +1736,11 @@
children = new ArrayList<Expression>();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
CollectionTools.addAll(children, expression.children());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
children.add(expression);
@@ -2044,9 +1753,6 @@
protected AbstractFromClauseStateObject parent;
protected CollectionMemberDeclarationStateObject stateObject;
- /**
- * {@inheritDoc}
- */
@Override
public CollectionMemberDeclarationStateObject buildStateObject(AbstractFromClauseStateObject parent,
Expression expression) {
@@ -2062,9 +1768,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
stateObject = parent.addCollectionDeclaration();
@@ -2074,9 +1777,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
CollectionValuedPathExpressionStateObject path = stateObject.getCollectionValuedPath();
@@ -2084,9 +1784,6 @@
path.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
IdentificationVariableStateObject variable = stateObject.getIdentificationVariable();
@@ -2106,9 +1803,6 @@
protected JPQLQueryStateObject parent;
protected DeleteStatementStateObject stateObject;
- /**
- * {@inheritDoc}
- */
@Override
public DeleteStatementStateObject buildStateObject(JPQLQueryStateObject parent,
Expression expression) {
@@ -2123,9 +1817,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
AbstractSchemaNameStateObject entityStateObject = stateObject.getAbstractSchemaNameStateObject();
@@ -2133,18 +1824,12 @@
entityStateObject.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
stateObject.getModifyClause().setExpression(expression);
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
stateObject = parent.addDeleteStatement();
@@ -2152,9 +1837,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
IdentificationVariableStateObject variable = stateObject.getIdentificationVariableStateObject();
@@ -2163,18 +1845,12 @@
variable.setVirtual(expression.isVirtual());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
stateObject.getModifyClause().getRangeVariableDeclaration().setExpression(expression);
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
@@ -2194,9 +1870,6 @@
protected AbstractIdentificationVariableDeclarationStateObject parent;
protected JoinStateObject stateObject;
- /**
- * {@inheritDoc}
- */
@Override
public JoinStateObject buildStateObject(AbstractIdentificationVariableDeclarationStateObject parent,
Expression expression) {
@@ -2212,26 +1885,17 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
expression.getRangeVariableDeclaration().accept(this);
expression.getJoins().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -2248,9 +1912,6 @@
expression.getIdentificationVariable().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
@@ -2272,17 +1933,11 @@
*/
protected class RangeDeclarationBuilder extends AbstractRangeDeclarationBuilder<FromClauseStateObject> {
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractIdentificationVariableDeclarationStateObject addRangeDeclaration(IdentificationVariableDeclaration expression) {
return parent.addRangeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
super.visit(expression);
@@ -2301,9 +1956,6 @@
protected SelectClauseStateObject parent;
protected StateObject stateObject;
- /**
- * {@inheritDoc}
- */
@Override
public StateObject buildStateObject(SelectClauseStateObject parent, Expression expression) {
@@ -2318,18 +1970,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.accept(BasicStateObjectBuilder.this);
stateObject = BasicStateObjectBuilder.this.stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -2353,9 +1999,6 @@
*/
protected class SelectStatementBuilder extends AbstractSelectStatementBuilder<SelectStatementStateObject, JPQLQueryStateObject> {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
@@ -2366,17 +2009,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
getRangeDeclarationBuilder().buildStateObject(stateObject.getFromClause(), expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
@@ -2386,9 +2023,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
@@ -2401,9 +2035,6 @@
orderByItem.setStateObject(BasicStateObjectBuilder.this.stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
@@ -2421,9 +2052,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -2441,9 +2069,6 @@
*/
protected class SimpleRangeDeclarationBuilder extends AbstractRangeDeclarationBuilder<SimpleFromClauseStateObject> {
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractIdentificationVariableDeclarationStateObject addRangeDeclaration(IdentificationVariableDeclaration expression) {
@@ -2461,9 +2086,6 @@
return parent.addRangeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
DerivedPathIdentificationVariableDeclarationStateObject stateObject = (DerivedPathIdentificationVariableDeclarationStateObject) this.stateObject;
@@ -2478,17 +2100,11 @@
*/
protected class SimpleSelectStatementBuilder extends AbstractSelectStatementBuilder<SimpleSelectStatementStateObject, StateObject> {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
getSimpleRangeDeclarationBuilder().buildStateObject(stateObject.getFromClause(), expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
@@ -2499,9 +2115,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
@@ -2516,9 +2129,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -2541,9 +2151,6 @@
protected UpdateStatementStateObject stateObject;
protected UpdateItemStateObject updateItem;
- /**
- * {@inheritDoc}
- */
@Override
public UpdateStatementStateObject buildStateObject(JPQLQueryStateObject parent,
Expression expression) {
@@ -2559,18 +2166,12 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
stateObject.setEntityName(expression.getText());
stateObject.getModifyClause().getAbstractSchemaNameStateObject().setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -2584,36 +2185,24 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
stateObject.getModifyClause().getRangeVariableDeclaration().setExpression(expression);
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
updateItem.getStateFieldPath().setPaths(expression.paths().iterator());
updateItem.getStateFieldPath().setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
stateObject.getModifyClause().setExpression(expression);
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
@@ -2651,9 +2240,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
@@ -2664,9 +2250,6 @@
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
@@ -2691,9 +2274,6 @@
*/
private CaseExpressionStateObject parent;
- /**
- * {@inheritDoc}
- */
@Override
public CaseExpressionStateObject buildStateObject(CaseExpressionStateObject parent,
Expression expression) {
@@ -2708,9 +2288,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultConditionalExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultConditionalExpressionStateObjectBuilder.java
index 87cd940..94be798 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultConditionalExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultConditionalExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,17 +36,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void commit() {
getParent().setConditional(pop());
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractConditionalClauseStateObject getParent() {
return (AbstractConditionalClauseStateObject) super.getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultProblem.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultProblem.java
index 48ad1ff..0b5f8a7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultProblem.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultProblem.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,33 +60,21 @@
this.arguments = arguments;
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] getMessageArguments() {
return arguments;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getMessageKey() {
return messageKey;
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject getStateObject() {
return stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultSimpleSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultSimpleSelectExpressionStateObjectBuilder.java
index 04e1b29..370dad6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultSimpleSelectExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultSimpleSelectExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,17 +33,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void commit() {
getParent().setSelectItem(pop());
}
- /**
- * {@inheritDoc}
- */
@Override
protected SimpleSelectClauseStateObject getParent() {
return (SimpleSelectClauseStateObject) super.getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultStateObjectBuilder.java
index 12b69db..f1878ce 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,9 +36,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
protected LiteralVisitor buildLiteralVisitor() {
return new DefaultLiteralVisitor();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkConditionalStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkConditionalStateObjectBuilder.java
index e0b8c4e..90326bf 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkConditionalStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkConditionalStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,17 +36,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void commit() {
getParent().setConditional(pop());
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractConditionalClauseStateObject getParent() {
return (AbstractConditionalClauseStateObject) super.getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkJPQLQueryBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkJPQLQueryBuilder.java
index 9f255bd..3442b33 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkJPQLQueryBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkJPQLQueryBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,57 +50,36 @@
this.jpqlGrammar = jpqlGrammar;
}
- /**
- * {@inheritDoc}
- */
@Override
protected EclipseLinkStateObjectBuilder buildStateObjectBuilder() {
return new EclipseLinkStateObjectBuilder();
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) {
return new EclipseLinkConditionalStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public EclipseLinkSelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) {
return new EclipseLinkSelectExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public EclipseLinkSimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) {
return new EclipseLinkSimpleSelectExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) {
return new DefaultNewValueStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return jpqlGrammar;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "EclipseLinkJPQLQueryBuilder using " + jpqlGrammar.toString();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkStateObjectBuilder.java
index 193be5d..5662426 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,103 +55,64 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
protected LiteralVisitor buildLiteralVisitor() {
return new EclipseLinkLiteralVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConnectByClause expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DatabaseType expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StartWithClause expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
// TODO
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/IEclipseLinkSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/IEclipseLinkSelectExpressionStateObjectBuilder.java
index 168a7cb..a9df238 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/IEclipseLinkSelectExpressionStateObjectBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/IEclipseLinkSelectExpressionStateObjectBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,40 +22,22 @@
*/
public interface IEclipseLinkSelectExpressionStateObjectBuilder extends ISelectExpressionStateObjectBuilder {
- /**
- * {@inheritDoc}
- */
@Override
IEclipseLinkSelectExpressionStateObjectBuilder append();
- /**
- * {@inheritDoc}
- */
@Override
IEclipseLinkSelectExpressionStateObjectBuilder new_(String className,
ISelectExpressionStateObjectBuilder... parameters);
- /**
- * {@inheritDoc}
- */
@Override
IEclipseLinkSelectExpressionStateObjectBuilder object(String identificationVariable);
- /**
- * {@inheritDoc}
- */
@Override
IEclipseLinkSelectExpressionStateObjectBuilder resultVariable(String resultVariable);
- /**
- * {@inheritDoc}
- */
@Override
IEclipseLinkSelectExpressionStateObjectBuilder resultVariableAs(String resultVariable);
- /**
- * {@inheritDoc}
- */
@Override
IEclipseLinkSelectExpressionStateObjectBuilder variable(String variable);
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder1_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder1_0.java
index 385a99d..f6ac6fb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder1_0.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder1_0.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,57 +41,36 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
protected DefaultStateObjectBuilder buildStateObjectBuilder() {
return new DefaultStateObjectBuilder();
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) {
return new DefaultConditionalExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultSelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) {
return new DefaultSelectExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultSimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) {
return new DefaultSimpleSelectExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) {
return new DefaultNewValueStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return JPQLGrammar1_0.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "JPQLQueryBuilder1_0 using " + getGrammar().toString();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_0.java
index 0c5b437..6f628d7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_0.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_0.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,57 +41,36 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
protected DefaultStateObjectBuilder buildStateObjectBuilder() {
return new DefaultStateObjectBuilder();
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) {
return new DefaultConditionalExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultSelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) {
return new DefaultSelectExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultSimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) {
return new DefaultSimpleSelectExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) {
return new DefaultNewValueStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return JPQLGrammar2_0.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "JPQLQueryBuilder2_0 using " + getGrammar().toString();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_1.java
index 22bb96d..fefefb0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_1.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,57 +41,36 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
protected DefaultStateObjectBuilder buildStateObjectBuilder() {
return new DefaultStateObjectBuilder();
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) {
return new DefaultConditionalExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultSelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) {
return new DefaultSelectExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public DefaultSimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) {
return new DefaultSimpleSelectExpressionStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) {
return new DefaultNewValueStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return JPQLGrammar2_1.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "JPQLQueryBuilder2_1 using " + getGrammar().toString();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilderWrapper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilderWrapper.java
index fffc649..c04b91c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilderWrapper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilderWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,17 +52,11 @@
this.delegate = delegate;
}
- /**
- * {@inheritDoc}
- */
@Override
public ICaseExpressionStateObjectBuilder buildCaseExpressionStateObjectBuilder(StateObject parent) {
return delegate.buildCaseExpressionStateObjectBuilder(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider,
CharSequence jpqlQuery,
@@ -71,9 +65,6 @@
return delegate.buildStateObject(provider, jpqlQuery, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider,
CharSequence jpqlQuery,
@@ -83,9 +74,6 @@
return delegate.buildStateObject(provider, jpqlQuery, queryBNFId, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject buildStateObject(StateObject parent,
CharSequence jpqlFragment,
@@ -94,33 +82,21 @@
return delegate.buildStateObject(parent, jpqlFragment, queryBNFId);
}
- /**
- * {@inheritDoc}
- */
@Override
public IConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) {
return delegate.buildStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public ISelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) {
return delegate.buildStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public ISimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) {
return delegate.buildStateObjectBuilder(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) {
return delegate.buildStateObjectBuilder(stateObject);
@@ -135,9 +111,6 @@
return delegate;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return delegate.getGrammar();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/ListChangeEvent.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/ListChangeEvent.java
index 61f21b4..3a78774 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/ListChangeEvent.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/ListChangeEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,67 +67,43 @@
this.startIndex = startIndex;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getEndIndex() {
return endIndex;
}
- /**
- * {@inheritDoc}
- */
@Override
public EventType getEventType() {
return eventType;
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public List<T> getList() {
return (List<T>) list;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getListName() {
return listName;
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public <S extends ListHolderStateObject<? extends T>> S getSource() {
return (S) source;
}
- /**
- * {@inheritDoc}
- */
@Override
public int getStartIndex() {
return startIndex;
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<T> items() {
return new SnapshotCloneListIterable<T>(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public int itemsSize() {
return items.size();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/PropertyChangeEvent.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/PropertyChangeEvent.java
index 1e5eb26..6fcbb7d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/PropertyChangeEvent.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/PropertyChangeEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,33 +63,21 @@
this.newValue = newValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public T getNewValue() {
return newValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public T getOldValue() {
return oldValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getPropertyName() {
return propertyName;
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public <S extends StateObject> S getSource() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbsExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbsExpressionStateObject.java
index 1a939ad..baf14ad 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbsExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbsExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -69,33 +69,21 @@
super(parent, jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public AbsExpression getExpression() {
return (AbsExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return ABS;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return SimpleArithmeticExpressionBNF.ID;
@@ -113,9 +101,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractConditionalClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractConditionalClauseStateObject.java
index 534d06a..455a860 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractConditionalClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractConditionalClauseStateObject.java
@@ -80,9 +80,6 @@
this.conditionalStateObject = parent(conditionalStateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -170,9 +167,6 @@
return conditionalStateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -250,9 +244,6 @@
return encapsulate[0];
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractDoubleEncapsulatedExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractDoubleEncapsulatedExpressionStateObject.java
index f962bd9..12a8e5b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractDoubleEncapsulatedExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractDoubleEncapsulatedExpressionStateObject.java
@@ -104,9 +104,6 @@
parseSecond(secondJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
@@ -121,9 +118,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractDoubleEncapsulatedExpression getExpression() {
return (AbstractDoubleEncapsulatedExpression) super.getExpression();
@@ -185,9 +179,6 @@
return secondStateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -246,9 +237,6 @@
firePropertyChanged(SECOND_STATE_OBJECT_PROPERTY, oldSecondStateObject, secondStateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextEncapsulatedExpression(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseChildrenVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseChildrenVisitor.java
index 37eb743..22588e6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseChildrenVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseChildrenVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,9 +26,6 @@
*/
public abstract class AbstractEclipseLinkTraverseChildrenVisitor extends AnonynousEclipseLinkStateObjectVisitor {
- /**
- * {@inheritDoc}
- */
@Override
protected final void visit(StateObject stateObject) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseParentVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseParentVisitor.java
index 2ea9759..07be811 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseParentVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseParentVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,17 +25,11 @@
*/
public abstract class AbstractEclipseLinkTraverseParentVisitor extends AnonynousEclipseLinkStateObjectVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLQueryStateObject stateObject) {
// This is the root of the parsed tree
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(StateObject stateObject) {
stateObject.getParent().accept(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEncapsulatedExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEncapsulatedExpressionStateObject.java
index 501443f..a1600b8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEncapsulatedExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEncapsulatedExpressionStateObject.java
@@ -43,9 +43,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractEncapsulatedExpression getExpression() {
return (AbstractEncapsulatedExpression) super.getExpression();
@@ -71,9 +68,6 @@
*/
protected abstract void toTextEncapsulatedExpression(Appendable writer) throws IOException;
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
writer.append(getIdentifier());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractFromClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractFromClauseStateObject.java
index 5bd8ab5..5a8a23c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractFromClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractFromClauseStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,9 +90,6 @@
return stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addProblems(List<Problem> currentProblems) {
super.addProblems(currentProblems);
@@ -157,17 +154,11 @@
*/
protected abstract String declarationBNF();
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<? extends VariableDeclarationStateObject> declarations() {
return items();
}
- /**
- * {@inheritDoc}
- */
@Override
public IdentificationVariableStateObject findIdentificationVariable(String variable) {
@@ -180,25 +171,16 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public DeclarationStateObject getDeclaration() {
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractFromClause getExpression() {
return (AbstractFromClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType(StateObject stateObject) {
@@ -214,9 +196,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSelectStatementStateObject getParent() {
return (AbstractSelectStatementStateObject) super.getParent();
@@ -247,18 +226,12 @@
return new SnapshotCloneIterable<IdentificationVariableStateObject>(stateObjects);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
return super.isEquivalent(stateObject) &&
areChildrenEquivalent((AbstractListHolderStateObject<?>) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected String listName() {
return VARIABLE_DECLARATIONS_LIST;
@@ -275,9 +248,6 @@
buildStateObjects(jpqlFragment, declarationBNF());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
writer.append(FROM);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java
index 77b9527..8f0c9c5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,9 +71,6 @@
setIdentificationVariable(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
children.add(rangeVariableDeclaration);
@@ -176,9 +173,6 @@
*/
protected abstract AbstractRangeVariableDeclarationStateObject buildRangeVariableDeclarationStateObject();
- /**
- * {@inheritDoc}
- */
@Override
public IdentificationVariableDeclaration getExpression() {
return (IdentificationVariableDeclaration) super.getExpression();
@@ -202,9 +196,6 @@
return getRangeVariableDeclaration().getIdentificationVariableStateObject();
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractFromClauseStateObject getParent() {
return (AbstractFromClauseStateObject) super.getParent();
@@ -238,9 +229,6 @@
return getRangeVariableDeclaration().getRootStateObject();
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<IdentificationVariableStateObject> identificationVariables() {
List<IdentificationVariableStateObject> stateObjects = new ArrayList<IdentificationVariableStateObject>();
@@ -251,18 +239,12 @@
return new SnapshotCloneListIterable<IdentificationVariableStateObject>(stateObjects);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
rangeVariableDeclaration = buildRangeVariableDeclarationStateObject();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -275,9 +257,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String listName() {
return JOINS_LIST;
@@ -324,9 +303,6 @@
getRangeVariableDeclaration().setRootPath(root);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractListHolderStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractListHolderStateObject.java
index 0cb3a80..e01d341 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractListHolderStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractListHolderStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -77,35 +77,23 @@
Collections.addAll(this.items, parent(items));
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
children.addAll(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public <S extends T> S addItem(S item) {
getChangeSupport().addItem(this, this.items, listName(), parent(item));
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public void addItems(List<? extends T> items) {
getChangeSupport().addItems(this, this.items, listName(), parent(items));
}
- /**
- * {@inheritDoc}
- */
@Override
public void addListChangeListener(String listName, IListChangeListener<T> listener) {
getChangeSupport().addListChangeListener(listName, listener);
@@ -139,58 +127,37 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveDown(T stateObject) {
return getChangeSupport().canMoveDown(items, stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveUp(T stateObject) {
return getChangeSupport().canMoveUp(items, stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public T getItem(int index) {
return items.get(index);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasItems() {
return !items.isEmpty();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
items = new ArrayList<T>();
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<? extends T> items() {
return new SnapshotCloneListIterable<T>(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public int itemsSize() {
return items.size();
@@ -203,43 +170,28 @@
*/
protected abstract String listName();
- /**
- * {@inheritDoc}
- */
@Override
public T moveDown(T item) {
getChangeSupport().moveDown(this, items, listName(), item);
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public T moveUp(T item) {
getChangeSupport().moveUp(this, items, listName(), item);
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItem(T stateObject) {
getChangeSupport().removeItem(this, items, listName(), stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItems(Collection<T> items) {
getChangeSupport().removeItems(this, this.items, listName(), items);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeListChangeListener(String listName, IListChangeListener<T> listener) {
getChangeSupport().removeListChangeListener(listName, listener);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyClauseStateObject.java
index d94f3a5..cffa4ca 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyClauseStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,26 +45,17 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
children.add(rangeVariableDeclaration);
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<VariableDeclarationStateObject> declarations() {
return new SingleElementListIterable<VariableDeclarationStateObject>(rangeVariableDeclaration);
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType findManagedType(StateObject stateObject) {
return getManagedType(stateObject);
@@ -89,9 +80,6 @@
return rangeVariableDeclaration.getRootStateObject();
}
- /**
- * {@inheritDoc}
- */
@Override
public DeclarationStateObject getDeclaration() {
return this;
@@ -131,9 +119,6 @@
*/
public abstract String getIdentifier();
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType(StateObject stateObject) {
@@ -146,9 +131,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractModifyStatementStateObject getParent() {
return (AbstractModifyStatementStateObject) super.getParent();
@@ -173,18 +155,12 @@
return rangeVariableDeclaration.hasIdentificationVariable();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
rangeVariableDeclaration = new RangeVariableDeclarationStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -263,9 +239,6 @@
rangeVariableDeclaration.setIdentificationVariable(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
writer.append(getIdentifier());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyStatementStateObject.java
index 1e92f8a..8a44a65 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyStatementStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyStatementStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,9 +58,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -107,9 +104,6 @@
return getModifyClause().getAbstractSchemaNameStateObject();
}
- /**
- * {@inheritDoc}
- */
@Override
public DeclarationStateObject getDeclaration() {
return modifyClause.getDeclaration();
@@ -152,9 +146,6 @@
return modifyClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryStateObject getParent() {
return (JPQLQueryStateObject) super.getParent();
@@ -190,18 +181,12 @@
return whereClause != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
modifyClause = buildModifyClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -319,9 +304,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
modifyClause.toString(writer);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java
index f2e0b9a..bc2ed12 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -127,9 +127,6 @@
setPath(path);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
@@ -142,9 +139,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public String addItem(String item) {
@@ -152,17 +146,11 @@
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public void addItems(List<? extends String> items) {
getChangeSupport().addItems(this, paths, PATHS_LIST, items);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addListChangeListener(String listName, IListChangeListener<String> listener) {
getChangeSupport().addListChangeListener(listName, listener);
@@ -229,17 +217,11 @@
getChangeSupport().fireListChangeEvent(event);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveDown(String item) {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveUp(String item) {
return false;
@@ -257,9 +239,6 @@
typeDeclaration = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractPathExpression getExpression() {
return (AbstractPathExpression) super.getExpression();
@@ -279,9 +258,6 @@
return identificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getItem(int index) {
return paths.get(index);
@@ -365,17 +341,11 @@
return getIdentificationVariable() != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasItems() {
return !paths.isEmpty();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -383,9 +353,6 @@
mappings = new ArrayList<IMapping>();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -419,33 +386,21 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<String> items() {
return new SnapshotCloneListIterable<String>(paths);
}
- /**
- * {@inheritDoc}
- */
@Override
public int itemsSize() {
return paths.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public String moveDown(String item) {
throw new RuntimeException(getClass().getName() + " does not support moveDown(String).");
}
- /**
- * {@inheritDoc}
- */
@Override
public String moveUp(String item) {
throw new RuntimeException(getClass().getName() + " does not support moveUp(String).");
@@ -464,25 +419,16 @@
removeItem(getItem(index));
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItem(String item) {
getChangeSupport().removeItem(this, paths, PATHS_LIST, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItems(Collection<String> items) {
getChangeSupport().removeItems(this, this.paths, PATHS_LIST, items);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeListChangeListener(String listName, IListChangeListener<String> listener) {
getChangeSupport().removeListChangeListener(listName, listener);
@@ -659,9 +605,6 @@
setPaths(Arrays.asList(paths));
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractRangeVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractRangeVariableDeclarationStateObject.java
index 0f2c50f..2f22264 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractRangeVariableDeclarationStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractRangeVariableDeclarationStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -108,9 +108,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -118,9 +115,6 @@
children.add(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addProblems(List<Problem> problems) {
super.addProblems(problems);
@@ -133,9 +127,6 @@
protected abstract StateObject buildRootStateObject();
- /**
- * {@inheritDoc}
- */
@Override
public RangeVariableDeclaration getExpression() {
return (RangeVariableDeclaration) super.getExpression();
@@ -194,17 +185,11 @@
return identificationVariable.hasText();
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<IdentificationVariableStateObject> identificationVariables() {
return new SingleElementListIterable<IdentificationVariableStateObject>(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -212,9 +197,6 @@
identificationVariable = new IdentificationVariableStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -314,9 +296,6 @@
setAs(!hasAs());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSchemaNameStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSchemaNameStateObject.java
index 4ca6b0a..f0b6303 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSchemaNameStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSchemaNameStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,9 +67,6 @@
super(parent, entityName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -87,9 +84,6 @@
return entity;
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSchemaName getExpression() {
return (AbstractSchemaName) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectClauseStateObject.java
index 20c35ab..b83099f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectClauseStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,9 +54,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSelectClause getExpression() {
return (AbstractSelectClause) super.getExpression();
@@ -71,9 +68,6 @@
return getParent().getFromClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSelectStatementStateObject getParent() {
return (AbstractSelectStatementStateObject) super.getParent();
@@ -95,9 +89,6 @@
*/
public abstract boolean hasSelectItem();
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectStatementStateObject.java
index 15e8718..ed53215 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectStatementStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectStatementStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -92,9 +92,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
@@ -282,25 +279,16 @@
return fromClause.items();
}
- /**
- * {@inheritDoc}
- */
@Override
public IdentificationVariableStateObject findIdentificationVariable(String identificationVariable) {
return fromClause.findIdentificationVariable(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public DeclarationStateObject getDeclaration() {
return fromClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSelectStatement getExpression() {
return (AbstractSelectStatement) super.getExpression();
@@ -404,9 +392,6 @@
return fromClause.identificationVariables();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -414,9 +399,6 @@
fromClause = buildFromClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -518,9 +500,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSingleEncapsulatedExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSingleEncapsulatedExpressionStateObject.java
index 066edd6..8a04a02 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSingleEncapsulatedExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSingleEncapsulatedExpressionStateObject.java
@@ -82,9 +82,6 @@
parse(jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -93,9 +90,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSingleEncapsulatedExpression getExpression() {
return (AbstractSingleEncapsulatedExpression) super.getExpression();
@@ -129,9 +123,6 @@
return getStateObject() != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -165,9 +156,6 @@
firePropertyChanged(STATE_OBJECT_PROPERTY, oldStateObject, stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextEncapsulatedExpression(Appendable writer) throws IOException {
if (stateObject != null) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObject.java
index 6361ad5..dc3a505 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObject.java
@@ -189,9 +189,6 @@
protected void addProblems(List<Problem> problems) {
}
- /**
- * {@inheritDoc}
- */
@Override
public final void addPropertyChangeListener(String propertyName, IPropertyChangeListener<?> listener) {
changeSupport.addPropertyChangeListener(propertyName, listener);
@@ -317,9 +314,6 @@
return parent;
}
- /**
- * {@inheritDoc}
- */
@Override
public final Iterable<StateObject> children() {
List<StateObject> children = new ArrayList<StateObject>();
@@ -327,25 +321,16 @@
return new SnapshotCloneIterable<StateObject>(children);
}
- /**
- * {@inheritDoc}
- */
@Override
public void decorate(StateObject decorator) {
this.decorator = parent(decorator);
}
- /**
- * {@inheritDoc}
- */
@Override
public final boolean equals(Object object) {
return super.equals(object);
}
- /**
- * {@inheritDoc}
- */
@Override
public IdentificationVariableStateObject findIdentificationVariable(String identificationVariable) {
return parent.findIdentificationVariable(identificationVariable);
@@ -373,65 +358,41 @@
return changeSupport;
}
- /**
- * {@inheritDoc}
- */
@Override
public DeclarationStateObject getDeclaration() {
return parent.getDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject getDecorator() {
return decorator;
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getExpression() {
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return getRoot().getGrammar();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedTypeProvider getManagedTypeProvider() {
return getRoot().getManagedTypeProvider();
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject getParent() {
return parent;
}
- /**
- * {@inheritDoc}
- */
@Override
public IJPQLQueryBuilder getQueryBuilder() {
return getRoot().getQueryBuilder();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryStateObject getRoot() {
return parent.getRoot();
@@ -475,9 +436,6 @@
return getManagedTypeProvider().getTypeRepository();
}
- /**
- * {@inheritDoc}
- */
@Override
public final int hashCode() {
return super.hashCode();
@@ -490,17 +448,11 @@
changeSupport = new ChangeSupport(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isDecorated() {
return decorator != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
return (this == stateObject) ||
@@ -546,9 +498,6 @@
return stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void removePropertyChangeListener(String propertyName, IPropertyChangeListener<?> listener) {
changeSupport.removePropertyChangeListener(propertyName, listener);
@@ -564,18 +513,12 @@
this.expression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public final void setParent(StateObject parent) {
Assert.isNotNull(parent, "The parent cannot be null");
this.parent = parent;
}
- /**
- * {@inheritDoc}
- */
@Override
public final String toString() {
StringBuilder sb = new StringBuilder();
@@ -583,9 +526,6 @@
return sb.toString();
}
- /**
- * {@inheritDoc}
- */
@Override
public final void toString(Appendable writer) {
try {
@@ -635,9 +575,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public final void toText(Appendable writer) {
try {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObjectVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObjectVisitor.java
index 9ee011a..38e89d6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObjectVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObjectVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,590 +25,338 @@
*/
public abstract class AbstractStateObjectVisitor implements StateObjectVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaNameStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactorStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunctionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclarationStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunctionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTimeStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatementStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DerivedPathIdentificationVariableDeclarationStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DerivedPathVariableDeclarationStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteralStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EnumTypeStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclarationStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameterStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JoinStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLQueryStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunctionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunctionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteralStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItemStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclarationStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariableStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatementStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatementStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteralStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunctionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItemStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatementStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpressionStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClauseStateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClauseStateObject stateObject) {
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseChildrenVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseChildrenVisitor.java
index fe66155..112bf7e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseChildrenVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseChildrenVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,9 +26,6 @@
*/
public abstract class AbstractTraverseChildrenVisitor extends AnonymousStateObjectVisitor {
- /**
- * {@inheritDoc}
- */
@Override
protected final void visit(StateObject stateObject) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseParentVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseParentVisitor.java
index 5175a3d..26bbfa1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseParentVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseParentVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,17 +25,11 @@
*/
public abstract class AbstractTraverseParentVisitor extends AnonymousStateObjectVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLQueryStateObject stateObject) {
// This is the root of the parsed tree
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(StateObject stateObject) {
stateObject.getParent().accept(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTripleEncapsulatedExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTripleEncapsulatedExpressionStateObject.java
index d0555cf..fe673cd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTripleEncapsulatedExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTripleEncapsulatedExpressionStateObject.java
@@ -121,9 +121,6 @@
parseThird (thirdJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
@@ -142,9 +139,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractTripleEncapsulatedExpression getExpression() {
return (AbstractTripleEncapsulatedExpression) super.getExpression();
@@ -234,9 +228,6 @@
return thirdStateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -319,9 +310,6 @@
firePropertyChanged(THIRD_STATE_OBJECT_PROPERTY, oldThirdStateObject, thirdStateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextEncapsulatedExpression(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AdditionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AdditionExpressionStateObject.java
index f70c9b9..f12f4e8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AdditionExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AdditionExpressionStateObject.java
@@ -73,25 +73,16 @@
super(parent, leftJpqlFragment, rightJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public AdditionExpression getExpression() {
return (AdditionExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return PLUS;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AggregateFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AggregateFunctionStateObject.java
index 7e904a9..6fb6fb8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AggregateFunctionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AggregateFunctionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -109,9 +109,6 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public AggregateFunction getExpression() {
return (AggregateFunction) super.getExpression();
@@ -128,9 +125,6 @@
return distinct;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -155,9 +149,6 @@
firePropertyChanged(DISTINCT_PROPERTY, oldDistinct, distinct);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
@@ -170,9 +161,6 @@
setDistinct(!hasDistinct());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextEncapsulatedExpression(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AllOrAnyExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AllOrAnyExpressionStateObject.java
index 672c41c..feacabf 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AllOrAnyExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AllOrAnyExpressionStateObject.java
@@ -113,41 +113,26 @@
this.identifier = identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public AllOrAnyExpression getExpression() {
return (AllOrAnyExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return SubqueryBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -188,9 +173,6 @@
firePropertyChanged(IDENTIFIER_PROPERTY, oldIdentifier, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AndExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AndExpressionStateObject.java
index 93f3ac3..4d2ecda 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AndExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AndExpressionStateObject.java
@@ -95,41 +95,26 @@
super(parent, leftJpqlFragment, rightJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public AndExpression getExpression() {
return (AndExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return AND;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getLeftQueryBNFId() {
return ConditionalTermBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getRightQueryBNFId() {
return ConditionalFactorBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AnonymousStateObjectVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AnonymousStateObjectVisitor.java
index 53e698b..ed57bd7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AnonymousStateObjectVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AnonymousStateObjectVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,545 +25,341 @@
*/
public abstract class AnonymousStateObjectVisitor implements StateObjectVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaNameStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactorStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunctionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclarationStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunctionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTimeStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatementStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DerivedPathIdentificationVariableDeclarationStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DerivedPathVariableDeclarationStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteralStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EnumTypeStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclarationStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameterStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JoinStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLQueryStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunctionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunctionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteralStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItemStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclarationStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariableStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatementStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatementStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpressionStateObject stateObject) {
visit((StateObject) stateObject);
@@ -577,129 +373,81 @@
protected void visit(StateObject stateObject) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteralStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunctionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItemStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatementStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpressionStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClauseStateObject stateObject) {
visit((StateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClauseStateObject stateObject) {
visit((StateObject) stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticExpressionStateObject.java
index 7aacfd3..1a69aea 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticExpressionStateObject.java
@@ -80,25 +80,16 @@
super(parent, leftJpqlFragment, rightJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public ArithmeticExpression getExpression() {
return (ArithmeticExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getLeftQueryBNFId() {
return ArithmeticExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getRightQueryBNFId() {
return ArithmeticTermBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticFactorStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticFactorStateObject.java
index 042d4dc..66036c5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticFactorStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticFactorStateObject.java
@@ -78,17 +78,11 @@
this.stateObject = parent(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -124,9 +118,6 @@
return plusSign ? PLUS : MINUS;
}
- /**
- * {@inheritDoc}
- */
@Override
public ArithmeticFactor getExpression() {
return (ArithmeticFactor) super.getExpression();
@@ -173,9 +164,6 @@
return stateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -242,9 +230,6 @@
setArithmeticSign(!plusSign);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
writer.append(getArithmeticSign());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AvgFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AvgFunctionStateObject.java
index 788c5f6..19fbba4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AvgFunctionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AvgFunctionStateObject.java
@@ -91,33 +91,21 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public AvgFunction getExpression() {
return (AvgFunction) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return AVG;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return StateFieldPathExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BadExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BadExpressionStateObject.java
index 83d9f89..9733039 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BadExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BadExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,17 +38,11 @@
super(parent, text);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public BadExpression getExpression() {
return (BadExpression) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BetweenExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BetweenExpressionStateObject.java
index 62fdab0..b8c203b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BetweenExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BetweenExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -179,17 +179,11 @@
this(parent, jpqlFragment, false, lowerBoundJpqlFragment, upperBoundJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -216,9 +210,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public BetweenExpression getExpression() {
return (BetweenExpression) super.getExpression();
@@ -293,9 +284,6 @@
return upperBoundStateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -419,9 +407,6 @@
setNot(!not);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CaseExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CaseExpressionStateObject.java
index b2d1b32..39182bb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CaseExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CaseExpressionStateObject.java
@@ -120,17 +120,11 @@
this.caseOperandStateObject = parent(caseOperandStateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
if (caseOperandStateObject != null) {
@@ -142,9 +136,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addProblems(List<Problem> problems) {
super.addProblems(problems);
@@ -224,9 +215,6 @@
return elseStateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public CaseExpression getExpression() {
return (CaseExpression) super.getExpression();
@@ -252,9 +240,6 @@
return elseStateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -268,9 +253,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String listName() {
return WHEN_CLAUSE_STATE_OBJECT_LIST;
@@ -343,9 +325,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CoalesceExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CoalesceExpressionStateObject.java
index 12c4bba..b9cadc1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CoalesceExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CoalesceExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -110,43 +110,28 @@
parseItemInternal(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
children.addAll(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public <S extends StateObject> S addItem(S item) {
getChangeSupport().addItem(this, items, STATE_OBJECTS_LIST, parent(item));
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public void addItems(List<? extends StateObject> items) {
getChangeSupport().addItems(this, this.items, STATE_OBJECTS_LIST, parent(items));
}
- /**
- * {@inheritDoc}
- */
@Override
public void addListChangeListener(String listName, IListChangeListener<StateObject> listener) {
getChangeSupport().addListChangeListener(listName, listener);
@@ -180,100 +165,64 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveDown(StateObject item) {
return getChangeSupport().canMoveDown(items, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveUp(StateObject item) {
return getChangeSupport().canMoveUp(items, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public CoalesceExpression getExpression() {
return (CoalesceExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return COALESCE;
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject getItem(int index) {
return items.get(index);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasItems() {
return !items.isEmpty();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
items = new ArrayList<StateObject>();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
return super.isEquivalent(stateObject) &&
areChildrenEquivalent((CoalesceExpressionStateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<StateObject> items() {
return new SnapshotCloneListIterable<StateObject>(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public int itemsSize() {
return items.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject moveDown(StateObject item) {
getChangeSupport().moveDown(this, items, STATE_OBJECTS_LIST, item);
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject moveUp(StateObject item) {
getChangeSupport().moveUp(this, items, STATE_OBJECTS_LIST, item);
@@ -330,25 +279,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItem(StateObject item) {
getChangeSupport().removeItem(this, items, STATE_OBJECTS_LIST, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItems(Collection<StateObject> items) {
getChangeSupport().removeItems(this, this.items, STATE_OBJECTS_LIST, items);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeListChangeListener(String listName, IListChangeListener<StateObject> listener) {
getChangeSupport().removeListChangeListener(listName, listener);
@@ -366,9 +306,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextEncapsulatedExpression(Appendable writer) throws IOException {
toStringItems(writer, items, true);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionExpressionStateObject.java
index a427b46..8e18a0d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,17 +50,11 @@
this.items = items;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
children.addAll(items);
@@ -94,17 +88,11 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression getExpression() {
return (CollectionExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -128,9 +116,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
toStringItems(writer, items, true);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberDeclarationStateObject.java
index 31021ea..308b2dd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberDeclarationStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberDeclarationStateObject.java
@@ -139,9 +139,6 @@
setPath(collectionValuedPath);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -159,9 +156,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -180,9 +174,6 @@
return collectionValuedPath;
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionMemberDeclaration getExpression() {
return (CollectionMemberDeclaration) super.getExpression();
@@ -199,9 +190,6 @@
return identificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType(StateObject stateObject) {
@@ -212,9 +200,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractFromClauseStateObject getParent() {
return (AbstractFromClauseStateObject) super.getParent();
@@ -239,17 +224,11 @@
return identificationVariable.hasText();
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<IdentificationVariableStateObject> identificationVariables() {
return new SingleElementListIterable<IdentificationVariableStateObject>(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -270,9 +249,6 @@
return derived;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -390,9 +366,6 @@
setAs(!as);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java
index 6aef04b..a1d62a8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java
@@ -124,17 +124,11 @@
this(parent, entityStateObject, false, false, collectionValuedPath);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -178,9 +172,6 @@
return entityStateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionMemberExpression getExpression() {
return (CollectionMemberExpression) super.getExpression();
@@ -204,18 +195,12 @@
return of;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
collectionValuedPath = new CollectionValuedPathExpressionStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -303,9 +288,6 @@
setOf(!of);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionValuedPathExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionValuedPathExpressionStateObject.java
index 5cf19f9..a40aef1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionValuedPathExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionValuedPathExpressionStateObject.java
@@ -59,25 +59,16 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionValuedPathExpression getExpression() {
return (CollectionValuedPathExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
protected IManagedType resolveManagedType() {
@@ -107,9 +98,6 @@
return getManagedTypeProvider().getManagedType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType resolveType() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ComparisonExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ComparisonExpressionStateObject.java
index feeab00..e6cacb5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ComparisonExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ComparisonExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -125,49 +125,31 @@
this.identifier = identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public ComparisonExpression getExpression() {
return (ComparisonExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getLeftQueryBNFId() {
return ComparisonExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getRightQueryBNFId() {
return ComparisonExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CompoundExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CompoundExpressionStateObject.java
index 7e1b021..19e7e81 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CompoundExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CompoundExpressionStateObject.java
@@ -99,9 +99,6 @@
parseRight(rightJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -113,9 +110,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CompoundExpression getExpression() {
return (CompoundExpression) super.getExpression();
@@ -182,9 +176,6 @@
return rightStateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -239,9 +230,6 @@
firePropertyChanged(RIGHT_STATE_OBJECT_PROPERTY, oldRightStateObject, rightStateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConcatExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConcatExpressionStateObject.java
index 18536e1..ca632c5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConcatExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConcatExpressionStateObject.java
@@ -73,34 +73,22 @@
super(parent, stateObjects);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public ConcatExpression getExpression() {
return (ConcatExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
return super.isEquivalent(stateObject) &&
areChildrenEquivalent((ConcatExpressionStateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected String listName() {
return STRING_PRIMARY_STATE_OBJECT_LIST;
@@ -118,9 +106,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
writer.append(CONCAT);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConstructorExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConstructorExpressionStateObject.java
index 6501aaa..f185d5d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConstructorExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConstructorExpressionStateObject.java
@@ -154,9 +154,6 @@
parse(jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -171,9 +168,6 @@
return className;
}
- /**
- * {@inheritDoc}
- */
@Override
public ConstructorExpression getExpression() {
return (ConstructorExpression) super.getExpression();
@@ -203,9 +197,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String listName() {
return CONSTRUCTOR_ITEMS_LIST;
@@ -287,9 +278,6 @@
setClassNameInternally((type != null) ? type.getName() : null);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CountFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CountFunctionStateObject.java
index 20556e6..7deeee0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CountFunctionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CountFunctionStateObject.java
@@ -91,33 +91,21 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public CountFunction getExpression() {
return (CountFunction) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return COUNT;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return InternalCountBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DateTimeStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DateTimeStateObject.java
index 61df458..35aa6ac 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DateTimeStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DateTimeStateObject.java
@@ -65,17 +65,11 @@
super(parent, date);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public DateTime getExpression() {
return (DateTime) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteClauseStateObject.java
index c64d22b..59a9934 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteClauseStateObject.java
@@ -45,33 +45,21 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public DeleteClause getExpression() {
return (DeleteClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return DELETE_FROM;
}
- /**
- * {@inheritDoc}
- */
@Override
public DeleteStatementStateObject getParent() {
return (DeleteStatementStateObject) super.getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteStatementStateObject.java
index 5b13bdf..37782ce 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteStatementStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteStatementStateObject.java
@@ -41,25 +41,16 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractModifyClauseStateObject buildModifyClause() {
return new DeleteClauseStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public DeleteStatement getExpression() {
return (DeleteStatement) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathIdentificationVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathIdentificationVariableDeclarationStateObject.java
index d5d448d..cb32318 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathIdentificationVariableDeclarationStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathIdentificationVariableDeclarationStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,25 +50,16 @@
super(parent, path, identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractRangeVariableDeclarationStateObject buildRangeVariableDeclarationStateObject() {
return new DerivedPathVariableDeclarationStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType(StateObject stateObject) {
@@ -79,9 +70,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleFromClauseStateObject getParent() {
return (SimpleFromClauseStateObject) super.getParent();
@@ -97,25 +85,16 @@
return getRangeVariableDeclaration().getPath();
}
- /**
- * {@inheritDoc}
- */
@Override
public DerivedPathVariableDeclarationStateObject getRangeVariableDeclaration() {
return (DerivedPathVariableDeclarationStateObject) super.getRangeVariableDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionValuedPathExpressionStateObject getRootStateObject() {
return getRangeVariableDeclaration().getRootStateObject();
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public ListIterable<JoinStateObject> items() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathVariableDeclarationStateObject.java
index db97408..e425ebb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathVariableDeclarationStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathVariableDeclarationStateObject.java
@@ -55,25 +55,16 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected StateObject buildRootStateObject() {
return new CollectionValuedPathExpressionStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType(StateObject stateObject) {
@@ -84,9 +75,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public DerivedPathIdentificationVariableDeclarationStateObject getParent() {
return (DerivedPathIdentificationVariableDeclarationStateObject) super.getParent();
@@ -102,25 +90,16 @@
return getRootStateObject().getPath();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getRootPath() {
return getPath();
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionValuedPathExpressionStateObject getRootStateObject() {
return (CollectionValuedPathExpressionStateObject) super.getRootStateObject();
}
- /**
- * {@inheritDoc}
- */
@Override
public void setRootPath(String path) {
getRootStateObject().setPath(path);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DivisionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DivisionExpressionStateObject.java
index e1849ab..ceaf865 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DivisionExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DivisionExpressionStateObject.java
@@ -73,25 +73,16 @@
super(parent, leftJpqlFragment, rightJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public DivisionExpression getExpression() {
return (DivisionExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return DIVISION;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EmptyCollectionComparisonExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EmptyCollectionComparisonExpressionStateObject.java
index 0928c5c..49ab48e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EmptyCollectionComparisonExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EmptyCollectionComparisonExpressionStateObject.java
@@ -89,17 +89,11 @@
this(parent, false, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -118,9 +112,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public EmptyCollectionComparisonExpression getExpression() {
return (EmptyCollectionComparisonExpression) super.getExpression();
@@ -147,18 +138,12 @@
return not;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
stateObject = new CollectionValuedPathExpressionStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -211,9 +196,6 @@
setNot(!not);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EncapsulatedIdentificationVariableExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EncapsulatedIdentificationVariableExpressionStateObject.java
index a1e3bb8..a25a1bf 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EncapsulatedIdentificationVariableExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EncapsulatedIdentificationVariableExpressionStateObject.java
@@ -108,9 +108,6 @@
typeDeclaration = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public EncapsulatedIdentificationVariableExpression getExpression() {
return (EncapsulatedIdentificationVariableExpression) super.getExpression();
@@ -149,17 +146,11 @@
return managedType;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return IdentificationVariableBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public IdentificationVariableStateObject getStateObject() {
return (IdentificationVariableStateObject) super.getStateObject();
@@ -213,9 +204,6 @@
return ExpressionTools.stringIsNotEmpty(getIdentificationVariable());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntityTypeLiteralStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntityTypeLiteralStateObject.java
index e752287..b41d1a2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntityTypeLiteralStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntityTypeLiteralStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,26 +51,17 @@
super(parent, entityTypeName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addProblems(List<Problem> problems) {
super.addProblems(problems);
// TODO
}
- /**
- * {@inheritDoc}
- */
@Override
public EntityTypeLiteral getExpression() {
return (EntityTypeLiteral) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntryExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntryExpressionStateObject.java
index 12ae1d6..e66ca09 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntryExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntryExpressionStateObject.java
@@ -55,25 +55,16 @@
super(parent, identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public EntryExpression getExpression() {
return (EntryExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return ENTRY;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EnumTypeStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EnumTypeStateObject.java
index f965906..af8e355 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EnumTypeStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EnumTypeStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,17 +64,11 @@
return enumType.getName() + "." + enumConstant.name();
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractPathExpression getExpression() {
return (AbstractPathExpression) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ExistsExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ExistsExpressionStateObject.java
index 44fa017..397df41 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ExistsExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ExistsExpressionStateObject.java
@@ -105,9 +105,6 @@
super(parent, jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -125,25 +122,16 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public ExistsExpression getExpression() {
return (ExistsExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return EXISTS;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return SubqueryBNF.ID;
@@ -159,9 +147,6 @@
return not;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -206,9 +191,6 @@
firePropertyChanged(NOT_PROPERTY, oldNot, not);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
@@ -221,9 +203,6 @@
setNot(!not);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextEncapsulatedExpression(Appendable writer) throws IOException {
writer.append(not ? NOT_EXISTS : EXISTS);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FromClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FromClauseStateObject.java
index 721de6b..9a37120 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FromClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FromClauseStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,42 +52,27 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected String declarationBNF() {
return InternalFromClauseBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType findManagedType(StateObject stateObject) {
// This is the declaration clause of the top-level query
return getManagedType(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public FromClause getExpression() {
return (FromClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public SelectStatementStateObject getParent() {
return (SelectStatementStateObject) super.getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FunctionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FunctionExpressionStateObject.java
index d78c9e2..3180ecd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FunctionExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FunctionExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,43 +91,28 @@
this.items.addAll(parent(arguments));
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
children.addAll(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public <S extends StateObject> S addItem(S item) {
getChangeSupport().addItem(this, items, ARGUMENTS_LIST, parent(item));
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public void addItems(List<? extends StateObject> items) {
getChangeSupport().addItems(this, this.items, ARGUMENTS_LIST, parent(items));
}
- /**
- * {@inheritDoc}
- */
@Override
public void addListChangeListener(String listName, IListChangeListener<StateObject> listener) {
getChangeSupport().addListChangeListener(listName, listener);
@@ -161,25 +146,16 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveDown(StateObject item) {
return getChangeSupport().canMoveDown(items, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveUp(StateObject item) {
return getChangeSupport().canMoveUp(items, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public FunctionExpression getExpression() {
return (FunctionExpression) super.getExpression();
@@ -203,9 +179,6 @@
return identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject getItem(int index) {
return items.get(index);
@@ -230,26 +203,17 @@
return functionName != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasItems() {
return !items.isEmpty();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
items = new ArrayList<StateObject>();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -262,59 +226,38 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<StateObject> items() {
return new SnapshotCloneListIterable<StateObject>(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public int itemsSize() {
return items.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject moveDown(StateObject item) {
getChangeSupport().moveDown(this, items, ARGUMENTS_LIST, item);
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject moveUp(StateObject item) {
getChangeSupport().moveUp(this, items, ARGUMENTS_LIST, item);
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItem(StateObject item) {
getChangeSupport().removeItem(this, items, ARGUMENTS_LIST, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItems(Collection<StateObject> items) {
getChangeSupport().removeItems(this, this.items, ARGUMENTS_LIST, items);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeListChangeListener(String listName, IListChangeListener<StateObject> listener) {
getChangeSupport().removeListChangeListener(listName, listener);
@@ -342,9 +285,6 @@
firePropertyChanged(FUNCTION_NAME_PROPERTY, oldFunctionName, functionName);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/GroupByClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/GroupByClauseStateObject.java
index a2a01f9..a420441 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/GroupByClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/GroupByClauseStateObject.java
@@ -52,9 +52,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -73,34 +70,22 @@
return stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public GroupByClause getExpression() {
return (GroupByClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSelectStatementStateObject getParent() {
return (AbstractSelectStatementStateObject) super.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
return super.isEquivalent(stateObject) &&
areChildrenEquivalent((GroupByClauseStateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected String listName() {
return GROUP_BY_ITEMS_LIST;
@@ -129,9 +114,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
writer.append(GROUP_BY);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/HavingClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/HavingClauseStateObject.java
index 43202ac..ec2ddd1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/HavingClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/HavingClauseStateObject.java
@@ -42,33 +42,21 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public HavingClause getExpression() {
return (HavingClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return HAVING;
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSelectStatementStateObject getParent() {
return (AbstractSelectStatementStateObject) super.getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableDeclarationStateObject.java
index 1f30ce4..c08c7a1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableDeclarationStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableDeclarationStateObject.java
@@ -79,9 +79,6 @@
getRangeVariableDeclaration().setDeclaration(entityName, identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -172,9 +169,6 @@
return addJoinFetch(LEFT_OUTER_JOIN_FETCH, path);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractRangeVariableDeclarationStateObject buildRangeVariableDeclarationStateObject() {
return new RangeVariableDeclarationStateObject(this);
@@ -198,9 +192,6 @@
return getRootStateObject().getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType(StateObject stateObject) {
@@ -211,25 +202,16 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public RangeVariableDeclarationStateObject getRangeVariableDeclaration() {
return (RangeVariableDeclarationStateObject) super.getRangeVariableDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSchemaNameStateObject getRootStateObject() {
return (AbstractSchemaNameStateObject) super.getRootStateObject();
}
- /**
- * {@inheritDoc}
- */
@Override
protected String listName() {
return JOINS_LIST;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java
index 690a2a8..824c9d4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,17 +90,11 @@
super(parent, variable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addProblems(List<Problem> problems) {
super.addProblems(problems);
@@ -145,9 +139,6 @@
typeDeclaration = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public IdentificationVariable getExpression() {
return (IdentificationVariable) super.getExpression();
@@ -208,9 +199,6 @@
return typeDeclaration;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -285,9 +273,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setText(String text) {
checkIntegrity(text);
@@ -305,9 +290,6 @@
this.virtual = virtual;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
if (!virtual) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java
index d64d394..3021369 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java
@@ -183,17 +183,11 @@
this(parent, false, path, items);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
if (stateObject != null) {
@@ -214,9 +208,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public InExpression getExpression() {
return (InExpression) super.getExpression();
@@ -250,9 +241,6 @@
return stateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -277,9 +265,6 @@
return singleInputParameter;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String listName() {
return ITEMS_LIST;
@@ -357,9 +342,6 @@
setNot(!not);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IndexExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IndexExpressionStateObject.java
index dc84cd0..4b817fd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IndexExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IndexExpressionStateObject.java
@@ -54,25 +54,16 @@
super(parent, identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public IndexExpression getExpression() {
return (IndexExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return INDEX;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InputParameterStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InputParameterStateObject.java
index d1082f6..9c78d10 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InputParameterStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InputParameterStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,17 +51,11 @@
super(parent, parameter);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public InputParameter getExpression() {
return (InputParameter) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JPQLQueryStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JPQLQueryStateObject.java
index f60940d..d958115 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JPQLQueryStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JPQLQueryStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -72,17 +72,11 @@
initialize(queryBuilder, provider);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -165,57 +159,36 @@
return stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
protected StateObject checkParent(StateObject parent) {
return parent;
}
- /**
- * {@inheritDoc}
- */
@Override
public DeclarationStateObject getDeclaration() {
return (queryStatement == null) ? null : queryStatement.getDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLExpression getExpression() {
return (JPQLExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return queryBuilder.getGrammar();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedTypeProvider getManagedTypeProvider() {
return provider;
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject getParent() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public IJPQLQueryBuilder getQueryBuilder() {
return queryBuilder;
@@ -231,9 +204,6 @@
return queryStatement;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryStateObject getRoot() {
return this;
@@ -264,9 +234,6 @@
this.queryBuilder = queryBuilder;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -312,9 +279,6 @@
firePropertyChanged(QUERY_STATEMENT_PROPERTY, oldStatement, queryStatement);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
if (queryStatement != null) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JoinStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JoinStateObject.java
index d5c6444..4121009 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JoinStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JoinStateObject.java
@@ -103,9 +103,6 @@
this.as = as;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -123,9 +120,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -143,9 +137,6 @@
joinAssociationPath.addItems(paths);
}
- /**
- * {@inheritDoc}
- */
@Override
public Join getExpression() {
return (Join) super.getExpression();
@@ -199,9 +190,6 @@
return joinType;
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractIdentificationVariableDeclarationStateObject getParent() {
return (AbstractIdentificationVariableDeclarationStateObject) super.getParent();
@@ -239,9 +227,6 @@
return identificationVariable.hasText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -249,9 +234,6 @@
identificationVariable = new IdentificationVariableStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -386,9 +368,6 @@
setAs(!as);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeyExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeyExpressionStateObject.java
index 4f77d99..a9a856f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeyExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeyExpressionStateObject.java
@@ -56,33 +56,21 @@
super(parent, identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public KeyExpression getExpression() {
return (KeyExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return KEY;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType resolveType() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeywordExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeywordExpressionStateObject.java
index 476467d..fcdb7d7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeywordExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeywordExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,17 +55,11 @@
validateIdentifier(text);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public KeywordExpression getExpression() {
return (KeywordExpression) super.getExpression();
@@ -83,9 +77,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setText(String text) {
validateIdentifier(text);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LengthExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LengthExpressionStateObject.java
index b4e9c12..6fd3d72 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LengthExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LengthExpressionStateObject.java
@@ -64,33 +64,21 @@
super(parent, jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public LengthExpression getExpression() {
return (LengthExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return LENGTH;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return StringPrimaryBNF.ID;
@@ -108,9 +96,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LikeExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LikeExpressionStateObject.java
index 1e91f4f..d47fc8d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LikeExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LikeExpressionStateObject.java
@@ -150,17 +150,11 @@
this(parent, stringStateObject, false, patternValue, null);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -188,9 +182,6 @@
return escapeCharacter.getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public LikeExpression getExpression() {
return (LikeExpression) super.getExpression();
@@ -226,18 +217,12 @@
return stringStateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
escapeCharacter = new StringLiteralStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -313,9 +298,6 @@
setNot(!not);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LocateExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LocateExpressionStateObject.java
index 71dcf84..e8f0dd5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LocateExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LocateExpressionStateObject.java
@@ -118,49 +118,31 @@
super(parent, firstJpqlFragment, secondJpqlFragment, thirdJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public LocateExpression getExpression() {
return (LocateExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getFirstQueryBNFId() {
return StringPrimaryBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return LOCATE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getSecondQueryBNFId() {
return StringPrimaryBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getThirdQueryBNFId() {
return SimpleArithmeticExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LogicalExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LogicalExpressionStateObject.java
index 22650da..236e774 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LogicalExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LogicalExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -74,9 +74,6 @@
super(parent, leftJpqlFragment, rightJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public LogicalExpression getExpression() {
return (LogicalExpression) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LowerExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LowerExpressionStateObject.java
index 367fb7a..573d71a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LowerExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LowerExpressionStateObject.java
@@ -64,33 +64,21 @@
super(parent, jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public LowerExpression getExpression() {
return (LowerExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return LOWER;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return StringPrimaryBNF.ID;
@@ -108,9 +96,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MaxFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MaxFunctionStateObject.java
index 11449fa..3b39185 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MaxFunctionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MaxFunctionStateObject.java
@@ -92,33 +92,21 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public MaxFunction getExpression() {
return (MaxFunction) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return MAX;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return StateFieldPathExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MinFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MinFunctionStateObject.java
index ac890bb..e09077c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MinFunctionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MinFunctionStateObject.java
@@ -92,33 +92,21 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public MinFunction getExpression() {
return (MinFunction) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return MIN;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return StateFieldPathExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ModExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ModExpressionStateObject.java
index 4f6cc43..74cdeba 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ModExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ModExpressionStateObject.java
@@ -76,41 +76,26 @@
super(parent, firstJpqlFragment, secondJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public ModExpression getExpression() {
return (ModExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getFirstQueryBNFId() {
return SimpleArithmeticExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return MOD;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getSecondQueryBNFId() {
return SimpleArithmeticExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MultiplicationExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MultiplicationExpressionStateObject.java
index c330a18..7ed80df 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MultiplicationExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MultiplicationExpressionStateObject.java
@@ -73,25 +73,16 @@
super(parent, leftJpqlFragment, rightJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public MultiplicationExpression getExpression() {
return (MultiplicationExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return MULTIPLICATION;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NotExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NotExpressionStateObject.java
index 636d93a..b386ec4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NotExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NotExpressionStateObject.java
@@ -78,17 +78,11 @@
parse(jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -97,9 +91,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public NotExpression getExpression() {
return (NotExpression) super.getExpression();
@@ -125,9 +116,6 @@
return stateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -173,9 +161,6 @@
firePropertyChanged(STATE_OBJECT_PROPERTY, oldStateObject, stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
writer.append(NOT);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullComparisonExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullComparisonExpressionStateObject.java
index acd521c..8fdb28b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullComparisonExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullComparisonExpressionStateObject.java
@@ -125,17 +125,11 @@
parse(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -156,9 +150,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
public NullComparisonExpression getExpression() {
return (NullComparisonExpression) super.getExpression();
@@ -194,9 +185,6 @@
return stateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -270,9 +258,6 @@
setNot(!not);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullIfExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullIfExpressionStateObject.java
index 11cbd6b..d0b2477 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullIfExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullIfExpressionStateObject.java
@@ -81,41 +81,26 @@
super(parent, firstJpqlFragment, secondJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public NullIfExpression getExpression() {
return (NullIfExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getFirstQueryBNFId() {
return ScalarExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return NULLIF;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getSecondQueryBNFId() {
return ScalarExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NumericLiteralStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NumericLiteralStateObject.java
index ace6248..92fe051 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NumericLiteralStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NumericLiteralStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,17 +66,11 @@
super(parent, numeric);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public NumericLiteral getExpression() {
return (NumericLiteral) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ObjectExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ObjectExpressionStateObject.java
index 10d1d03..d6feef9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ObjectExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ObjectExpressionStateObject.java
@@ -56,33 +56,21 @@
super(parent, identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addProblems(List<Problem> problems) {
super.addProblems(problems);
}
- /**
- * {@inheritDoc}
- */
@Override
public ObjectExpression getExpression() {
return (ObjectExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return OBJECT;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrExpressionStateObject.java
index 49a35d0..2f19545 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrExpressionStateObject.java
@@ -94,41 +94,26 @@
super(parent, leftJpqlFragment, rightJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public OrExpression getExpression() {
return (OrExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return OR;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getLeftQueryBNFId() {
return ConditionalExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getRightQueryBNFId() {
return ConditionalTermBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByClauseStateObject.java
index d5e01e6..541ae89 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByClauseStateObject.java
@@ -53,9 +53,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -151,34 +148,22 @@
return updateItem;
}
- /**
- * {@inheritDoc}
- */
@Override
public OrderByClause getExpression() {
return (OrderByClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public SelectStatementStateObject getParent() {
return (SelectStatementStateObject) super.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
return super.isEquivalent(stateObject) &&
areChildrenEquivalent((OrderByClauseStateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected String listName() {
return ORDER_BY_ITEMS_LIST;
@@ -207,9 +192,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
writer.append(ORDER_BY);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByItemStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByItemStateObject.java
index 10f11a6..2944944 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByItemStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByItemStateObject.java
@@ -134,17 +134,11 @@
parse(jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -153,9 +147,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public OrderByItem getExpression() {
return (OrderByItem) super.getExpression();
@@ -171,9 +162,6 @@
return ordering;
}
- /**
- * {@inheritDoc}
- */
@Override
public OrderByClauseStateObject getParent() {
return (OrderByClauseStateObject) super.getParent();
@@ -225,9 +213,6 @@
return ordering == Ordering.DESC;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -296,9 +281,6 @@
firePropertyChanged(STATE_OBJECT_PROPERTY, oldStateObject, stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/RangeVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/RangeVariableDeclarationStateObject.java
index 412dc01..4e8788a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/RangeVariableDeclarationStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/RangeVariableDeclarationStateObject.java
@@ -68,25 +68,16 @@
super(parent, entityName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public RangeVariableDeclarationStateObject addAs() {
return (RangeVariableDeclarationStateObject) super.addAs();
}
- /**
- * {@inheritDoc}
- */
@Override
protected StateObject buildRootStateObject() {
return new AbstractSchemaNameStateObject(this);
@@ -110,9 +101,6 @@
return getRootStateObject().getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType(StateObject stateObject) {
@@ -123,17 +111,11 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getRootPath() {
return getEntityName();
}
- /**
- * {@inheritDoc}
- */
@Override
public AbstractSchemaNameStateObject getRootStateObject() {
return (AbstractSchemaNameStateObject) super.getRootStateObject();
@@ -191,9 +173,6 @@
getRootStateObject().setText(abstractSchemaName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setRootPath(String root) {
setEntityName(root);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ResultVariableStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ResultVariableStateObject.java
index db069aa..b0dcffb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ResultVariableStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ResultVariableStateObject.java
@@ -111,9 +111,6 @@
this(parent, stateObject, false, resultVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -131,9 +128,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -143,17 +137,11 @@
children.add(resultVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public ResultVariable getExpression() {
return (ResultVariable) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public SelectClauseStateObject getParent() {
return (SelectClauseStateObject) super.getParent();
@@ -207,18 +195,12 @@
return stateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
resultVariable = new IdentificationVariableStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -307,9 +289,6 @@
setAs(!as);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectClauseStateObject.java
index 0d2a246..5dc1167 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectClauseStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -75,17 +75,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -138,9 +132,6 @@
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public <S extends StateObject> S addItem(S item) {
getChangeSupport().addItem(this, items, SELECT_ITEMS_LIST, parent(item));
@@ -181,17 +172,11 @@
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public void addItems(List<? extends StateObject> items) {
getChangeSupport().addItems(this, this.items, SELECT_ITEMS_LIST, parent(items));
}
- /**
- * {@inheritDoc}
- */
@Override
public void addListChangeListener(String listName, IListChangeListener<StateObject> listener) {
getChangeSupport().addListChangeListener(listName, listener);
@@ -225,17 +210,11 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveDown(StateObject item) {
return getChangeSupport().canMoveDown(items, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveUp(StateObject item) {
return getChangeSupport().canMoveUp(items, item);
@@ -256,134 +235,86 @@
return builder;
}
- /**
- * {@inheritDoc}
- */
@Override
public SelectClause getExpression() {
return (SelectClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public FromClauseStateObject getFromClause() {
return (FromClauseStateObject) super.getFromClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject getItem(int index) {
return items.get(index);
}
- /**
- * {@inheritDoc}
- */
@Override
public SelectStatementStateObject getParent() {
return (SelectStatementStateObject) super.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasItems() {
return items.size() > 0;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSelectItem() {
return hasItems();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
items = new ArrayList<StateObject>();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
return super.isEquivalent(stateObject) &&
areChildrenEquivalent((SelectClauseStateObject) stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<StateObject> items() {
return new SnapshotCloneListIterable<StateObject>(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public int itemsSize() {
return items.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject moveDown(StateObject item) {
getChangeSupport().moveDown(this, items, SELECT_ITEMS_LIST, item);
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public StateObject moveUp(StateObject item) {
getChangeSupport().moveUp(this, items, SELECT_ITEMS_LIST, item);
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public void parse(String jpqlFragment) {
List<StateObject> stateObjects = buildStateObjects(jpqlFragment, InternalSelectExpressionBNF.ID);
addItems(stateObjects);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItem(StateObject stateObject) {
getChangeSupport().removeItem(this, items, SELECT_ITEMS_LIST, stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItems(Collection<StateObject> items) {
getChangeSupport().removeItems(this, this.items, SELECT_ITEMS_LIST, items);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeListChangeListener(String listName, IListChangeListener<StateObject> listener) {
getChangeSupport().removeListChangeListener(listName, listener);
@@ -412,9 +343,6 @@
getChangeSupport().replaceItems(this, items, SELECT_ITEMS_LIST, stateObjects);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectStatementStateObject.java
index e4cd911..f3b2eb7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectStatementStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectStatementStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,17 +63,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -172,33 +166,21 @@
return getSelectClause().addItemAs(jpqlFragment, resultVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractFromClauseStateObject buildFromClause() {
return new FromClauseStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSelectClauseStateObject buildSelectClause() {
return new SelectClauseStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public SelectStatement getExpression() {
return (SelectStatement) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public FromClauseStateObject getFromClause() {
return (FromClauseStateObject) super.getFromClause();
@@ -214,9 +196,6 @@
return orderByClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryStateObject getParent() {
return (JPQLQueryStateObject) super.getParent();
@@ -234,9 +213,6 @@
return getSelectClause().getBuilder();
}
- /**
- * {@inheritDoc}
- */
@Override
public SelectClauseStateObject getSelectClause() {
return (SelectClauseStateObject) super.getSelectClause();
@@ -252,9 +228,6 @@
return orderByClause != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -303,9 +276,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleFromClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleFromClauseStateObject.java
index b40ff37..3c29482 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleFromClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleFromClauseStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,9 +47,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -118,17 +115,11 @@
return stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public String declarationBNF() {
return InternalSimpleFromClauseBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType findManagedType(StateObject stateObject) {
IManagedType managedType = getManagedType(stateObject);
@@ -138,17 +129,11 @@
return managedType;
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleFromClause getExpression() {
return (SimpleFromClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleSelectStatementStateObject getParent() {
return (SimpleSelectStatementStateObject) super.getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java
index cbf6d32..613dfc1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java
@@ -62,17 +62,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -96,25 +90,16 @@
return builder;
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleSelectClause getExpression() {
return (SimpleSelectClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleFromClauseStateObject getFromClause() {
return (SimpleFromClauseStateObject) super.getFromClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleSelectStatementStateObject getParent() {
return (SimpleSelectStatementStateObject) super.getParent();
@@ -129,17 +114,11 @@
return stateObject;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSelectItem() {
return stateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -151,9 +130,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void parse(String jpqlFragment) {
StateObject stateObject = buildStateObject(jpqlFragment, SimpleSelectExpressionBNF.ID);
@@ -183,9 +159,6 @@
firePropertyChanged(SELECT_ITEM_PROPERTY, oldStateObject, stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectStatementStateObject.java
index a64ac9d..13c4f23 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectStatementStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectStatementStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -95,33 +92,21 @@
return getFromClause().addDerivedPathDeclaration(path, identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractFromClauseStateObject buildFromClause() {
return new SimpleFromClauseStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSelectClauseStateObject buildSelectClause() {
return new SimpleSelectClauseStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleSelectStatement getExpression() {
return (SimpleSelectStatement) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleFromClauseStateObject getFromClause() {
return (SimpleFromClauseStateObject) super.getFromClause();
@@ -139,9 +124,6 @@
return getSelectClause().getBuilder();
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleSelectClauseStateObject getSelectClause() {
return (SimpleSelectClauseStateObject) super.getSelectClause();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleStateObject.java
index 0022be4..52ef0f2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -78,9 +78,6 @@
return !ExpressionTools.stringIsEmpty(text);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -112,9 +109,6 @@
this.text = text;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
if (text != null) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SizeExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SizeExpressionStateObject.java
index f03fe21..ccac9cd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SizeExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SizeExpressionStateObject.java
@@ -65,33 +65,21 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public SizeExpression getExpression() {
return (SizeExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return SIZE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return CollectionValuedPathExpressionBNF.ID;
@@ -109,9 +97,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SqrtExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SqrtExpressionStateObject.java
index 3a79eb2..6a4a27f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SqrtExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SqrtExpressionStateObject.java
@@ -64,33 +64,21 @@
super(parent, jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public SqrtExpression getExpression() {
return (SqrtExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return SQRT;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return SimpleArithmeticExpressionBNF.ID;
@@ -108,9 +96,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateFieldPathExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateFieldPathExpressionStateObject.java
index fc56ade..4623831 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateFieldPathExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateFieldPathExpressionStateObject.java
@@ -63,25 +63,16 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public StateFieldPathExpression getExpression() {
return (StateFieldPathExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
protected IManagedType resolveManagedType() {
@@ -116,9 +107,6 @@
return getManagedTypeProvider().getManagedType(type);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType resolveType() {
return getTypeHelper().convertPrimitive(getTypeDeclaration().getType());
@@ -147,56 +135,35 @@
this.provider = provider;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(IManagedTypeVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public int compareTo(IManagedType managedType) {
return getType().getName().compareTo(managedType.getType().getName());
}
- /**
- * {@inheritDoc}
- */
@Override
public IMapping getMappingNamed(String name) {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedTypeProvider getProvider() {
return provider;
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType() {
return mapType;
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<IMapping> mappings() {
return EmptyIterable.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getType().getName();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StringLiteralStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StringLiteralStateObject.java
index 66f7280..378708d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StringLiteralStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StringLiteralStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,17 +58,11 @@
super(parent, literal);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public StringLiteral getExpression() {
return (StringLiteral) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubExpressionStateObject.java
index 572b430..4eb7453 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubExpressionStateObject.java
@@ -75,33 +75,21 @@
parse(jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public SubExpression getExpression() {
return (SubExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return queryBNFId;
@@ -131,9 +119,6 @@
this.queryBNFId = queryBNFId;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubstringExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubstringExpressionStateObject.java
index 59eab2c..0abef4d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubstringExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubstringExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -117,49 +117,31 @@
super(parent, firstJpqlFragment, secondJpqlFragment, thirdJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public SubstringExpression getExpression() {
return (SubstringExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getFirstQueryBNFId() {
return StringPrimaryBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return SUBSTRING;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getSecondQueryBNFId() {
return SimpleArithmeticExpressionBNF.ID;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getThirdQueryBNFId() {
return SimpleArithmeticExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubtractionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubtractionExpressionStateObject.java
index cfd914e..89f3d7a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubtractionExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubtractionExpressionStateObject.java
@@ -73,25 +73,16 @@
super(parent, leftJpqlFragment, rightJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public SubtractionExpression getExpression() {
return (SubtractionExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return MINUS;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SumFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SumFunctionStateObject.java
index a06ac43..23d3bd0 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SumFunctionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SumFunctionStateObject.java
@@ -100,33 +100,21 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public SumFunction getExpression() {
return (SumFunction) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return SUM;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return StateFieldPathExpressionBNF.ID;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TreatExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TreatExpressionStateObject.java
index 46d0a51..44c5833 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TreatExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TreatExpressionStateObject.java
@@ -55,7 +55,7 @@
private EntityTypeLiteralStateObject entityTypeName;
/**
- * Keeps a reference onto the {@link JoinStateObject} since it owns the {@link IStatObject}
+ * Keeps a reference onto the {@link JoinStateObject} since it owns the {@link StateObject}
* representing the collection-valued path expression.
*/
private JoinStateObject joinStateObject;
@@ -107,9 +107,6 @@
this(parent, false, entityTypeName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
acceptUnknownVisitor(visitor);
@@ -127,9 +124,6 @@
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -179,9 +173,6 @@
return entityTypeName.getText();
}
- /**
- * {@inheritDoc}
- */
@Override
public TreatExpression getExpression() {
return (TreatExpression) super.getExpression();
@@ -237,18 +228,12 @@
return entityTypeName != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
entityTypeName = new EntityTypeLiteralStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -331,9 +316,6 @@
setAs(!as);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TrimExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TrimExpressionStateObject.java
index c94d711..acc0356 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TrimExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TrimExpressionStateObject.java
@@ -128,33 +128,21 @@
super(parent, jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public TrimExpression getExpression() {
return (TrimExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return TRIM;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return StringPrimaryBNF.ID;
@@ -199,9 +187,6 @@
return trimCharacter != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -214,9 +199,6 @@
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void parse(String jpqlFragment) {
@@ -295,9 +277,6 @@
firePropertyChanged(SPECIFICATION_PROPERTY, oldSpecification, specification);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
@@ -316,9 +295,6 @@
firePropertyChanged(TRIM_CHARACTER_PROPERTY, oldTrimCharacter, trimCharacter);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextEncapsulatedExpression(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TypeExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TypeExpressionStateObject.java
index 2722457..7150a4d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TypeExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TypeExpressionStateObject.java
@@ -70,33 +70,21 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public TypeExpression getExpression() {
return (TypeExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return TYPE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return InternalEntityTypeExpressionBNF.ID;
@@ -114,9 +102,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UnknownExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UnknownExpressionStateObject.java
index e8b2070..ab477e3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UnknownExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UnknownExpressionStateObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,17 +39,11 @@
super(parent, text);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public UnknownExpression getExpression() {
return (UnknownExpression) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateClauseStateObject.java
index 8c00b79..606de8d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateClauseStateObject.java
@@ -66,17 +66,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -200,9 +194,6 @@
return updateItem;
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public UpdateItemStateObject addItem(UpdateItemStateObject item) {
@@ -210,17 +201,11 @@
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public void addItems(List<? extends UpdateItemStateObject> items) {
getChangeSupport().addItems(this, this.items, UPDATE_ITEMS_LIST, parent(items));
}
- /**
- * {@inheritDoc}
- */
@Override
public void addListChangeListener(String listName, IListChangeListener<UpdateItemStateObject> listener) {
getChangeSupport().addListChangeListener(listName, listener);
@@ -254,74 +239,47 @@
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveDown(UpdateItemStateObject item) {
return getChangeSupport().canMoveDown(items, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canMoveUp(UpdateItemStateObject item) {
return getChangeSupport().canMoveUp(items, item);
}
- /**
- * {@inheritDoc}
- */
@Override
public UpdateClause getExpression() {
return (UpdateClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return UPDATE;
}
- /**
- * {@inheritDoc}
- */
@Override
public UpdateItemStateObject getItem(int index) {
return items.get(index);
}
- /**
- * {@inheritDoc}
- */
@Override
public UpdateStatementStateObject getParent() {
return (UpdateStatementStateObject) super.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasItems() {
return !items.isEmpty();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
items = new ArrayList<UpdateItemStateObject>();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
return super.isEquivalent(stateObject) &&
@@ -338,34 +296,22 @@
return !getIdentificationVariableStateObject().isVirtual();
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterable<UpdateItemStateObject> items() {
return new SnapshotCloneListIterable<UpdateItemStateObject>(items);
}
- /**
- * {@inheritDoc}
- */
@Override
public int itemsSize() {
return items.size();
}
- /**
- * {@inheritDoc}
- */
@Override
public UpdateItemStateObject moveDown(UpdateItemStateObject item) {
getChangeSupport().moveDown(this, items, UPDATE_ITEMS_LIST, item);
return item;
}
- /**
- * {@inheritDoc}
- */
@Override
public UpdateItemStateObject moveUp(UpdateItemStateObject item) {
getChangeSupport().moveUp(this, items, UPDATE_ITEMS_LIST, item);
@@ -383,25 +329,16 @@
addItem(stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItem(UpdateItemStateObject stateObject) {
getChangeSupport().removeItem(this, this.items, UPDATE_ITEMS_LIST, stateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeItems(Collection<UpdateItemStateObject> items) {
getChangeSupport().removeItems(this, this.items, UPDATE_ITEMS_LIST, items);
}
- /**
- * {@inheritDoc}
- */
@Override
public void removeListChangeListener(String listName, IListChangeListener<UpdateItemStateObject> listener) {
getChangeSupport().removeListChangeListener(listName, listener);
@@ -419,9 +356,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
super.toTextInternal(writer);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java
index 01dec0a..66577ec 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java
@@ -103,17 +103,11 @@
setPath(path);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -151,9 +145,6 @@
return builder;
}
- /**
- * {@inheritDoc}
- */
@Override
public UpdateItem getExpression() {
return (UpdateItem) super.getExpression();
@@ -168,9 +159,6 @@
return newValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public UpdateClauseStateObject getParent() {
return (UpdateClauseStateObject) super.getParent();
@@ -204,18 +192,12 @@
return newValue != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
stateFieldPath = new StateFieldPathExpressionStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -326,9 +308,6 @@
stateFieldPath.setIdentificationVariableInternally(variable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateStatementStateObject.java
index fb7c95a..80561cb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateStatementStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateStatementStateObject.java
@@ -42,9 +42,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
@@ -83,17 +80,11 @@
return getModifyClause().addItem(path, newValue);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractModifyClauseStateObject buildModifyClause() {
return new UpdateClauseStateObject(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public UpdateStatement getExpression() {
return (UpdateStatement) super.getExpression();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpperExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpperExpressionStateObject.java
index 0ec9b74..0adf415 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpperExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpperExpressionStateObject.java
@@ -64,33 +64,21 @@
super(parent, jpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public UpperExpression getExpression() {
return (UpperExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return UPPER;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getQueryBNFId() {
return StringPrimaryBNF.ID;
@@ -108,9 +96,6 @@
super.setExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setStateObject(StateObject stateObject) {
super.setStateObject(stateObject);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ValueExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ValueExpressionStateObject.java
index 2a390a0..b7a8ab5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ValueExpressionStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ValueExpressionStateObject.java
@@ -56,33 +56,21 @@
super(parent, identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public ValueExpression getExpression() {
return (ValueExpression) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return VALUE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType resolveType() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhenClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhenClauseStateObject.java
index 4395055..9897263 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhenClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhenClauseStateObject.java
@@ -99,17 +99,11 @@
parseThen(thenJpqlFragment);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildren(List<StateObject> children) {
super.addChildren(children);
@@ -118,9 +112,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addProblems(List<Problem> problems) {
@@ -135,25 +126,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public WhenClause getExpression() {
return (WhenClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return WHEN;
}
- /**
- * {@inheritDoc}
- */
@Override
public CaseExpressionStateObject getParent() {
return (CaseExpressionStateObject) super.getParent();
@@ -179,9 +161,6 @@
return thenStateObject != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEquivalent(StateObject stateObject) {
@@ -240,9 +219,6 @@
firePropertyChanged(THEN_STATE_OBJECT_PROPERTY, oldThenStateObject, thenStateObject);
}
- /**
- * {@inheritDoc}
- */
@Override
public void toTextInternal(Appendable writer) throws IOException {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhereClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhereClauseStateObject.java
index c3f236c..1b33625 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhereClauseStateObject.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhereClauseStateObject.java
@@ -53,25 +53,16 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(StateObjectVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public WhereClause getExpression() {
return (WhereClause) super.getExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getIdentifier() {
return WHERE;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbsFunctionResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbsFunctionResolver.java
index b43841b..ae8621c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbsFunctionResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbsFunctionResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,9 +40,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
@@ -56,9 +53,6 @@
return type;
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getParentTypeDeclaration();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractPathResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractPathResolver.java
index 6125fdd..cd2bd9f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractPathResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractPathResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,9 +71,6 @@
parent.addChild(path, this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
IMapping mapping = getMapping();
@@ -83,9 +80,6 @@
return getTypeHelper().unknownTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType() {
@@ -102,9 +96,6 @@
return managedType;
}
- /**
- * {@inheritDoc}
- */
@Override
public final IMapping getMapping() {
if ((mapping == null) && !mappingResolved) {
@@ -146,9 +137,6 @@
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return path;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractRangeDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractRangeDeclaration.java
index df7839c..a48b33b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractRangeDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractRangeDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,9 +57,6 @@
joins.add(join);
}
- /**
- * {@inheritDoc}
- */
@Override
public List<Join> getJoins() {
if (joins == null) {
@@ -68,9 +65,6 @@
return joins;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasJoins() {
return (joins != null);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassNameResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassNameResolver.java
index 7723e72..3bfa8e1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassNameResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassNameResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,25 +43,16 @@
this.className = className;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
return getType(className);
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getType().getTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return className;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassResolver.java
index 2e2ef2d..f0d930a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,25 +43,16 @@
this.javaType = javaType;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
return getType(javaType);
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getType().getTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return javaType.getName();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionDeclaration.java
index e4e8dab..f5683f3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,9 +35,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.COLLECTION;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionEquivalentResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionEquivalentResolver.java
index 239ebc7..f910995 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionEquivalentResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionEquivalentResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,9 +50,6 @@
this.resolvers = resolvers;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
@@ -83,9 +80,6 @@
return type;
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getType().getTypeDeclaration();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionValuedFieldResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionValuedFieldResolver.java
index f168299..11f6356 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionValuedFieldResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionValuedFieldResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
@@ -72,9 +69,6 @@
return getTypeHelper().convertPrimitive(type);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IManagedType resolveManagedType(IMapping mapping) {
@@ -115,56 +109,35 @@
this.mapType = mapType;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(IManagedTypeVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public int compareTo(IManagedType managedType) {
return getType().getName().compareTo(managedType.getType().getName());
}
- /**
- * {@inheritDoc}
- */
@Override
public IMapping getMappingNamed(String name) {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedTypeProvider getProvider() {
return provider;
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType() {
return mapType;
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<IMapping> mappings() {
return EmptyIterable.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getType().getName();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/Declaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/Declaration.java
index 4f71f94..5700d3b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/Declaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/Declaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,17 +68,11 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getBaseExpression() {
return baseExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public Expression getDeclarationExpression() {
return declarationExpression;
@@ -93,9 +87,6 @@
return identificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<Join> getJoins() {
return Collections.emptyList();
@@ -114,9 +105,6 @@
return rootPath;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getVariableName() {
if (identificationVariable == null) {
@@ -125,17 +113,11 @@
return identificationVariable.getVariableName();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasJoins() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DeclarationResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DeclarationResolver.java
index 323b4a4..08e934a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DeclarationResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DeclarationResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -167,25 +167,16 @@
return new RootObjectExpressionVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
return getTypeHelper().unknownType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getTypeHelper().unknownTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void checkParent(Resolver parent) {
// Don't do anything, this is the root
@@ -265,17 +256,11 @@
return declarationVisitor;
}
- /**
- * {@inheritDoc}
- */
@Override
public DeclarationResolver getParent() {
return (DeclarationResolver) super.getParent();
}
- /**
- * {@inheritDoc}
- */
@Override
public IQuery getQuery() {
return queryContext.getQuery();
@@ -602,9 +587,6 @@
*/
protected Declaration currentDeclaration;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
currentDeclaration = new RangeDeclaration();
@@ -612,17 +594,11 @@
declarations.add(currentDeclaration);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -641,9 +617,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
currentDeclaration = new DerivedDeclaration();
@@ -651,9 +624,6 @@
declarations.add(currentDeclaration);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
@@ -669,25 +639,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
expression.getDeleteClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
expression.getDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
if (collectResultVariable) {
@@ -695,9 +656,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
@@ -711,9 +669,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -723,17 +678,11 @@
rangeDeclaration.addJoin(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
expression.getQueryStatement().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
if (buildingDeclaration) {
@@ -744,9 +693,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -768,9 +714,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
collectResultVariable = true;
@@ -778,50 +721,32 @@
collectResultVariable = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
expression.getFromClause().accept(this);
expression.getSelectClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
expression.getDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
expression.getFromClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
@@ -837,9 +762,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
expression.getUpdateClause().accept(this);
@@ -863,26 +785,17 @@
*/
protected String outerVariableName;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
newDeclaration.rootPath = expression.toActualText();
newDeclaration.baseExpression = expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
expression.getRangeVariableDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -903,17 +816,11 @@
*/
protected Resolver resolver;
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
resolver = queryContext.getResolver(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
resolver = new FromSubqueryResolver(
@@ -923,9 +830,6 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DerivedDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DerivedDeclaration.java
index e8152c1..cb015a6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DerivedDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DerivedDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,9 +50,6 @@
return (index > -1) ? rootPath.substring(0, index) : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.DERIVED;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EclipseLinkDeclarationResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EclipseLinkDeclarationResolver.java
index 12fc458..b9d8c81 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EclipseLinkDeclarationResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EclipseLinkDeclarationResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,9 +44,6 @@
super(parent, queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
protected DeclarationVisitor buildDeclarationVisitor() {
return new DeclarationVisitor();
@@ -54,9 +51,6 @@
protected class DeclarationVisitor extends DeclarationResolver.DeclarationVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -73,17 +67,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
public void visit(TableVariableDeclaration expression) {
currentDeclaration = new TableDeclaration();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EntityResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EntityResolver.java
index 61e4e40..07532bd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EntityResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EntityResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,18 +49,12 @@
this.abstractSchemaName = abstractSchemaName;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
IManagedType entity = getManagedType();
return (entity != null) ? entity.getType() : getTypeHelper().objectType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getType().getTypeDeclaration();
@@ -75,9 +69,6 @@
return abstractSchemaName;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType() {
if (managedType == null) {
@@ -86,9 +77,6 @@
return managedType;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return abstractSchemaName;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EnumLiteralResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EnumLiteralResolver.java
index 7a691b7..21ef0fc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EnumLiteralResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EnumLiteralResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,17 +52,11 @@
this.enumLiteral = enumLiteral;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
return type;
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return type.getTypeDeclaration();
@@ -78,9 +72,6 @@
return enumLiteral.substring(index + 1);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return enumLiteral;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java
index 2b43c78..fa2530d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java
@@ -109,25 +109,16 @@
this.queryContext = queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
return getManagedType().getType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getType().getTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType() {
if (managedType == null) {
@@ -153,41 +144,26 @@
*/
private Map<String, IMapping> mappings;
- /**
- * {@inheritDoc}
- */
@Override
public void accept(IManagedTypeVisitor visitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public int compareTo(IManagedType managedType) {
return getType().getName().compareTo(managedType.getType().getName());
}
- /**
- * {@inheritDoc}
- */
@Override
public IMapping getMappingNamed(String name) {
initializeMappings();
return mappings.get(name);
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedTypeProvider getProvider() {
return FromSubqueryResolver.this.getProvider();
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType() {
return getProvider().getTypeRepository().getType(IType.UNRESOLVABLE_TYPE);
@@ -207,9 +183,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<IMapping> mappings() {
initializeMappings();
@@ -239,67 +212,43 @@
this.mappingType = mappingType;
}
- /**
- * {@inheritDoc}
- */
@Override
public int compareTo(IMapping mapping) {
return getName().compareTo(mapping.getName());
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMappingType() {
IMapping mapping = resolver.getMapping();
return (mapping != null) ? mapping.getMappingType() : IMappingType.TRANSIENT;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getName() {
return name;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getParent() {
return parent;
}
- /**
- * {@inheritDoc}
- */
@Override
public IType getType() {
return resolver.getType();
}
- /**
- * {@inheritDoc}
- */
@Override
public ITypeDeclaration getTypeDeclaration() {
return resolver.getTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasAnnotation(Class<? extends Annotation> annotationType) {
// TODO: Can we do this???
return getType().hasAnnotation(annotationType);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isCollection() {
IMapping mapping = resolver.getMapping();
@@ -312,36 +261,24 @@
return (mapping != null) ? mapping.isEmbeddable() : false;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isProperty() {
IMapping mapping = resolver.getMapping();
return (mapping != null) ? mapping.isProperty() : (mappingType == MappingType.PROPERTY);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRelationship() {
IMapping mapping = resolver.getMapping();
return (mapping != null) ? mapping.isRelationship() : (mappingType == MappingType.RELATIONSHIP);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isTransient() {
IMapping mapping = resolver.getMapping();
return (mapping != null) ? mapping.isTransient() : false;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return name;
@@ -389,113 +326,71 @@
return new VirtualMapping(parent, name, resolver, mappingType);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -514,41 +409,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
expression.getSelectClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
@@ -565,41 +445,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
mappingType = MappingType.PROPERTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
mappingType = MappingType.PROPERTY;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/IdentificationVariableResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/IdentificationVariableResolver.java
index 43184c2..d88ec04 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/IdentificationVariableResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/IdentificationVariableResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,33 +47,21 @@
this.variableName = variableName;
}
- /**
- * {@inheritDoc}
- */
@Override
public IType buildType() {
return getParentType();
}
- /**
- * {@inheritDoc}
- */
@Override
public ITypeDeclaration buildTypeDeclaration() {
return getParentTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType() {
return getParentManagedType();
}
- /**
- * {@inheritDoc}
- */
@Override
public IMapping getMapping() {
return getParentMapping();
@@ -88,9 +76,6 @@
return variableName;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return variableName + " -> " + getParent();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/KeyResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/KeyResolver.java
index 8fab544..09159ab 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/KeyResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/KeyResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
@@ -61,25 +58,16 @@
return getTypeHelper().objectType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getParentTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType() {
return getProvider().getManagedType(getType());
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "KEY(" + getParent() + ")";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NullResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NullResolver.java
index d46ea23..daec187 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NullResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NullResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,17 +36,11 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
return getTypeHelper().unknownType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getTypeHelper().unknownTypeDeclaration();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NumericResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NumericResolver.java
index 8d270c6..50b4fac 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NumericResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NumericResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -81,9 +81,6 @@
this(parent, Collections.singleton(resolver));
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
@@ -117,9 +114,6 @@
return types.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getType().getTypeDeclaration();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/RangeDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/RangeDeclaration.java
index 2ef57aa..b3dcdee 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/RangeDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/RangeDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,9 +36,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.RANGE;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ResolverBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ResolverBuilder.java
index 8829ea4..2ad2d2b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ResolverBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ResolverBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -383,9 +383,6 @@
return resolver;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
@@ -397,9 +394,6 @@
resolver = new AbsFunctionResolver(resolver);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
@@ -421,33 +415,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
@@ -459,33 +441,21 @@
resolver = new NumericResolver(parent, resolver);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
resolver = buildClassResolver(Double.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
visitCollectionEquivalentExpression(
@@ -494,41 +464,26 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
visitCollectionEquivalentExpression(expression.getExpression(), null);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
expression.getCollectionValuedPathExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
@@ -562,25 +517,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
resolver = buildClassResolver(String.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
@@ -594,17 +540,11 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
resolver = buildClassResolver(Long.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -635,41 +575,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
@@ -684,115 +609,73 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
resolver = buildClassResolver(Map.Entry.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
DeclarationResolver parent = getDeclarationResolver(expression);
resolver = parent.getResolver(expression.getVariableName());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
resolver = buildClassResolver(Integer.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
resolver = buildClassNameResolver(IType.UNRESOLVABLE_TYPE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
expression.getJoinAssociationPath().accept(this);
resolver.setNullAllowed(expression.isLeftJoin());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
expression.getQueryStatement().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
@@ -804,9 +687,6 @@
resolver = new KeyResolver(resolver);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
@@ -822,107 +702,68 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
resolver = buildClassResolver(Integer.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
resolver = buildClassResolver(Integer.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
resolver = buildClassResolver(String.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
// Visit the state field path expression in order to create the resolver
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
// Visit the state field path expression in order to create the resolver
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
resolver = buildClassResolver(Integer.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
resolver = buildClassNameResolver(IType.UNRESOLVABLE_TYPE);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
expression.getFirstExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
@@ -957,65 +798,41 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
expression.getConditionalExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
resolver = buildClassResolver(Boolean.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
@@ -1033,33 +850,21 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
expression.getSelectClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
expression.getSelectExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
queryContext.newSubqueryContext(expression);
@@ -1071,25 +876,16 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
resolver = buildClassResolver(Integer.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
resolver = buildClassResolver(Double.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
@@ -1118,41 +914,26 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
resolver = buildClassResolver(String.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubstringExpression expression) {
resolver = buildClassResolver(String.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
visitArithmeticExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
@@ -1164,9 +945,6 @@
resolver = new SumFunctionResolver(resolver);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
@@ -1183,65 +961,41 @@
resolver = new TreatResolver(resolver, entityTypeName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
resolver = buildClassResolver(String.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
resolver = buildClassResolver(Object.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpperExpression expression) {
resolver = buildClassResolver(String.class);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
@@ -1253,17 +1007,11 @@
resolver = new ValueResolver(resolver);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
expression.getThenExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
expression.getConditionalExpression().accept(this);
@@ -1346,9 +1094,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
this.expression = expression;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/StateFieldResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/StateFieldResolver.java
index d32f8de..b5facdc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/StateFieldResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/StateFieldResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,17 +41,11 @@
super(parent, path);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
return getTypeHelper().convertPrimitive(super.buildType());
}
- /**
- * {@inheritDoc}
- */
@Override
protected IManagedType resolveManagedType(IMapping mapping) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryDeclaration.java
index 2e95b85..8f84ee3 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,9 +32,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.SUBQUERY;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryEntityResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryEntityResolver.java
index eb848be..e6f6716 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryEntityResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryEntityResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,18 +90,12 @@
this.entityName = abstractSchemaName.getText();
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
IManagedType entity = getManagedType();
return (entity != null) ? entity.getType() : getTypeHelper().objectType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getType().getTypeDeclaration();
@@ -116,9 +110,6 @@
return entityName;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType() {
@@ -136,9 +127,6 @@
return managedType;
}
- /**
- * {@inheritDoc}
- */
@Override
public IMapping getMapping() {
@@ -194,9 +182,6 @@
return derivedPathResolver;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return entityName;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SumFunctionResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SumFunctionResolver.java
index b87189c..8ece1c4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SumFunctionResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SumFunctionResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
@@ -74,9 +71,6 @@
return helper.objectType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getParentTypeDeclaration();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TableDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TableDeclaration.java
index 0710bae..49a15e6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TableDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TableDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
return ExpressionTools.unquote(rootPath);
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.TABLE;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TreatResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TreatResolver.java
index 77ac85e..7b2a091 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TreatResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TreatResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,9 +44,6 @@
this.entityTypeName = entityTypeName;
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
IManagedType managedType = getManagedType();
@@ -65,26 +62,17 @@
return entityTypeName;
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType() {
return getProvider().getEntityNamed(entityTypeName);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setNullAllowed(boolean nullAllowed) {
super.setNullAllowed(nullAllowed);
getParent().setNullAllowed(nullAllowed);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "TREAT(" + getParent() + ") AS " + entityTypeName;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/UnknownDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/UnknownDeclaration.java
index 4c3e8d5..12ae146 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/UnknownDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/UnknownDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,9 +32,6 @@
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return Type.UNKNOWN;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ValueResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ValueResolver.java
index 78f025e..220f02d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ValueResolver.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ValueResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected IType buildType() {
@@ -61,25 +58,16 @@
return getTypeHelper().objectType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected ITypeDeclaration buildTypeDeclaration() {
return getParentTypeDeclaration();
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType() {
return getProvider().getManagedType(getType());
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "VALUE(" + getParent() + ")";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/AndFilter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/AndFilter.java
index e2d9071..4bffa01 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/AndFilter.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/AndFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -76,25 +76,16 @@
return filter;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(T value) {
return filter1.accept(value) && filter2.accept(value);
}
- /**
- * {@inheritDoc}
- */
@Override
public AndFilter<T> clone() {
return (AndFilter<T>) super.clone();
}
- /**
- * {@inheritDoc}
- */
@Override
protected String operatorString() {
return "AND";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/CompoundFilter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/CompoundFilter.java
index 896d5f7..12fd283 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/CompoundFilter.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/CompoundFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -75,9 +75,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public CompoundFilter<T> clone() {
@@ -89,9 +86,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean equals(Object object) {
if (!(object instanceof CompoundFilter<?>)) {
@@ -122,9 +116,6 @@
return filter2;
}
- /**
- * {@inheritDoc}
- */
@Override
public int hashCode() {
return filter1.hashCode() ^ filter2.hashCode();
@@ -137,9 +128,6 @@
*/
protected abstract String operatorString();
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/EmptyIterable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/EmptyIterable.java
index d25943d..0823380 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/EmptyIterable.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/EmptyIterable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,9 +62,6 @@
return (Iterable<T>) INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterator<E> iterator() {
return EmptyIterator.instance();
@@ -75,9 +72,6 @@
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "[]";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/SingleElementListIterable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/SingleElementListIterable.java
index dfbcf2e..c4910dd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/SingleElementListIterable.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/SingleElementListIterable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,17 +51,11 @@
this.element = element;
}
- /**
- * {@inheritDoc}
- */
@Override
public ListIterator<E> iterator() {
return new SingleElementListIterator<E>(this.element);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return "[" + this.element + "]";
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/EmptyIterator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/EmptyIterator.java
index aab4180..d89c553 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/EmptyIterator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/EmptyIterator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,33 +49,21 @@
return (Iterator<T>) INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasNext() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object next() {
throw new NoSuchElementException("A NullIterator is read-only.");
}
- /**
- * {@inheritDoc}
- */
@Override
public void remove() {
throw new UnsupportedOperationException("A NullIterator is read-only.");
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getClass().getSimpleName();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/SingleElementListIterator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/SingleElementListIterator.java
index af01b1d..509655d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/SingleElementListIterator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/SingleElementListIterator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,40 +57,25 @@
this.element = element;
}
- /**
- * {@inheritDoc}
- */
@Override
public void add(E item) {
throw new UnsupportedOperationException("This SingleElementListIterator is read-only.");
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasNext() {
return next == element;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasPrevious() {
return next == END;
}
- /**
- * {@inheritDoc}
- */
public ListIterator<E> iterator() {
return this;
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public E next() {
@@ -103,17 +88,11 @@
return element;
}
- /**
- * {@inheritDoc}
- */
@Override
public int nextIndex() {
return (next == element) ? 0 : 1;
}
- /**
- * {@inheritDoc}
- */
@Override
public E previous() {
@@ -125,25 +104,16 @@
return element;
}
- /**
- * {@inheritDoc}
- */
@Override
public int previousIndex() {
return (next == END) ? 0 : -1;
}
- /**
- * {@inheritDoc}
- */
@Override
public void remove() {
throw new UnsupportedOperationException("This SingleElementListIterator is read-only.");
}
- /**
- * {@inheritDoc}
- */
@Override
public void set(E item) {
throw new UnsupportedOperationException("This SingleElementListIterator is read-only.");
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/filter/NullFilter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/filter/NullFilter.java
index 281398d..aed0d55 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/filter/NullFilter.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/filter/NullFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,17 +47,11 @@
return (Filter<T>) INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(Object value) {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getClass().getSimpleName();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterable/ListIterable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterable/ListIterable.java
index 65940cd..33f46ff 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterable/ListIterable.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterable/ListIterable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,9 +26,6 @@
*/
public interface ListIterable<T> extends Iterable<T> {
- /**
- * {@inheritDoc}
- */
@Override
ListIterator<T> iterator();
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterator/ArrayIterator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterator/ArrayIterator.java
index e33e2e8..255b363 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterator/ArrayIterator.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterator/ArrayIterator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -77,17 +77,11 @@
this.maxIndex = start + length;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasNext() {
return nextIndex < maxIndex;
}
- /**
- * {@inheritDoc}
- */
@Override
public E next() {
@@ -98,17 +92,11 @@
throw new NoSuchElementException("No more elements can be retrieved.");
}
- /**
- * {@inheritDoc}
- */
@Override
public void remove() {
throw new UnsupportedOperationException("An ArrayIterator is read-only.");
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractGrammarValidatorTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractGrammarValidatorTest.java
index 0eef710..f173136 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractGrammarValidatorTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractGrammarValidatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
private JPQLQueryStringFormatter buildFormatter_1() throws Exception {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace("SELECT)", "SELECT )");
}
@@ -56,6 +57,7 @@
private JPQLQueryStringFormatter buildFormatter_10(final String jpqlQuery) {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return jpqlQuery;
}
@@ -64,6 +66,7 @@
private JPQLQueryStringFormatter buildFormatter_2() throws Exception {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace("(DISTINCT)", "(DISTINCT )");
}
@@ -72,6 +75,7 @@
private JPQLQueryStringFormatter buildFormatter_4() throws Exception {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace(",)", ", )");
}
@@ -80,6 +84,7 @@
private JPQLQueryStringFormatter buildFormatter_5() throws Exception {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace(",)", ", )");
}
@@ -88,6 +93,7 @@
private JPQLQueryStringFormatter buildFormatter_6() throws Exception {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace(",)", ", )");
}
@@ -96,6 +102,7 @@
private JPQLQueryStringFormatter buildFormatter_7() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace("0,)", "0, )");
}
@@ -104,6 +111,7 @@
private JPQLQueryStringFormatter buildFormatter_8() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace(",,", ", ,");
}
@@ -112,6 +120,7 @@
private JPQLQueryStringFormatter buildFormatter_9() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.endsWith("NULLS ORDER") ?
query.replace("NULLS ORDER", "NULLS order") :
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractValidatorTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractValidatorTest.java
index f3cb1e4..031b411 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractValidatorTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractValidatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -122,9 +122,6 @@
return ResourceBundle.getBundle(JPQLQueryProblemResourceBundle.class.getName());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void setUpClass() throws Exception {
super.setUpClass();
@@ -137,9 +134,6 @@
validator = buildValidator();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDown() throws Exception {
if (validator != null) {
@@ -148,9 +142,6 @@
super.tearDown();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDownClass() throws Exception {
jpqlGrammar = null;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/DefaultJavaJPQLQueryTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/DefaultJavaJPQLQueryTestHelper.java
index 37fc000..92b37f1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/DefaultJavaJPQLQueryTestHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/DefaultJavaJPQLQueryTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,9 +26,6 @@
*/
public final class DefaultJavaJPQLQueryTestHelper extends JavaJPQLQueryTestHelper {
- /**
- * {@inheritDoc}
- */
@Override
protected IMappingBuilder<Member> buildMappingBuilder() {
return new JavaMappingBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest.java
index f93ddf1..776500f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,25 +34,16 @@
@SuppressWarnings("nls")
public class EclipseLinkGrammarValidatorTest extends AbstractGrammarValidatorTest {
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractGrammarValidator buildValidator() {
return new EclipseLinkGrammarValidator(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
return EclipseLinkVersionTools.isNewerThanOrEqual2_4(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isSubqueryAllowedAnywhere() {
return EclipseLinkVersionTools.isNewerThanOrEqual2_4(jpqlGrammar);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_4.java
index ca5815b..2335e4d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_4.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_4.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
private JPQLQueryStringFormatter buildStringFormatter_1() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace(",)", ", )");
}
@@ -50,6 +51,7 @@
private JPQLQueryStringFormatter buildStringFormatter_2() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("firstName)", "firstName )");
}
@@ -58,6 +60,7 @@
private JPQLQueryStringFormatter buildStringFormatter_3() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace(")", " )");
}
@@ -66,6 +69,7 @@
private JPQLQueryStringFormatter buildStringFormatter_4() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace(",", ", ");
}
@@ -74,23 +78,18 @@
private JPQLQueryStringFormatter buildStringFormatter_5() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("(", "( ");
}
};
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractGrammarValidator buildValidator() {
return new EclipseLinkGrammarValidator(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
return true;
@@ -101,9 +100,6 @@
return currentVersion.isNewerThanOrEqual(version);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isSubqueryAllowedAnywhere() {
return isNewerThanOrEqual(EclipseLinkVersion.VERSION_2_4);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_5.java
index c9ba21a..e5497af 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_5.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_5.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,17 +36,11 @@
@SuppressWarnings("nls")
public final class EclipseLinkGrammarValidatorTest2_5 extends AbstractGrammarValidatorTest {
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractGrammarValidator buildValidator() {
return new EclipseLinkGrammarValidator(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
return true;
@@ -57,9 +51,6 @@
return currentVersion.isNewerThanOrEqual(version);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isSubqueryAllowedAnywhere() {
return isNewerThanOrEqual(EclipseLinkVersion.VERSION_2_4);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkJavaJPQLQueryTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkJavaJPQLQueryTestHelper.java
index 83a6c88..5a86185 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkJavaJPQLQueryTestHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkJavaJPQLQueryTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,9 +26,6 @@
*/
public final class EclipseLinkJavaJPQLQueryTestHelper extends JavaJPQLQueryTestHelper {
- /**
- * {@inheritDoc}
- */
@Override
protected IMappingBuilder<Member> buildMappingBuilder() {
return new EclipseLinkMappingBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorExtensionTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorExtensionTest2_4.java
index 1841e80..62968eb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorExtensionTest2_4.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorExtensionTest2_4.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,9 +38,6 @@
@SuppressWarnings("nls")
public final class EclipseLinkSemanticValidatorExtensionTest2_4 extends AbstractSemanticValidatorTest {
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildQueryContext() {
return new EclipseLinkJPQLQueryContext(jpqlGrammar);
@@ -48,24 +45,24 @@
private EclipseLinkSemanticValidatorExtension buildSemanticExtension() {
return new EclipseLinkSemanticValidatorExtension() {
+ @Override
public boolean columnExists(String tableName, String columnName) {
return columnNames(tableName).contains(columnName);
}
+ @Override
public String getEntityTable(String entityName) {
if ("Employee".equals(entityName)) {
return "EMPLOYEE";
}
return null;
}
+ @Override
public boolean tableExists(String tableName) {
return tableNames().contains(tableName);
}
};
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSemanticValidator buildValidator() {
return new EclipseLinkSemanticValidator(
@@ -96,17 +93,11 @@
return columnNames;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isComparisonTypeChecked() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isPathExpressionToCollectionMappingAllowed() {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest.java
index 126a56a..32d57ef 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,15 +40,13 @@
private JPQLQueryStringFormatter buildFormatter_01(final String jpqlQuery) {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return jpqlQuery;
}
};
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildQueryContext() {
return new EclipseLinkJPQLQueryContext(jpqlGrammar);
@@ -58,9 +56,6 @@
return EclipseLinkSemanticValidatorExtension.NULL_EXTENSION;
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSemanticValidator buildValidator() {
return new EclipseLinkSemanticValidator(
@@ -69,17 +64,11 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isComparisonTypeChecked() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isPathExpressionToCollectionMappingAllowed() {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_4.java
index b3fefad..1d544e2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_4.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_4.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,17 +37,11 @@
@SuppressWarnings("nls")
public final class EclipseLinkSemanticValidatorTest2_4 extends AbstractSemanticValidatorTest {
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildQueryContext() {
return new EclipseLinkJPQLQueryContext(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSemanticValidator buildValidator() {
return new EclipseLinkSemanticValidator(
@@ -56,17 +50,11 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isComparisonTypeChecked() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isPathExpressionToCollectionMappingAllowed() {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_5.java
index 36f58b1..a8dadb8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_5.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_5.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,9 +37,6 @@
@SuppressWarnings("nls")
public class EclipseLinkSemanticValidatorTest2_5 extends AbstractSemanticValidatorTest {
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildQueryContext() {
return new EclipseLinkJPQLQueryContext(jpqlGrammar);
@@ -49,9 +46,6 @@
return EclipseLinkSemanticValidatorExtension.NULL_EXTENSION;
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSemanticValidator buildValidator() {
return new EclipseLinkSemanticValidator(
@@ -60,17 +54,11 @@
);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isComparisonTypeChecked() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isPathExpressionToCollectionMappingAllowed() {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ExpressionToolsTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ExpressionToolsTest.java
index 2391d8e..1684350 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ExpressionToolsTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ExpressionToolsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_1() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("+", " + ");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLCoreTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLCoreTest.java
index 022e8ba..f191214 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLCoreTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLCoreTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -72,9 +72,6 @@
return jpqlQueryTestHelper;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -83,9 +80,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void setUpClass() throws Exception {
super.setUpClass();
@@ -94,9 +88,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDown() throws Exception {
super.tearDown();
@@ -105,9 +96,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDownClass() throws Exception {
super.tearDownClass();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryHelperTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryHelperTestHelper.java
index bfa3b6b..255e26f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryHelperTestHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryHelperTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,6 @@
* This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql.
* AbstractJPQLQueryHelper AbstractJPQLQueryHelper} into the unit-test before it is run. It allows
* using multiple instances and the unit-tests are run with each of them separately.
- * <p>
* <ul>
* <li>Method in a test suite: Request the concrete instances that will be injected into the
* unit-tests before they are run.</li>
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryTestHelperTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryTestHelperTestHelper.java
index 2b7d9c7..1b17c88 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryTestHelperTestHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryTestHelperTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,6 @@
* This annotation is used to inject a concrete instance of {@link JPQLQueryTestHelper} into the
* unit-test before it is run. It allows using multiple instances and the unit-tests are run with
* each of them separately.
- * <p>
* <ul>
* <li>Method in a test suite: Request the concrete instances that will be injected into the
* unit-tests before they are run.</li>
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLTestRunner.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLTestRunner.java
index 5354364..685b7d5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLTestRunner.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLTestRunner.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -125,7 +125,7 @@
* Creates a new <code>JPQLTestRunner</code>.
*
* @param testClass The class that is either a test suite or a unit-tests
- * @param suiteHelper The parent {@link SuiteHelper} or {@link null} if none was defined yet
+ * @param suiteHelper The parent {@link SuiteHelper} or {@code null} if none was defined yet
* @throws InitializationError If the given test class is malformed
*/
public JPQLTestRunner(Class<?> testClass, SuiteHelper suiteHelper) throws InitializationError {
@@ -253,7 +253,7 @@
}
// Create the default runner
- return new AllDefaultPossibilitiesBuilder(true).runnerForClass(testClass);
+ return new AllDefaultPossibilitiesBuilder().runnerForClass(testClass);
}
catch (Throwable e) {
return new ErrorReportingRunner(testClass, e);
@@ -326,18 +326,12 @@
return suiteHelpers;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void collectInitializationErrors(List<Throwable> errors) {
super.collectInitializationErrors(errors);
initializeDescriptionHelper(errors);
}
- /**
- * {@inheritDoc}
- */
@Override
protected Description describeChild(Runner child) {
return child.getDescription();
@@ -358,9 +352,6 @@
return findSuiteClasses(testClass.getSuperclass());
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<Runner> getChildren() {
// Cache the Description since JUnit always recreate it, this will increase performance
@@ -370,9 +361,6 @@
return runners;
}
- /**
- * {@inheritDoc}
- */
@Override
public Description getDescription() {
// Cache the Description since JUnit always recreate it, this will increase performance
@@ -382,9 +370,6 @@
return description;
}
- /**
- * {@inheritDoc}
- */
@Override
protected String getName() {
// Cache the Description since JUnit always recreate it, this will increase performance and
@@ -445,9 +430,6 @@
return keys;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void runChild(Runner child, RunNotifier notifier) {
child.run(notifier);
@@ -525,9 +507,6 @@
};
}
- /**
- * {@inheritDoc}
- */
@Override
protected Statement classBlock(RunNotifier notifier) {
Statement statement = new CreateTestStatement();
@@ -537,9 +516,6 @@
return statement;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Object createTest() throws Exception {
return test;
@@ -552,9 +528,6 @@
return methods;
}
- /**
- * {@inheritDoc}
- */
@Override
public Description getDescription() {
if (description == null) {
@@ -576,9 +549,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected Statement methodBlock(FrameworkMethod method) {
Statement statement = new SetUpStatement();
@@ -587,18 +557,12 @@
return statement;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Statement methodInvoker(FrameworkMethod method, Object test) {
this.test = (JPQLBasicTest) test;
return super.methodInvoker(method, test);
}
- /**
- * {@inheritDoc}
- */
@Override
protected String testName(FrameworkMethod method) {
@@ -631,9 +595,7 @@
this.statement2 = statement2;
}
- /**
- * {@inheritDoc}
- */
+
@Override
public void evaluate() throws Throwable {
statement1.evaluate();
@@ -665,9 +627,7 @@
this.statement = statement;
}
- /**
- * {@inheritDoc}
- */
+
@Override
public void evaluate() throws Throwable {
statement.evaluate();
@@ -699,9 +659,7 @@
this.statement = statement;
}
- /**
- * {@inheritDoc}
- */
+
@Override
public void evaluate() throws Throwable {
try {
@@ -728,9 +686,7 @@
this.statement = statement;
}
- /**
- * {@inheritDoc}
- */
+
@Override
public void evaluate() throws Throwable {
try {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaJPQLQueryTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaJPQLQueryTestHelper.java
index 0e7b8ab..c0fb40a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaJPQLQueryTestHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaJPQLQueryTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,13 +60,11 @@
/**
* Creates
*
- * @return
+ * @return mapping builder
*/
protected abstract IMappingBuilder<Member> buildMappingBuilder();
- /**
- * {@inheritDoc}
- */
+ @Override
public IORMConfiguration getORMConfiguration(String ormXmlFileName) throws Exception {
if (ormConfigurations == null) {
@@ -83,9 +81,7 @@
return ormConfiguration;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IManagedTypeProvider getPersistenceUnit() throws Exception {
if (persistenceUnit == null) {
persistenceUnit = new JavaManagedTypeProvider(buildMappingBuilder());
@@ -114,27 +110,19 @@
persistenceUnit.addEmbeddable(ZipCode.class);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void setUp() throws Exception {
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void setUpBefore() throws Exception {
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void tearDown() throws Exception {
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void tearDownAfter() throws Exception {
}
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java
index a9de81d..d1e003f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,44 +80,30 @@
return url.toURI().toString();
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<IEntity> entities() {
populate();
return super.entities();
}
- /**
- * {@inheritDoc}
- */
@Override
public IEntity getEntity(String entityName) {
populate();
return super.getEntity(entityName);
}
- /**
- * {@inheritDoc}
- */
@Override
public IManagedType getManagedType(IType type) {
populate();
return super.getManagedType(type);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IQuery getNamedQuery(String queryName) {
populate();
return queries.get(queryName);
}
- /**
- * {@inheritDoc}
- */
@Override
public Iterable<IManagedType> managedTypes() {
populate();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ORMJPQLQueryHelperTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ORMJPQLQueryHelperTest.java
index 1f86812..6263488 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ORMJPQLQueryHelperTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ORMJPQLQueryHelperTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,9 +32,6 @@
@RunWith(JPQLTestRunner.class)
public final class ORMJPQLQueryHelperTest extends AbstractJPQLQueryHelperTest {
- /**
- * {@inheritDoc}
- */
@Override
protected IQuery namedQuery(String entityName, String queryName) throws Exception {
IORMConfiguration ormConfiguration = getORMConfiguration("orm2.xml");
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/AbstractFunctionExpressionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/AbstractFunctionExpressionTest.java
index 3483c3c..bfed1fa 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/AbstractFunctionExpressionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/AbstractFunctionExpressionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
private JPQLQueryStringFormatter buildQueryStringFormatter_1() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("(,)", "(, )");
}
@@ -41,6 +42,7 @@
private JPQLQueryStringFormatter buildQueryStringFormatter_2() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace(",)", ", )");
}
@@ -49,6 +51,7 @@
private JPQLQueryStringFormatter buildQueryStringFormatter_3(final String jpqlQuery) {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return jpqlQuery;
}
@@ -57,6 +60,7 @@
private JPQLQueryStringFormatter buildQueryStringFormatter_4(final String jpqlQuery) {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return jpqlQuery.replaceAll("=", " = ").replaceAll("\\s+", " ");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/BadExpressionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/BadExpressionTest.java
index dd5aa8f..9f9b0f5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/BadExpressionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/BadExpressionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -241,6 +241,7 @@
// @Test // No Timeout: done internally
public void testRemoveCharacter() throws Exception {
testQueries(new QueryModifier() {
+ @Override
public void modify(StringBuilder query, int position) {
// Skip espaced character otherwise the string becomes invalid
if ((query.charAt(position) == '\\') ||
@@ -256,6 +257,7 @@
// @Test // No Timeout: done internally
public void testZAddCharacter() throws Exception {
testQueries(new QueryModifier() {
+ @Override
public void modify(StringBuilder query, int position) {
query.insert(position, 'a');
}
@@ -265,6 +267,7 @@
// @Test // No Timeout: done internally
public void testZAddWhitespace() throws Exception {
testQueries(new QueryModifier() {
+ @Override
public void modify(StringBuilder query, int position) {
// Skip espaced character otherwise the string becomes invalid
if ((query.charAt(position) == '\\') ||
@@ -280,6 +283,7 @@
// @Test // No Timeout: done internally
public void testZChangeCharacterToAnything() throws Exception {
testQueries(new QueryModifier() {
+ @Override
public void modify(StringBuilder query, int position) {
// Skip espaced character otherwise the string becomes invalid
if ((query.charAt(position) == '\\') ||
@@ -295,6 +299,7 @@
// @Test // No Timeout: done internally
public void testZChangeCharacterToCloseParenthesis() throws Exception {
testQueries(new QueryModifier() {
+ @Override
public void modify(StringBuilder query, int position) {
// Skip espaced character otherwise the string becomes invalid
if ((query.charAt(position) == '\\') ||
@@ -310,6 +315,7 @@
// @Test // No Timeout: done internally
public void testZChangeCharacterToOpenParenthesis() throws Exception {
testQueries(new QueryModifier() {
+ @Override
public void modify(StringBuilder query, int position) {
// Skip espaced character otherwise the string becomes invalid
if ((query.charAt(position) == '\\') ||
@@ -325,6 +331,7 @@
// @Test // No Timeout: done internally
public void testZChangeCharacterToSingleQuote() throws Exception {
testQueries(new QueryModifier() {
+ @Override
public void modify(StringBuilder query, int position) {
// Skip espaced character otherwise the string becomes invalid
if ((query.charAt(position) == '\\') ||
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/CastExpressionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/CastExpressionTest.java
index d087980..3658e44 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/CastExpressionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/CastExpressionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
private JPQLQueryStringFormatter buildStringFormatter_01() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace("AS)", "AS )");
}
@@ -39,6 +40,7 @@
private JPQLQueryStringFormatter buildStringFormatter_02() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replace("TIMESTAMP)", "timestamp)");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/CollectionMemberDeclarationTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/CollectionMemberDeclarationTest.java
index 8932369..216f221 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/CollectionMemberDeclarationTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/CollectionMemberDeclarationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_09() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("IN(AS", "IN( AS");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ConcatExpressionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ConcatExpressionTest.java
index 9e8ae67..a565594 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ConcatExpressionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ConcatExpressionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
private JPQLQueryStringFormatter buildQueryStringFormatter_04() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace(",)", ", )");
}
@@ -31,6 +32,7 @@
private JPQLQueryStringFormatter buildQueryStringFormatter_11() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace(",)", ", )");
}
@@ -39,6 +41,7 @@
private JPQLQueryStringFormatter buildQueryStringFormatter_12() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("(AND", "( AND");
}
@@ -47,6 +50,7 @@
private JPQLQueryStringFormatter buildQueryStringFormatter_13() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
query = query.replace("(AND", "( AND");
query = query.replace("\')", "\' )");
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ConditionalExpressionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ConditionalExpressionTest.java
index a0ea442..31af153 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ConditionalExpressionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ConditionalExpressionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_09() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("+", " + ");
}
@@ -31,6 +32,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_10() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("-", " - ");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/EclipseLinkJPQLParserTests2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/EclipseLinkJPQLParserTests2_5.java
index 89f36e0..ba4e78a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/EclipseLinkJPQLParserTests2_5.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/EclipseLinkJPQLParserTests2_5.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_1() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace(" TIMESTAMP", " timestamp");
}
@@ -40,6 +41,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_2() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("SCN", "scn");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/IndexExpressionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/IndexExpressionTest.java
index 2d937c6..1ae14bb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/IndexExpressionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/IndexExpressionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_03() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("INDEX(BETWEEN", "INDEX( BETWEEN");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLGrammarTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLGrammarTestHelper.java
index 131f2c9..642d957 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLGrammarTestHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLGrammarTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,10 +22,9 @@
import java.lang.annotation.Target;
/**
- * This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql.
- * parser.JPQLGrammar JPQLGrammar} into the unit-test before it is run. It allows using multiple
+ * This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar
+ * JPQLGrammar} into the unit-test before it is run. It allows using multiple
* instances and the unit-tests are run with each of them separately.
- * <p>
* <ul>
* <li>Method in a test suite: Request the concrete instances that will be injected into the
* unit-tests before they are run.</li>
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLParserTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLParserTest.java
index e7357c7..8435bd5 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLParserTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLParserTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -203,7 +203,6 @@
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
* @param jpqlGrammar The {@link JPQLGrammar} used to determine how to parse the JPQL query
- * @param formatter This formatter is used to personalized the formatting of the JPQL query
* before it is used to test the generated string
*/
protected void testInvalidQuery(String jpqlQuery,
@@ -241,7 +240,7 @@
* @param jpqlQuery The JPQL query to parse and to test the parsed tree representation
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
- * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
+ * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
* JPQLQueryBNF JPQLQueryBNF}
*/
protected void testInvalidQuery(String jpqlQuery,
@@ -260,7 +259,7 @@
* @param jpqlQuery The JPQL query to parse and to test the parsed tree representation
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
- * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
+ * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
* JPQLQueryBNF JPQLQueryBNF}
* @param formatter This formatter is used to personalized the formatting of the JPQL query
* before it is used to test the generated string
@@ -352,7 +351,7 @@
* @param jpqlQuery The JPQL query to parse and to test the parsed tree representation
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
- * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
+ * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
* JPQLQueryBNF JPQLQueryBNF}
* @param formatter This formatter is used to personalized the formatting of the JPQL query
* before it is used to test the generated string
@@ -375,7 +374,7 @@
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
* @param jpqlGrammar The {@link JPQLGrammar} used to determine how to parse the JPQL query
- * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
+ * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
* JPQLQueryBNF JPQLQueryBNF}
* @param formatter This formatter is used to personalized the formatting of the JPQL query
* before it is used to test the generated string
@@ -433,8 +432,7 @@
* @param jpqlQuery The JPQL query to parse and to test the parsed tree representation
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
- * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
- * JPQLQueryBNF JPQLQueryBNF}
+ * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.JPQLQueryBNF JPQLQueryBNF}
*/
protected void testQuery(String jpqlQuery,
ExpressionTester expressionTester,
@@ -456,8 +454,7 @@
* @param jpqlQuery The JPQL query to parse and to test the parsed tree representation
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
- * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
- * JPQLQueryBNF JPQLQueryBNF}
+ * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.JPQLQueryBNF JPQLQueryBNF}
* @param formatter This formatter is used to personalized the formatting of the JPQL query
* before it is used to test the generated string
*/
@@ -477,7 +474,7 @@
* @param jpqlQuery The JPQL query to parse and to test the parsed tree representation
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
- * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
+ * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
* JPQLQueryBNF JPQLQueryBNF}
* @param formatter This formatter is used to personalized the formatting of the JPQL query
* before it is used to test the generated string
@@ -535,7 +532,7 @@
* @param jpqlQuery The JPQL query to parse and to test the parsed tree representation
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
- * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
+ * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
* JPQLQueryBNF JPQLQueryBNF}
*/
protected void testValidQuery(String jpqlQuery,
@@ -554,7 +551,7 @@
* @param jpqlQuery The JPQL query to parse and to test the parsed tree representation
* @param expressionTester The tester used to verify the parsed tree is correctly representing the
* JPQL query
- * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
+ * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.
* JPQLQueryBNF JPQLQueryBNF}
* @param formatter This formatter is used to personalized the formatting of the JPQL query
* before it is used to test the generated string
@@ -599,6 +596,7 @@
protected abstract String identifier();
+ @Override
public void test(Expression expression) {
assertInstance(expression, expressionType());
@@ -692,6 +690,7 @@
protected abstract String identifier();
+ @Override
public void test(Expression expression) {
assertInstance(expression, expressionType());
@@ -727,10 +726,12 @@
*/
public static abstract class AbstractExpressionTester implements ExpressionTester {
+ @Override
public final AdditionExpressionTester add(ExpressionTester expression) {
return JPQLParserTester.add(this, expression);
}
+ @Override
public final AndExpressionTester and(ExpressionTester expression) {
return JPQLParserTester.and(this, expression);
}
@@ -756,32 +757,39 @@
}
}
+ @Override
public final BetweenExpressionTester between(ExpressionTester lowerBoundExpression,
ExpressionTester upperBoundExpression) {
return JPQLParserTester.between(this, lowerBoundExpression, upperBoundExpression);
}
+ @Override
public final ComparisonExpressionTester different(ExpressionTester expression) {
return JPQLParserTester.different(this, expression);
}
+ @Override
public final DivisionExpressionTester divide(ExpressionTester expression) {
return JPQLParserTester.division(this, expression);
}
+ @Override
public final ComparisonExpressionTester equal(ExpressionTester expression) {
return JPQLParserTester.equal(this, expression);
}
+ @Override
public final ComparisonExpressionTester greaterThan(ExpressionTester expression) {
return JPQLParserTester.greaterThan(this, expression);
}
+ @Override
public final ComparisonExpressionTester greaterThanOrEqual(ExpressionTester expression) {
return JPQLParserTester.greaterThanOrEqual(this, expression);
}
+ @Override
public final InExpressionTester in(ExpressionTester... inItems) {
if (inItems.length == 1) {
return JPQLParserTester.in(this, inItems[0]);
@@ -789,62 +797,76 @@
return JPQLParserTester.in(this, inItems);
}
+ @Override
public final InExpressionTester in(String inputParameter) {
return JPQLParserTester.in(this, inputParameter);
}
+ @Override
public final EmptyCollectionComparisonExpressionTester isEmpty() {
return JPQLParserTester.isEmpty(this);
}
+ @Override
public final EmptyCollectionComparisonExpressionTester isNotEmpty() {
return JPQLParserTester.isNotEmpty(this);
}
+ @Override
public boolean isNull() {
return false;
}
+ @Override
public final LikeExpressionTester like(ExpressionTester patternValue) {
return JPQLParserTester.like(this, patternValue);
}
+ @Override
public final LikeExpressionTester like(ExpressionTester patternValue,
ExpressionTester escapeCharacter) {
return JPQLParserTester.like(this, patternValue, escapeCharacter);
}
+ @Override
public final ComparisonExpressionTester lowerThan(ExpressionTester expression) {
return JPQLParserTester.lowerThan(this, expression);
}
+ @Override
public final ComparisonExpressionTester lowerThanOrEqual(ExpressionTester expression) {
return JPQLParserTester.lowerThanOrEqual(this, expression);
}
+ @Override
public final CollectionMemberExpressionTester member(ExpressionTester collectionPath) {
return JPQLParserTester.member(this, collectionPath);
}
+ @Override
public final CollectionMemberExpressionTester memberOf(ExpressionTester collectionPath) {
return JPQLParserTester.memberOf(this, collectionPath);
}
+ @Override
public final MultiplicationExpressionTester multiply(ExpressionTester expression) {
return JPQLParserTester.multiplication(this, expression);
}
+ @Override
public final BetweenExpressionTester notBetween(ExpressionTester lowerBoundExpression,
ExpressionTester upperBoundExpression) {
return JPQLParserTester.notBetween(this, lowerBoundExpression, upperBoundExpression);
}
+ @Override
public final ComparisonExpressionTester notEqual(ExpressionTester expression) {
return JPQLParserTester.notEqual(this, expression);
}
+ @Override
public final InExpressionTester notIn(ExpressionTester... inItems) {
if (inItems.length == 1) {
return JPQLParserTester.notIn(this, inItems[0]);
@@ -852,36 +874,44 @@
return JPQLParserTester.notIn(this, inItems);
}
+ @Override
public final InExpressionTester notIn(String inputParameter) {
return JPQLParserTester.notIn(this, inputParameter);
}
+ @Override
public final LikeExpressionTester notLike(ExpressionTester expression) {
return JPQLParserTester.notLike(this, expression);
}
+ @Override
public final LikeExpressionTester notLike(ExpressionTester expression,
ExpressionTester escapeCharacter) {
return JPQLParserTester.notLike(this, expression, escapeCharacter);
}
+ @Override
public final ExpressionTester notMember(ExpressionTester collectionPath) {
return JPQLParserTester.notMember(this, collectionPath);
}
+ @Override
public final ExpressionTester notMemberOf(ExpressionTester collectionPath) {
return JPQLParserTester.notMemberOf(this, collectionPath);
}
+ @Override
public final OrExpressionTester or(ExpressionTester expression) {
return JPQLParserTester.or(this, expression);
}
+ @Override
public final RegexpExpressionTester regexp(StringLiteralTester patternValue) {
return JPQLParserTester.regexp(this, patternValue);
}
+ @Override
public final SubtractionExpressionTester subtract(ExpressionTester expression) {
return JPQLParserTester.subtract(this, expression);
}
@@ -908,6 +938,7 @@
this.hasSpaceAfterHierarchicalQueryClause = !hierarchicalQueryClause.isNull() && !asOfClause.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, AbstractFromClause.class);
@@ -958,6 +989,7 @@
protected abstract String identifier();
+ @Override
public void test(Expression expression) {
assertInstance(expression, AbstractOrderByClause.class);
@@ -1001,6 +1033,7 @@
}
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, AbstractPathExpression.class);
@@ -1035,6 +1068,7 @@
this.abstractSchemaName = abstractSchemaName;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, AbstractSchemaName.class);
@@ -1063,6 +1097,7 @@
this.selectExpression = selectExpression;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, AbstractSelectClause.class);
@@ -1129,6 +1164,7 @@
protected abstract Class<? extends AbstractSelectStatement> expressionType();
+ @Override
public void test(Expression expression) {
assertInstance(expression, expressionType());
@@ -1391,6 +1427,7 @@
this.expression = expression;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, ArithmeticFactor.class);
@@ -1426,6 +1463,7 @@
this.hasSpaceAfterCategory = (category != null) && !expression.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, AsOfClause.class);
@@ -1482,6 +1520,7 @@
this.expression = expression;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, BadExpression.class);
@@ -1525,6 +1564,7 @@
this.upperBoundExpression = upperBoundExpression;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, BetweenExpression.class);
@@ -1604,6 +1644,7 @@
this.hasSpaceAfterWhenClauses = !whenClauses.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, CaseExpression.class);
@@ -1739,6 +1780,7 @@
this.commas = commas;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, CollectionExpression.class);
@@ -1818,6 +1860,7 @@
this.hasSpaceAfterRightParenthesis = hasAs || !identificationVariable.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, CollectionMemberDeclaration.class);
@@ -1887,6 +1930,7 @@
this.collectionPath = collectionPath;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, CollectionMemberExpression.class);
@@ -1964,6 +2008,7 @@
this.hasSpaceAfterIdentifier = true;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, ComparisonExpression.class);
@@ -2012,6 +2057,7 @@
protected abstract String identifier();
+ @Override
public void test(Expression expression) {
assertInstance(expression, expressionType());
@@ -2076,6 +2122,7 @@
this.hasSpaceAfterConnectBy = !expression.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, ConnectByClause.class);
@@ -2116,6 +2163,7 @@
this.hasRightParenthesis = true;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, ConstructorExpression.class);
@@ -2197,6 +2245,7 @@
this.dateTime = dateTime;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, DateTime.class);
@@ -2228,6 +2277,7 @@
this.rangeVariableDeclaration = rangeVariableDeclaration;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, DeleteClause.class);
@@ -2273,6 +2323,7 @@
this.hasSpaceAfterDeleteClause = !whereClause.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, DeleteStatement.class);
@@ -2332,6 +2383,7 @@
this.collectionPath = collectionPath;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, EmptyCollectionComparisonExpression.class);
@@ -2373,6 +2425,7 @@
this.entityType = entityType;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, EntityTypeLiteral.class);
@@ -2636,6 +2689,7 @@
this.hasSpaceAfterGroupBy = !groupByItems.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, GroupByClause.class);
@@ -2696,6 +2750,7 @@
this.hasSpaceAfterConnectByClause = !connectByClause.isNull() && !orderSiblingsByClause.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, HierarchicalQueryClause.class);
@@ -2743,6 +2798,7 @@
this.joins = joins;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, IdentificationVariableDeclaration.class);
@@ -2789,6 +2845,7 @@
return virtual && virtualPathExpression.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, IdentificationVariable.class);
@@ -2850,6 +2907,7 @@
this.hasSpaceAfterIn = !hasLeftParenthesis && !inItems.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, InExpression.class);
@@ -2896,6 +2954,7 @@
this.inputParameter = inputParameter;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, InputParameter.class);
@@ -2942,6 +3001,7 @@
this.joinCondition = joinCondition;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, Join.class);
@@ -3001,6 +3061,7 @@
this.unknownExpression = unknownExpression;
}
+ @Override
public void test(Expression expression) {
JPQLExpression jpqlExpression = (JPQLExpression) expression;
@@ -3031,6 +3092,7 @@
this.keyword = keyword;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, KeywordExpression.class);
@@ -3088,6 +3150,7 @@
this.hasSpaceAfterPatternValue = !patternValue.isNull() && hasEscape;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, LikeExpression.class);
@@ -3265,6 +3328,7 @@
this.hasSpaceAfterNot = true;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, NotExpression.class);
@@ -3299,6 +3363,7 @@
this.expression = expression;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, NullComparisonExpression.class);
@@ -3329,6 +3394,7 @@
return true;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, NullExpression.class);
}
@@ -3367,6 +3433,7 @@
this.number = number;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, NumericLiteral.class);
@@ -3455,6 +3522,7 @@
nullOrdering != NullOrdering.DEFAULT;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, OrderByItem.class);
@@ -3570,6 +3638,7 @@
}
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, RangeVariableDeclaration.class);
@@ -3617,6 +3686,7 @@
this.hasSpaceAfterIdentifier = !patternValue.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, RegexpExpression.class);
@@ -3665,6 +3735,7 @@
this.resultVariable = resultVariable;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, ResultVariable.class);
@@ -3906,6 +3977,7 @@
}
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, StringLiteral.class);
@@ -4030,6 +4102,7 @@
this.hasSpaceAfterAs = hasAs && !identificationVariable.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, Expression.class);
@@ -4216,6 +4289,7 @@
this.hasSpaceAfterAll = hasAll && !subquery.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, UnionClause.class);
@@ -4257,6 +4331,7 @@
this.unknownText = unknownText;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, UnknownExpression.class);
@@ -4291,6 +4366,7 @@
this.hasSpaceAfterRangeVariableDeclaration = !rangeVariableDeclaration.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, UpdateClause.class);
@@ -4348,6 +4424,7 @@
this.hasEqualSign = true;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, UpdateItem.class);
@@ -4394,6 +4471,7 @@
this.hasSpaceAfterUpdateClause = !whereClause.isNull();
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, UpdateStatement.class);
@@ -4456,6 +4534,7 @@
this.whenExpression = whenExpression;
}
+ @Override
public void test(Expression expression) {
assertInstance(expression, WhenClause.class);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueriesTest1_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueriesTest1_0.java
index 1e55d89..bd96f1d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueriesTest1_0.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueriesTest1_0.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_1() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("1+(", "1 + (");
}
@@ -44,6 +45,7 @@
private JPQLQueryStringFormatter buildStringFormatter_1() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("AVG", "avg");
}
@@ -52,6 +54,7 @@
private JPQLQueryStringFormatter buildStringFormatter_2() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("CURRENT_TIMESTAMP", "current_timestamp");
}
@@ -60,6 +63,7 @@
private JPQLQueryStringFormatter buildStringFormatter_3() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("END", "end");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBNFAccessor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBNFAccessor.java
index 859577a..0d7195d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBNFAccessor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBNFAccessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,7 +62,7 @@
/**
* Creates a new <code>JPQLQueryBNFAccessor</code>.
*
- * @param registry
+ * @param registry registry
*/
public JPQLQueryBNFAccessor(ExpressionRegistry registry) {
super();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryStringFormatter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryStringFormatter.java
index 1777c09..563e5cf 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryStringFormatter.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryStringFormatter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,9 +32,7 @@
*/
public static JPQLQueryStringFormatter DEFAULT = new JPQLQueryStringFormatter() {
- /**
- * {@inheritDoc}
- */
+ @Override
public String format(String query) {
return query;
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/LocateExpressionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/LocateExpressionTest.java
index dbfbcd2..785badc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/LocateExpressionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/LocateExpressionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
private JPQLQueryStringFormatter buildFormatter_01() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("LOCATE(AND", "LOCATE( AND");
}
@@ -31,6 +32,7 @@
private JPQLQueryStringFormatter buildFormatter_02() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.substring(0, query.length() - 1);
}
@@ -39,6 +41,7 @@
private JPQLQueryStringFormatter buildFormatter_12() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace(",,", ", ,");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ModExpressionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ModExpressionTest.java
index 04fb09e..6da2a91 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ModExpressionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/ModExpressionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
private JPQLQueryStringFormatter buildQueryStringFormatter_11() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("MOD(AND", "MOD( AND");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/NullIfExpressionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/NullIfExpressionTest.java
index 0d54aab..a3fb63a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/NullIfExpressionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/NullIfExpressionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
public final class NullIfExpressionTest extends JPQLParserTest {
private JPQLQueryStringFormatter buildFormatter_9() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace(",)", ", )");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/OrderByClauseTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/OrderByClauseTest.java
index c0f5282..610e85c 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/OrderByClauseTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/OrderByClauseTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_01(final String jpqlQuery) {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return jpqlQuery;
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/SelectClauseTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/SelectClauseTest.java
index 36f8450..1353c35 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/SelectClauseTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/SelectClauseTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_11() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String jpqlQuery) {
return jpqlQuery.replaceAll("-1", "- 1");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/UpdateItemTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/UpdateItemTest.java
index dc558e1..11dcfb1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/UpdateItemTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/UpdateItemTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
private JPQLQueryStringFormatter buildQueryFormatter_1() {
return new JPQLQueryStringFormatter() {
+ @Override
public String format(String query) {
return query.replace("AVG", "avg");
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/AbstractSemanticValidatorTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/AbstractSemanticValidatorTest.java
index 2fff91f..8eb7539 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/AbstractSemanticValidatorTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/AbstractSemanticValidatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -77,9 +77,6 @@
return new GenericSemanticValidatorHelper(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
protected abstract AbstractSemanticValidator buildValidator();
@@ -87,9 +84,6 @@
return queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSemanticValidator getValidator() {
return (AbstractSemanticValidator) super.getValidator();
@@ -99,27 +93,18 @@
protected abstract boolean isPathExpressionToCollectionMappingAllowed();
- /**
- * {@inheritDoc}
- */
@Override
protected void setUpClass() throws Exception {
queryContext = buildQueryContext();
super.setUpClass();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDown() throws Exception {
queryContext.dispose();
super.tearDown();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDownClass() throws Exception {
queryContext = null;
@@ -1838,9 +1823,6 @@
testHasNoProblems(problems);
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<JPQLQueryProblem> validate(String jpqlQuery, JPQLExpression jpqlExpression) throws Exception {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ContentAssistTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ContentAssistTest.java
index 6c50a43..181b223 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ContentAssistTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ContentAssistTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -428,9 +428,6 @@
return names;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void setUpClass() throws Exception {
super.setUpClass();
@@ -468,9 +465,6 @@
return tableNames;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDown() throws Exception {
queryHelper.dispose();
@@ -478,9 +472,6 @@
super.tearDown();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDownClass() throws Exception {
bnfAccessor = null;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DeclarationTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DeclarationTest.java
index 9dcb00c..3bd65e1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DeclarationTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DeclarationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -186,27 +186,18 @@
return rangeDeclaration(entityName, variableName, null, joins);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void setUpClass() throws Exception {
super.setUpClass();
virtualQuery = new JavaQuery(getPersistenceUnit(), null);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDown() throws Exception {
super.tearDown();
virtualQuery.setExpression(null);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void tearDownClass() throws Exception {
virtualQuery = null;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistExtensionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistExtensionTest.java
index 3ed8387..777b043 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistExtensionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistExtensionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,62 +31,47 @@
@UniqueSignature
public final class DefaultContentAssistExtensionTest extends AbstractContentAssistExtensionTest {
- /**
- * {@inheritDoc}
- */
@Override
protected Class<?> acceptableType(String identifier) {
return defaultAcceptableType(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected ContentAssistExtension buildContentAssistExtension() {
return new ContentAssistExtension() {
+ @Override
public Iterable<String> classNames(String prefix, ClassType type) {
if (type == ClassType.INSTANTIABLE) {
return filter(DefaultContentAssistExtensionTest.this.classNames(), prefix);
}
return filter(DefaultContentAssistExtensionTest.this.enumTypes(), prefix);
}
+ @Override
public Iterable<String> columnNames(String tableName, String prefix) {
return Collections.emptyList();
}
+ @Override
public Iterable<String> tableNames(String prefix) {
return Collections.emptyList();
}
};
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> classNames() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> columnNames(String tableName) {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> enumTypes() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> tableNames() {
return Collections.emptyList();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistTest.java
index 484e844..e287cac 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,57 +30,36 @@
@UniqueSignature
public final class DefaultContentAssistTest extends AbstractContentAssistTest {
- /**
- * {@inheritDoc}
- */
@Override
protected Class<?> acceptableType(String identifier) {
return defaultAcceptableType(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> classNames() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> columnNames(String tableName) {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> enumConstants() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> enumTypes() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> tableNames() {
return Collections.emptyList();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultDefaultContentAssistExtensionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultDefaultContentAssistExtensionTest.java
index d358b66..bf1c179 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultDefaultContentAssistExtensionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultDefaultContentAssistExtensionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,78 +29,57 @@
@UniqueSignature
public final class DefaultDefaultContentAssistExtensionTest extends AbstractContentAssistTest {
- /**
- * {@inheritDoc}
- */
@Override
protected Class<?> acceptableType(String identifier) {
return defaultAcceptableType(identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected ContentAssistExtension buildContentAssistExtension() {
return new ContentAssistExtension() {
+ @Override
public Iterable<String> classNames(String prefix, ClassType type) {
if (type == ClassType.INSTANTIABLE) {
return filter(DefaultDefaultContentAssistExtensionTest.this.classNames(), prefix);
}
return filter(DefaultDefaultContentAssistExtensionTest.this.enumTypes(), prefix);
}
+ @Override
public Iterable<String> columnNames(String tableName, String prefix) {
return Collections.emptyList();
}
+ @Override
public Iterable<String> tableNames(String prefix) {
return Collections.emptyList();
}
};
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> classNames() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> columnNames(String tableName) {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> enumConstants() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> enumTypes() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> tableNames() {
return Collections.emptyList();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_0.java
index 31355bb..bc087e4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_0.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_0.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,25 +35,16 @@
@SuppressWarnings("nls")
public final class DefaultGrammarValidatorTest2_0 extends AbstractGrammarValidatorTest {
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractGrammarValidator buildValidator() {
return new DefaultGrammarValidator(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isSubqueryAllowedAnywhere() {
return jpqlGrammar.getJPAVersion().isNewerThanOrEqual(JPAVersion.VERSION_2_1);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_1.java
index 6084e8f..052edb6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_1.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,17 +34,11 @@
@SuppressWarnings("nls")
public class DefaultGrammarValidatorTest2_1 extends AbstractGrammarValidatorTest {
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractGrammarValidator buildValidator() {
return new DefaultGrammarValidator(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
return false;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest.java
index 04017fc..9f11773 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,9 +38,6 @@
return entity;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IQuery namedQuery(String entityName, String queryName) throws Exception {
IEntity entity = entity(entityName);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest2_1.java
index ff27883..28ece89 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest2_1.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest2_1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,6 @@
return entity;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IQuery namedQuery(String entityName, String queryName) throws Exception {
IEntity entity = entity(entityName);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_0.java
index fdd43ec..e44c883 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_0.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_0.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,33 +35,21 @@
@SuppressWarnings("nls")
public final class DefaultSemanticValidatorTest2_0 extends AbstractSemanticValidatorTest {
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildQueryContext() {
return new DefaultJPQLQueryContext(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSemanticValidator buildValidator() {
return new DefaultSemanticValidator(buildSemanticValidatorHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isComparisonTypeChecked() {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isPathExpressionToCollectionMappingAllowed() {
return false;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_1.java
index 4bb753b..afc5ffb 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_1.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_1.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,33 +34,21 @@
@SuppressWarnings("nls")
public final class DefaultSemanticValidatorTest2_1 extends AbstractSemanticValidatorTest {
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildQueryContext() {
return new DefaultJPQLQueryContext(jpqlGrammar);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractSemanticValidator buildValidator() {
return new DefaultSemanticValidator(buildSemanticValidatorHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isComparisonTypeChecked() {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isPathExpressionToCollectionMappingAllowed() {
return false;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistExtensionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistExtensionTest.java
index 311287f..35a8a00 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistExtensionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistExtensionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,21 +37,21 @@
public final class EclipseLinkContentAssistExtensionTest extends AbstractContentAssistExtensionTest {
- /**
- * {@inheritDoc}
- */
@Override
protected ContentAssistExtension buildContentAssistExtension() {
return new ContentAssistExtension() {
+ @Override
public Iterable<String> classNames(String prefix, ClassType type) {
if (type == ClassType.INSTANTIABLE) {
return filter(EclipseLinkContentAssistExtensionTest.this.classNames(), prefix);
}
return filter(EclipseLinkContentAssistExtensionTest.this.enumTypes(), prefix);
}
+ @Override
public Iterable<String> columnNames(String tableName, String prefix) {
return filter(EclipseLinkContentAssistExtensionTest.this.columnNames(tableName), prefix);
}
+ @Override
public Iterable<String> tableNames(String prefix) {
return filter(EclipseLinkContentAssistExtensionTest.this.tableNames(), prefix);
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_4.java
index 4caeed2..6b7926e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_4.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_4.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,17 +36,11 @@
@SuppressWarnings("nls")
public final class EclipseLinkContentAssistTest2_4 extends AbstractContentAssistTest {
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> classNames() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> clauses(String afterIdentifier, String beforeIdentifier, boolean subquery) {
@@ -141,33 +135,21 @@
return proposals;
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> columnNames(String tableName) {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> enumConstants() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> enumTypes() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> fromClauseInternalClauses(String afterIdentifier) {
@@ -206,18 +188,12 @@
return super.fromClauseInternalClauses(afterIdentifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
EclipseLinkVersion currentVersion = EclipseLinkVersion.value(getGrammar().getProviderVersion());
return currentVersion.isNewerThanOrEqual(EclipseLinkJPQLGrammar2_4.VERSION);
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> tableNames() {
return Collections.emptyList();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_5.java
index 633aa67..46191d6 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_5.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_5.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,17 +36,11 @@
@SuppressWarnings("nls")
public final class EclipseLinkContentAssistTest2_5 extends AbstractContentAssistTest {
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> classNames() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> clauses(String afterIdentifier, String beforeIdentifier, boolean subquery) {
@@ -141,33 +135,21 @@
return proposals;
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> columnNames(String tableName) {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> enumConstants() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> enumTypes() {
return Collections.emptyList();
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> fromClauseInternalClauses(String afterIdentifier) {
@@ -206,18 +188,12 @@
return super.fromClauseInternalClauses(afterIdentifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
EclipseLinkVersion currentVersion = EclipseLinkVersion.value(getGrammar().getProviderVersion());
return currentVersion.isNewerThanOrEqual(EclipseLinkJPQLGrammar2_4.VERSION);
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> tableNames() {
return Collections.emptyList();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkDeclarationTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkDeclarationTest.java
index af4863b..8e907db 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkDeclarationTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkDeclarationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,9 +32,6 @@
@SuppressWarnings("nls")
public class EclipseLinkDeclarationTest extends DeclarationTest {
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLQueryContext buildQueryContext() {
return new EclipseLinkJPQLQueryContext(jpqlGrammar);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkEclipseLinkContentAssistExtensionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkEclipseLinkContentAssistExtensionTest.java
index 210af1f..e250e2e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkEclipseLinkContentAssistExtensionTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkEclipseLinkContentAssistExtensionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,30 +29,27 @@
*/
public final class EclipseLinkEclipseLinkContentAssistExtensionTest extends AbstractContentAssistTest {
- /**
- * {@inheritDoc}
- */
@Override
protected ContentAssistExtension buildContentAssistExtension() {
return new ContentAssistExtension() {
+ @Override
public Iterable<String> classNames(String prefix, ClassType type) {
if (type == ClassType.INSTANTIABLE) {
return filter(EclipseLinkEclipseLinkContentAssistExtensionTest.this.classNames(), prefix);
}
return filter(EclipseLinkEclipseLinkContentAssistExtensionTest.this.enumTypes(), prefix);
}
+ @Override
public Iterable<String> columnNames(String tableName, String prefix) {
return filter(EclipseLinkEclipseLinkContentAssistExtensionTest.this.columnNames(tableName), prefix);
}
+ @Override
public Iterable<String> tableNames(String prefix) {
return filter(EclipseLinkEclipseLinkContentAssistExtensionTest.this.tableNames(), prefix);
}
};
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> clauses(String afterIdentifier, String beforeIdentifier, boolean subquery) {
@@ -147,9 +144,6 @@
return proposals;
}
- /**
- * {@inheritDoc}
- */
@Override
protected List<String> fromClauseInternalClauses(String afterIdentifier) {
@@ -188,9 +182,6 @@
return super.fromClauseInternalClauses(afterIdentifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isJoinFetchIdentifiable() {
return true;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest.java
index 2278ac1..92ca3ab 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,9 +36,6 @@
return entity;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IQuery namedQuery(String entityName, String queryName) throws Exception {
IEntity entity = entity(entityName);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_4.java
index 3771639..ed8f3a1 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_4.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_4.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,9 +36,6 @@
return entity;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IQuery namedQuery(String entityName, String queryName) throws Exception {
IEntity entity = entity(entityName);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_5.java
index f27076e..848715b 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_5.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_5.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,9 +33,6 @@
return entity;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IQuery namedQuery(String entityName, String queryName) throws Exception {
IEntity entity = entity(entityName);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ORMEntityJPQLQueryHelperTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ORMEntityJPQLQueryHelperTest.java
index 08a4483..6b2b80f 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ORMEntityJPQLQueryHelperTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ORMEntityJPQLQueryHelperTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,6 @@
return entity;
}
- /**
- * {@inheritDoc}
- */
@Override
protected IQuery namedQuery(String entityName, String queryName) throws Exception {
IEntity entity = entity(entityName);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/RefactoringToolTest2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/RefactoringToolTest2_0.java
index 16c0098..cabf2e9 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/RefactoringToolTest2_0.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/RefactoringToolTest2_0.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,8 +23,8 @@
import static org.junit.Assert.*;
/**
- * The abstract definition of a unit-test that tests {@link org.eclipse.persistence.jpa.jpql.
- * RefactoringTool RefactoringTool} when the JPA version is 2.0.
+ * The abstract definition of a unit-test that tests {@link org.eclipse.persistence.jpa.jpql.tools.RefactoringTool
+ * RefactoringTool} when the JPA version is 2.0.
*
* @version 2.6
* @since 2.4
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/AbstractStateObjectTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/AbstractStateObjectTest.java
index 627273e..bbd4a48 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/AbstractStateObjectTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/AbstractStateObjectTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -2280,8 +2280,8 @@
* Tests the injected {@link IJPQLQueryFormatter} and make sure the generated string will be
* the same as the given JPQL query.
*
- * @param jpqlStateObject
- * @param jpqlQuery
+ * @param jpqlStateObject state object
+ * @param jpqlQuery query
*/
protected void testFormatter(JPQLQueryStateObject jpqlStateObject, String jpqlQuery) {
@@ -2344,8 +2344,6 @@
* @param jpqlQuery The JPQL query to parse and to test the parsed tree representation
* @param queryStatement The tester used to verify the parsed tree is correctly representing the
* JPQL query
- * @param formatter This formatter is used to personalized the formatting of the JPQL query
- * before it is used to test the generated string
* @param tolerant Determines if the parsing system should be tolerant, meaning if it should try
* to parse grammatically invalid or incomplete queries
*/
@@ -2409,6 +2407,7 @@
protected abstract String identifier();
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, expressionType());
@@ -2476,6 +2475,7 @@
protected abstract String identifier();
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, expressionType());
}
@@ -2502,6 +2502,7 @@
this.declaration = declaration;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, AbstractFromClauseStateObject.class);
@@ -2535,6 +2536,7 @@
this.joins = joins;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, AbstractIdentificationVariableDeclarationStateObject.class);
@@ -2576,6 +2578,7 @@
}
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, AbstractPathExpressionStateObject.class);
@@ -2607,6 +2610,7 @@
this.identificationVariable = identificationVariable;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, AbstractRangeVariableDeclarationStateObject.class);
@@ -2643,6 +2647,7 @@
this.abstractSchemaName = abstractSchemaName;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, AbstractSchemaNameStateObject.class);
}
@@ -2664,6 +2669,7 @@
this.selectExpression = selectExpression;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, AbstractSelectClauseStateObject.class);
@@ -2716,6 +2722,7 @@
protected abstract Class<? extends AbstractSelectStatementStateObject> expressionType();
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, expressionType());
@@ -2791,10 +2798,12 @@
*/
protected static abstract class AbstractStateObjectTester implements StateObjectTester {
+ @Override
public final AdditionExpressionStateObjectTester add(StateObjectTester expression) {
return AbstractStateObjectTest.add(this, expression);
}
+ @Override
public final AndExpressionStateObjectTester and(StateObjectTester expression) {
return AbstractStateObjectTest.and(this, expression);
}
@@ -2817,32 +2826,39 @@
}
}
+ @Override
public final BetweenExpressionStateObjectTester between(StateObjectTester lowerBoundExpression,
StateObjectTester upperBoundExpression) {
return AbstractStateObjectTest.between(this, lowerBoundExpression, upperBoundExpression);
}
+ @Override
public final ComparisonExpressionStateObjectTester different(StateObjectTester expression) {
return AbstractStateObjectTest.different(this, expression);
}
+ @Override
public final DivisionExpressionStateObjectTester division(StateObjectTester expression) {
return AbstractStateObjectTest.division(this, expression);
}
+ @Override
public final ComparisonExpressionStateObjectTester equal(StateObjectTester expression) {
return AbstractStateObjectTest.equal(this, expression);
}
+ @Override
public final ComparisonExpressionStateObjectTester greaterThan(StateObjectTester expression) {
return AbstractStateObjectTest.greaterThan(this, expression);
}
+ @Override
public final ComparisonExpressionStateObjectTester greaterThanOrEqual(StateObjectTester expression) {
return AbstractStateObjectTest.greaterThanOrEqual(this, expression);
}
+ @Override
public final InExpressionStateObjectTester in(StateObjectTester... inItems) {
if (inItems.length == 1) {
return AbstractStateObjectTest.in(this, inItems[0]);
@@ -2850,54 +2866,66 @@
return AbstractStateObjectTest.in(this, collection(inItems));
}
+ @Override
public final EmptyCollectionComparisonExpressionStateObjectTester isEmpty() {
return AbstractStateObjectTest.isEmpty(this);
}
+ @Override
public final EmptyCollectionComparisonExpressionStateObjectTester isNotEmpty() {
return AbstractStateObjectTest.isNotEmpty(this);
}
+ @Override
public boolean isNull() {
return false;
}
+ @Override
public final LikeExpressionStateObjectTester like(StateObjectTester patternValue) {
return AbstractStateObjectTest.like(this, patternValue);
}
+ @Override
public final LikeExpressionStateObjectTester like(StateObjectTester patternValue,
String escapeCharacter) {
return AbstractStateObjectTest.like(this, patternValue, escapeCharacter);
}
+ @Override
public final ComparisonExpressionStateObjectTester lowerThan(StateObjectTester expression) {
return AbstractStateObjectTest.lowerThan(this, expression);
}
+ @Override
public final ComparisonExpressionStateObjectTester lowerThanOrEqual(StateObjectTester expression) {
return AbstractStateObjectTest.lowerThanOrEqual(this, expression);
}
+ @Override
public final CollectionMemberExpressionStateObjectTester member(StateObjectTester collectionPath) {
return AbstractStateObjectTest.member(this, collectionPath);
}
+ @Override
public final CollectionMemberExpressionStateObjectTester memberOf(StateObjectTester collectionPath) {
return AbstractStateObjectTest.memberOf(this, collectionPath);
}
+ @Override
public final MultiplicationExpressionStateObjectTester multiplication(StateObjectTester expression) {
return AbstractStateObjectTest.multiplication(this, expression);
}
+ @Override
public final BetweenExpressionStateObjectTester notBetween(StateObjectTester lowerBoundExpression,
- StateObjectTester upperBoundExpression) {
+ StateObjectTester upperBoundExpression) {
return AbstractStateObjectTest.notBetween(this, lowerBoundExpression, upperBoundExpression);
}
+ @Override
public final InExpressionStateObjectTester notIn(StateObjectTester... inItems) {
if (inItems.length == 1) {
return AbstractStateObjectTest.notIn(this, inItems[0]);
@@ -2905,32 +2933,39 @@
return AbstractStateObjectTest.notIn(this, collection(inItems));
}
+ @Override
public final LikeExpressionStateObjectTester notLike(StateObjectTester expression) {
return AbstractStateObjectTest.notLike(this, expression);
}
+ @Override
public final LikeExpressionStateObjectTester notLike(StateObjectTester expression,
String escapeCharacter) {
return AbstractStateObjectTest.notLike(this, expression, escapeCharacter);
}
+ @Override
public final StateObjectTester notMember(StateObjectTester collectionPath) {
return AbstractStateObjectTest.notMember(this, collectionPath);
}
+ @Override
public final StateObjectTester notMemberOf(StateObjectTester collectionPath) {
return AbstractStateObjectTest.notMemberOf(this, collectionPath);
}
+ @Override
public final OrExpressionStateObjectTester or(StateObjectTester expression) {
return AbstractStateObjectTest.or(this, expression);
}
+ @Override
public final SubstractionExpressionStateObjectTester substract(StateObjectTester expression) {
return AbstractStateObjectTest.substract(this, expression);
}
+ @Override
public void test(ListIterable<? extends StateObject> items) {
ListIterator<? extends StateObject> iterator = items.iterator();
if (!iterator.hasNext()) {
@@ -3098,6 +3133,7 @@
this.expression = expression;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, ArithmeticFactorStateObject.class);
@@ -3153,6 +3189,7 @@
this.upperBoundExpression = upperBoundExpression;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, BetweenExpressionStateObject.class);
@@ -3205,6 +3242,7 @@
this.elseExpression = elseExpression;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, CaseExpressionStateObject.class);
@@ -3300,6 +3338,7 @@
}
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, AbstractListHolderStateObject.class);
@@ -3357,6 +3396,7 @@
this.identificationVariable = identificationVariable;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, CollectionMemberDeclarationStateObject.class);
@@ -3416,6 +3456,7 @@
this.collectionPath = collectionPath;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, CollectionMemberExpressionStateObject.class);
@@ -3483,6 +3524,7 @@
this.rightExpression = rightExpression;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, ComparisonExpressionStateObject.class);
@@ -3527,6 +3569,7 @@
protected abstract String identifier();
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, expressionType());
@@ -3561,6 +3604,7 @@
this.stateObject = stateObject;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, ConcatExpressionStateObject.class);
@@ -3594,6 +3638,7 @@
this.constructorItems = constructorItems;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, ConstructorExpressionStateObject.class);
@@ -3642,6 +3687,7 @@
this.dateTime = dateTime;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, DateTimeStateObject.class);
}
@@ -3664,6 +3710,7 @@
this.rangeVariableDeclaration = rangeVariableDeclaration;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, DeleteClauseStateObject.class);
@@ -3694,6 +3741,7 @@
this.whereClause = whereClause;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, DeleteStatementStateObject.class);
@@ -3778,6 +3826,7 @@
this.collectionPath = collectionPath;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, EmptyCollectionComparisonExpressionStateObject.class);
@@ -3842,6 +3891,7 @@
this.entityType = entityType;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, EntityTypeLiteralStateObject.class);
}
@@ -3927,6 +3977,7 @@
this.funcItems = funcItems;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, FunctionExpressionStateObject.class);
@@ -3961,6 +4012,7 @@
this.groupByItems = groupByItems;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, GroupByClauseStateObject.class);
@@ -4023,6 +4075,7 @@
this.identificationVariable = identificationVariable;
}
+ @Override
public void test(StateObject stateObject) {
if (virtual && (stateObject == null)) {
@@ -4088,6 +4141,7 @@
this.inItems = inItems;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, InExpressionStateObject.class);
@@ -4121,6 +4175,7 @@
this.inputParameter = inputParameter;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, InputParameterStateObject.class);
@@ -4160,6 +4215,7 @@
joinType == LEFT_OUTER_JOIN_FETCH;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, JoinStateObject.class);
@@ -4203,6 +4259,7 @@
this.queryStatement = queryStatement;
}
+ @Override
public void test(StateObject stateObject) {
JPQLQueryStateObject jpqlQueryStateObject = (JPQLQueryStateObject) stateObject;
@@ -4243,6 +4300,7 @@
this.keyword = keyword;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, KeywordExpressionStateObject.class);
}
@@ -4289,6 +4347,7 @@
this.escapeCharacter = escapeCharacter;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, LikeExpressionStateObject.class);
@@ -4452,6 +4511,7 @@
this.stateObject = stateObject;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, NotExpressionStateObject.class);
@@ -4484,6 +4544,7 @@
this.expression = expression;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, NullComparisonExpressionStateObject.class);
@@ -4518,6 +4579,7 @@
assertFalse(items.iterator().hasNext());
}
+ @Override
public void test(StateObject stateObject) {
assertNull(stateObject);
}
@@ -4556,6 +4618,7 @@
this.number = number;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, NumericLiteralStateObject.class);
}
@@ -4592,6 +4655,7 @@
this.orderByItems = orderByItems;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, OrderByClauseStateObject.class);
@@ -4622,6 +4686,7 @@
this.orderByItem = orderByItem;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, OrderByItemStateObject.class);
@@ -4700,6 +4765,7 @@
this.resultVariable = resultVariable;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, ResultVariableStateObject.class);
@@ -4958,6 +5024,7 @@
}
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, StringLiteralStateObject.class);
@@ -5060,6 +5127,7 @@
this.collectionValuedPathExpression = collectionValuedPathExpression;
}
+ @Override
public void test(StateObject stateObject) {
assertTrue(stateObject.isDecorated());
@@ -5171,6 +5239,7 @@
this.unknownText = unknownText;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, UnknownExpressionStateObject.class);
}
@@ -5194,6 +5263,7 @@
this.rangeVariableDeclaration = rangeVariableDeclaration;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, UpdateClauseStateObject.class);
@@ -5231,6 +5301,7 @@
this.newValue = newValue;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, UpdateItemStateObject.class);
@@ -5266,6 +5337,7 @@
this.whereClause = whereClause;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, UpdateStatementStateObject.class);
@@ -5333,6 +5405,7 @@
this.whenExpression = whenExpression;
}
+ @Override
public void test(StateObject stateObject) {
assertInstance(stateObject, WhenClauseStateObject.class);
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/DefaultActualJPQLQueryFormatterTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/DefaultActualJPQLQueryFormatterTest.java
index 9256106..62c65ff 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/DefaultActualJPQLQueryFormatterTest.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/DefaultActualJPQLQueryFormatterTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -449,6 +449,7 @@
super(parent);
}
+ @Override
public void accept(StateObjectVisitor visitor) {
acceptUnknownVisitor(visitor);
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryBuilderTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryBuilderTestHelper.java
index a9b5316..8760e48 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryBuilderTestHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryBuilderTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,6 @@
* This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql.
* model.IJPQLQueryBuilder IJPQLQueryBuilder} into the unit-test before it is run. It allows using
* multiple instances and the unit-tests are run with each of them separately.
- * <p>
* <ul>
* <li>Method in a test suite: Request the concrete instances that will be injected into the
* unit-tests before they are run.</li>
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryFormatterTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryFormatterTestHelper.java
index 7c92484..710f4d7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryFormatterTestHelper.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryFormatterTestHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,6 @@
* This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql.
* model.IJPQLQueryFormatter IJPQLQueryFormatter} into the unit-test before it is run. It allows
* using multiple instances and the unit-tests are run with each of them separately.
- * <p>
* <ul>
* <li>Method in a test suite: Request the concrete instances that will be injected into the
* unit-tests before they are run.</li>
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractFieldMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractFieldMapping.java
index a9e7c87..be83da7 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractFieldMapping.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractFieldMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,33 +44,21 @@
super(parent, field);
}
- /**
- * {@inheritDoc}
- */
@Override
public Field getMember() {
return (Field) super.getMember();
}
- /**
- * {@inheritDoc}
- */
@Override
protected Annotation[] getMemberAnnotations() {
return getMember().getAnnotations();
}
- /**
- * {@inheritDoc}
- */
@Override
protected Type getMemberGenericType() {
return getMember().getGenericType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected Class<?> getMemberType() {
@@ -115,9 +103,7 @@
return field.getType();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean hasAnnotation(Class<? extends Annotation> annotationType) {
return getMember().isAnnotationPresent(annotationType);
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMapping.java
index af6945d..e7d33df 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMapping.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMapping.java
@@ -182,16 +182,12 @@
return BASIC;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public int compareTo(IMapping mapping) {
return getName().compareTo(mapping.getName());
}
- /**
- * {@inheritDoc}
- */
+ @Override
public int getMappingType() {
if (mappingType == -1) {
mappingType = calculateMappingType();
@@ -214,23 +210,17 @@
protected abstract Class<?> getMemberType();
- /**
- * {@inheritDoc}
- */
+ @Override
public String getName() {
return member.getName();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IManagedType getParent() {
return parent;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IType getType() {
if (type == null) {
type = getTypeRepository().getType(getMemberType());
@@ -238,9 +228,7 @@
return type;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public ITypeDeclaration getTypeDeclaration() {
if (typeDeclaration == null) {
typeDeclaration = buildTypeDeclaration();
@@ -274,9 +262,7 @@
return false;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isCollection() {
switch (getMappingType()) {
case ELEMENT_COLLECTION:
@@ -295,9 +281,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isProperty() {
switch (getMappingType()) {
case BASIC:
@@ -307,9 +291,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isRelationship() {
switch (getMappingType()) {
case ELEMENT_COLLECTION:
@@ -322,16 +304,11 @@
}
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isTransient() {
return getMappingType() == TRANSIENT;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getName() + " : " + getTypeDeclaration();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMethodMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMethodMapping.java
index fcbfd2d..bb0193e 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMethodMapping.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMethodMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,33 +44,21 @@
super(parent, method);
}
- /**
- * {@inheritDoc}
- */
@Override
public Method getMember() {
return (Method) super.getMember();
}
- /**
- * {@inheritDoc}
- */
@Override
protected Annotation[] getMemberAnnotations() {
return getMember().getAnnotations();
}
- /**
- * {@inheritDoc}
- */
@Override
protected Type getMemberGenericType() {
return getMember().getGenericReturnType();
}
- /**
- * {@inheritDoc}
- */
@Override
protected Class<?> getMemberType() {
@@ -122,9 +110,7 @@
}
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean hasAnnotation(Class<? extends Annotation> annotationType) {
return getMember().isAnnotationPresent(annotationType);
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkFieldMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkFieldMapping.java
index 0e18fbf..eb99028 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkFieldMapping.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkFieldMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(parent, field);
}
- /**
- * {@inheritDoc}
- */
@Override
protected int calculateMappingType(Annotation[] annotations) {
@@ -67,9 +64,6 @@
return super.calculateMappingType(annotations);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isCollection() {
switch (getMappingType()) {
@@ -79,9 +73,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRelationship() {
switch (getMappingType()) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkMappingBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkMappingBuilder.java
index 8ba26cb..97b12a2 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkMappingBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkMappingBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,9 +40,7 @@
super();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IMapping buildMapping(IManagedType parent, Member value) {
if (value instanceof Field) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkPropertyMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkPropertyMapping.java
index 89d08f6..fc8899a 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkPropertyMapping.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkPropertyMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,6 @@
super(parent, method);
}
- /**
- * {@inheritDoc}
- */
@Override
protected int calculateMappingType(Annotation[] annotations) {
@@ -67,9 +64,6 @@
return super.calculateMappingType(annotations);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isCollection() {
switch (getMappingType()) {
@@ -79,9 +73,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRelationship() {
switch (getMappingType()) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaConstructor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaConstructor.java
index a28dd6e..6f56645 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaConstructor.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaConstructor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -77,9 +77,7 @@
return new JavaTypeDeclaration(typeRepository, type, genericType, javaType.isArray());
}
- /**
- * {@inheritDoc}
- */
+ @Override
public ITypeDeclaration[] getParameterTypes() {
if (parameterTypes == null) {
parameterTypes = buildParameterTypes();
@@ -91,9 +89,6 @@
return type.getTypeRepository();
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return constructor.toGenericString();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEmbeddable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEmbeddable.java
index cc7a30b..273fc46 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEmbeddable.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEmbeddable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,16 +47,11 @@
super(provider, type, mappingBuilder);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void accept(IManagedTypeVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getType().getName();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEntity.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEntity.java
index a33abb6..1c3b746 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEntity.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEntity.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,9 +65,7 @@
super(provider, type, mappingBuilder);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void accept(IManagedTypeVisitor visitor) {
visitor.visit(this);
}
@@ -132,9 +130,7 @@
return null;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public String getName() {
if (name == null) {
name = buildName();
@@ -142,9 +138,7 @@
return name;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IQuery getNamedQuery(String queryName) {
initializeQueries();
return queries.get(queryName);
@@ -165,9 +159,6 @@
}
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getName();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedType.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedType.java
index 3acca94..224ec2d 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedType.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -82,9 +82,7 @@
return mappingBuilder.buildMapping(this, member);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public int compareTo(IManagedType managedType) {
return getType().getName().compareTo(managedType.getType().getName());
}
@@ -97,24 +95,18 @@
return accessType.value();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IMapping getMappingNamed(String name) {
initializeMappings();
return mappings.get(name);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IManagedTypeProvider getProvider() {
return provider;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public JavaType getType() {
return type;
}
@@ -178,9 +170,7 @@
Modifier.isProtected(modifiers));
}
- /**
- * {@inheritDoc}
- */
+ @Override
public final Iterable<IMapping> mappings() {
initializeMappings();
return new SnapshotCloneIterable<IMapping>(mappings.values());
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedTypeProvider.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedTypeProvider.java
index a462f5d..22acdbc 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedTypeProvider.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedTypeProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -133,44 +133,32 @@
return new JavaMappedSuperclass(this, getTypeRepository().getType(type), mappingBuilder);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public Iterable<IEntity> entities() {
return new SnapshotCloneIterable<IEntity>(entities.values());
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IEmbeddable getEmbeddable(IType type) {
return getEmbeddable(type.getName());
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IEmbeddable getEmbeddable(String typeName) {
return embeddables.get(typeName);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IEntity getEntity(IType type) {
return getEntity(type.getName());
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IEntity getEntity(String typeName) {
return entities.get(typeName);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IEntity getEntityNamed(String entityName) {
for (IEntity entity : entities.values()) {
@@ -182,30 +170,22 @@
return null;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IManagedType getManagedType(IType type) {
return getManagedType(type.getName());
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IManagedType getManagedType(String typeName) {
return managedTypes.get(typeName);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IMappedSuperclass getMappedSuperclass(IType type) {
return getMappedSuperclass(type.getName());
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IMappedSuperclass getMappedSuperclass(String typeName) {
return mappedSuperclasses.get(typeName);
}
@@ -214,9 +194,7 @@
return mappingBuilder;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public JavaTypeRepository getTypeRepository() {
if (typeRepository == null) {
typeRepository = new JavaTypeRepository(getClass().getClassLoader());
@@ -243,9 +221,7 @@
initialize();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public Iterable<IManagedType> managedTypes() {
return new SnapshotCloneIterable<IManagedType>(managedTypes.values());
}
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappedSuperclass.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappedSuperclass.java
index 5826a66..4f4ede4 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappedSuperclass.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappedSuperclass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,16 +47,11 @@
super(provider, type, mappingBuilder);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void accept(IManagedTypeVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return getType().getName();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappingBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappingBuilder.java
index 8d33ec7..239d434 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappingBuilder.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappingBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,9 +39,7 @@
super();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IMapping buildMapping(IManagedType parent, Member value) {
if (value instanceof Field) {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaQuery.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaQuery.java
index 1235f92..84c58b8 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaQuery.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaQuery.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,16 +52,12 @@
setExpression(jpqlQuery);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public String getExpression() {
return jpqlQuery;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IManagedTypeProvider getProvider() {
return provider;
}
@@ -75,9 +71,6 @@
this.jpqlQuery = (jpqlQuery != null) ? jpqlQuery.toString() : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaType.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaType.java
index 70b6736..e087d78 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaType.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -126,9 +126,7 @@
return names;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public Iterable<IConstructor> constructors() {
if (constructors == null) {
constructors = buildConstructors();
@@ -136,24 +134,17 @@
return new SnapshotCloneIterable<IConstructor>(constructors);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean equals(IType type) {
return (this == type) || typeName.equals(type.getName());
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean equals(Object object) {
return equals((IType) object);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public String[] getEnumConstants() {
if (enumConstants == null) {
enumConstants = buildEnumConstants();
@@ -161,9 +152,7 @@
return enumConstants;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public String getName() {
return typeName;
}
@@ -177,9 +166,7 @@
return type;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public ITypeDeclaration getTypeDeclaration() {
if (typeDeclaration == null) {
typeDeclaration = new JavaTypeDeclaration(
@@ -201,24 +188,17 @@
return typeRepository;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean hasAnnotation(Class<? extends Annotation> annotationType) {
return (type != null) && type.isAnnotationPresent(annotationType);
}
- /**
- * {@inheritDoc}
- */
@Override
public int hashCode() {
return typeName.hashCode();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isAssignableTo(IType otherType) {
if (equals(otherType)) {
@@ -241,23 +221,16 @@
return otherClass.isAssignableFrom(thisClass);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isEnum() {
return (type != null) && type.isEnum();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isResolvable() {
return (type != null);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
return typeName;
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeDeclaration.java
index 825ebb0..a334197 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeDeclaration.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeDeclaration.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -215,9 +215,7 @@
return "L";
}
- /**
- * {@inheritDoc}
- */
+ @Override
public int getDimensionality() {
if (array) {
String name = type.getName();
@@ -230,9 +228,7 @@
return 0;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IType getType() {
return type;
}
@@ -241,9 +237,7 @@
return typeRepository.getType(type);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public ITypeDeclaration[] getTypeParameters() {
if (genericTypes == null) {
if (genericType == null) {
@@ -256,16 +250,11 @@
return genericTypes;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isArray() {
return array;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toString() {
diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeRepository.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeRepository.java
index a23fd37..54738bd 100644
--- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeRepository.java
+++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeRepository.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -107,9 +107,7 @@
return classLoader;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public IType getEnumType(String enumTypeName) {
// Get the position of the last dot so we can remove the constant
@@ -127,16 +125,12 @@
return type.isEnum() ? type : null;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public JavaType getType(Class<?> javaClass) {
return getType(javaClass.getName());
}
- /**
- * {@inheritDoc}
- */
+ @Override
public JavaType getType(String typeName) {
if (typeName == IType.UNRESOLVABLE_TYPE) {
@@ -150,9 +144,7 @@
return loadTypeImp(typeName);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public TypeHelper getTypeHelper() {
if (typeHelper == null) {
typeHelper = new TypeHelper(this);
diff --git a/jpa/org.eclipse.persistence.jpa.modelgen/src/main/java/org/eclipse/persistence/internal/jpa/modelgen/visitors/ElementVisitor.java b/jpa/org.eclipse.persistence.jpa.modelgen/src/main/java/org/eclipse/persistence/internal/jpa/modelgen/visitors/ElementVisitor.java
index e7380b2..8e4729a 100644
--- a/jpa/org.eclipse.persistence.jpa.modelgen/src/main/java/org/eclipse/persistence/internal/jpa/modelgen/visitors/ElementVisitor.java
+++ b/jpa/org.eclipse.persistence.jpa.modelgen/src/main/java/org/eclipse/persistence/internal/jpa/modelgen/visitors/ElementVisitor.java
@@ -194,7 +194,7 @@
*/
@Override
public MetadataClass visitPackage(PackageElement packageElement, MetadataClass metadataClass) {
- MetadataLogger logger = ((MetadataMirrorFactory) metadataClass.getMetadataFactory()).getLogger();
+ MetadataLogger logger = metadataClass.getMetadataFactory().getLogger();
logger.getSession().getSessionLog().log(SessionLog.FINE, SessionLog.PROCESSOR,
"ElementVisitor Package NOT IMPLEMENTED : {0}",
new Object[] {packageElement}, false);
diff --git a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java
index 8a65a59..edc8774 100644
--- a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java
+++ b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/junit/JUnitTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -696,9 +696,11 @@
return getDatabaseSession(puName).getPlatform(cls);
}
+ @Override
public void setUp() {
}
+ @Override
public void tearDown() {
}
@@ -712,6 +714,7 @@
/**
* Intercept test case invocation and delegate it to a remote server.
*/
+ @Override
public void runBare() throws Throwable {
if (shouldRunTestOnServer()) {
runBareClient();
diff --git a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/JEEPlatform.java b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/JEEPlatform.java
index 05e7c80..632bc3e 100644
--- a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/JEEPlatform.java
+++ b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/JEEPlatform.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
/**
* Nothing required in JEE.
*/
+ @Override
public void initialize() {
}
@@ -48,6 +49,7 @@
/**
* Return if the JTA transaction is active.
*/
+ @Override
public boolean isTransactionActive() {
try {
return getUserTransaction().getStatus() != Status.STATUS_NO_TRANSACTION;
@@ -59,6 +61,7 @@
/**
* Return if the JTA transaction is roll back only.
*/
+ @Override
public boolean getRollbackOnly() {
try {
return getUserTransaction().getStatus() != Status.STATUS_ACTIVE;
@@ -70,6 +73,7 @@
/**
* Start a new JTA transaction.
*/
+ @Override
public void beginTransaction() {
try {
getUserTransaction().begin();
@@ -81,6 +85,7 @@
/**
* Commit the existing JTA transaction.
*/
+ @Override
public void commitTransaction() {
try {
getUserTransaction().commit();
@@ -92,6 +97,7 @@
/**
* Roll back the existing JTA transaction.
*/
+ @Override
public void rollbackTransaction() {
try {
getUserTransaction().rollback();
@@ -103,6 +109,7 @@
/**
* Not required in JEE.
*/
+ @Override
public void closeEntityManager(EntityManager entityManager) {
}
@@ -117,6 +124,7 @@
/**
* Mark the existing JTA transaction for rollback.
*/
+ @Override
public void setTransactionForRollback() {
try {
getUserTransaction().setRollbackOnly();
@@ -128,6 +136,7 @@
/**
* Is the platform Oracle?
*/
+ @Override
public boolean isOc4j() {
return false;
}
@@ -135,6 +144,7 @@
/**
* Is the platform Weblogic?
*/
+ @Override
public boolean isWeblogic() {
return false;
}
@@ -142,6 +152,7 @@
/**
* Is the platform JBoss?
*/
+ @Override
public boolean isJBoss() {
return false;
}
@@ -149,6 +160,7 @@
/**
* Is the platform Spring?
*/
+ @Override
public boolean isSpring() {
return false;
}
@@ -156,6 +168,7 @@
/**
* Is the platform clustered?
*/
+ @Override
public boolean isClustered() {
return false;
}
@@ -163,6 +176,7 @@
/**
* Return the managed EntityManager for the persistence unit.
*/
+ @Override
public EntityManager getEntityManager(String persistenceUnit) {
String property = System.getProperty(EJB_LOOKUP);
if (property == null || !property.toUpperCase().equals("TRUE")){
@@ -180,6 +194,7 @@
/**
* Return the managed EntityManagerFactory for the persistence unit.
*/
+ @Override
public EntityManagerFactory getEntityManagerFactory(String persistenceUnit) {
String property = System.getProperty(EJB_LOOKUP);
if (property == null || !property.toUpperCase().equals("TRUE")){
@@ -197,6 +212,7 @@
/**
* Join the transaction if required
*/
+ @Override
public void joinTransaction(EntityManager em) {
em.joinTransaction();
}
diff --git a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner1Bean.java b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner1Bean.java
index b418db2..16b5906 100644
--- a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner1Bean.java
+++ b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner1Bean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
* Execute a test case method. The test class is loaded dynamically and
* must therefore be visible to the TestRunnerBean classloader.
*/
+ @Override
public Throwable runTest(String className, String test, Properties props) {
// load the test class and create an instance
TestCase testInstance = null;
diff --git a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner2Bean.java b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner2Bean.java
index 48117cb..e8e9f54 100644
--- a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner2Bean.java
+++ b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner2Bean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
* Execute a test case method. The test class is loaded dynamically and
* must therefore be visible to the TestRunnerBean classloader.
*/
+ @Override
public Throwable runTest(String className, String test, Properties props) {
// load the test class and create an instance
TestCase testInstance = null;
diff --git a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner3Bean.java b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner3Bean.java
index 3b8d1eb..8657ea7 100644
--- a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner3Bean.java
+++ b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner3Bean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
* Execute a test case method. The test class is loaded dynamically and
* must therefore be visible to the TestRunnerBean classloader.
*/
+ @Override
public Throwable runTest(String className, String test, Properties props) {
// load the test class and create an instance
TestCase testInstance = null;
diff --git a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner4Bean.java b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner4Bean.java
index 9abbccf..9aaaf2a 100644
--- a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner4Bean.java
+++ b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner4Bean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
* Execute a test case method. The test class is loaded dynamically and
* must therefore be visible to the TestRunnerBean classloader.
*/
+ @Override
public Throwable runTest(String className, String test, Properties props) {
// load the test class and create an instance
TestCase testInstance = null;
diff --git a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner5Bean.java b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner5Bean.java
index cff36bf..fbd1a45 100644
--- a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner5Bean.java
+++ b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner5Bean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
* Execute a test case method. The test class is loaded dynamically and
* must therefore be visible to the TestRunnerBean classloader.
*/
+ @Override
public Throwable runTest(String className, String test, Properties props) {
// load the test class and create an instance
TestCase testInstance = null;
diff --git a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner6Bean.java b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner6Bean.java
index 2859a60..0ae4b96 100644
--- a/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner6Bean.java
+++ b/jpa/org.eclipse.persistence.jpa.test.framework/src/main/java/org/eclipse/persistence/testing/framework/server/TestRunner6Bean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
* Execute a test case method. The test class is loaded dynamically and
* must therefore be visible to the TestRunnerBean classloader.
*/
+ @Override
public Throwable runTest(String className, String test, Properties props) {
// load the test class and create an instance
TestCase testInstance = null;
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EJBQueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EJBQueryImpl.java
index a184dbb..10f1edc 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EJBQueryImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EJBQueryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -164,7 +164,7 @@
throw new PersistenceException(ExceptionLocalization.buildMessage("ejb30-wrong-lock_called_without_version_locking-index", null));
}
} else {
- throw new IllegalArgumentException(ExceptionLocalization.buildMessage("invalid_lock_query", (Object[]) null));
+ throw new IllegalArgumentException(ExceptionLocalization.buildMessage("invalid_lock_query", null));
}
}
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityGraphImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityGraphImpl.java
index 11a5d60..d039f6d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityGraphImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityGraphImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -213,7 +213,7 @@
localGroup = new AttributeGroup(attributeName, type, true);
- ClassDescriptor targetDesc = ((MappedKeyMapContainerPolicy) mapping.getContainerPolicy()).getDescriptorForMapKey();
+ ClassDescriptor targetDesc = mapping.getContainerPolicy().getDescriptorForMapKey();
if (type != null && targetDesc.hasInheritance()) {
targetDesc = targetDesc.getInheritancePolicy().getDescriptor(type);
if (targetDesc == null) {
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryImpl.java
index 4f18779..8805627 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -173,7 +173,7 @@
*/
public static boolean isLoaded(Object entity, String attributeName, DatabaseMapping mapping) {
if (mapping.isForeignReferenceMapping()) {
- if (((ForeignReferenceMapping) mapping).isLazy()) {
+ if (mapping.isLazy()) {
Object value = mapping.getAttributeValueFromObject(entity);
IndirectionPolicy policy = ((ForeignReferenceMapping) mapping).getIndirectionPolicy();
return policy.objectIsInstantiated(value);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java
index bcc3038..3edbb51 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 1998, 2019 IBM Corporation and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 IBM Corporation and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1202,7 +1202,7 @@
* Check if the instance belongs to the current persistence context.
*/
protected boolean contains(Object entity, UnitOfWork uow) {
- return ((UnitOfWorkImpl) uow).isObjectRegistered(entity) && !((UnitOfWorkImpl) uow).isObjectDeleted(entity);
+ return uow.isObjectRegistered(entity) && !((UnitOfWorkImpl) uow).isObjectDeleted(entity);
}
@Override
@@ -1606,7 +1606,7 @@
@Override
public DatabaseSessionImpl getMemberDatabaseSession(Class cls) {
if(this.databaseSession.isBroker()) {
- return (DatabaseSessionImpl)((SessionBroker)this.databaseSession).getSessionForClass(cls);
+ return (DatabaseSessionImpl) this.databaseSession.getSessionForClass(cls);
} else {
return null;
}
@@ -1620,7 +1620,7 @@
@Override
public ServerSession getMemberServerSession(Class cls) {
if(this.databaseSession.isBroker()) {
- return (ServerSession)((SessionBroker)this.databaseSession).getSessionForClass(cls);
+ return (ServerSession) this.databaseSession.getSessionForClass(cls);
} else {
return null;
}
@@ -1634,7 +1634,7 @@
@Override
public String getMemberSessionName(Class cls) {
if(this.databaseSession.isBroker()) {
- return ((SessionBroker)this.databaseSession).getSessionForClass(cls).getName();
+ return this.databaseSession.getSessionForClass(cls).getName();
} else {
return null;
}
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
index 709ceeb..98dd233 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java
@@ -1664,10 +1664,10 @@
((DatabaseLogin)pool.getLogin()).useDataSource((String)entry.getValue());
} else if (attribute.equals(PersistenceUnitProperties.CONNECTION_POOL_USER)) {
pool.setLogin(pool.getLogin().clone());
- ((DatabaseLogin)pool.getLogin()).setUserName((String)entry.getValue());
+ pool.getLogin().setUserName((String)entry.getValue());
} else if (attribute.equals(PersistenceUnitProperties.CONNECTION_POOL_PASSWORD)) {
pool.setLogin(pool.getLogin().clone());
- ((DatabaseLogin)pool.getLogin()).setPassword((String)entry.getValue());
+ pool.getLogin().setPassword((String)entry.getValue());
} else if (attribute.equals(PersistenceUnitProperties.CONNECTION_POOL_WAIT)) {
pool.setWaitTimeout(Integer.parseInt((String)entry.getValue()));
} else if (attribute.equals(PersistenceUnitProperties.CONNECTION_POOL_FAILOVER)) {
@@ -1828,7 +1828,7 @@
// predeploy is used for static weaving
Writer writer = this.staticWeaveInfo.getLogWriter();
if (writer != null) {
- ((DefaultSessionLog)session.getSessionLog()).setWriter(writer);
+ session.getSessionLog().setWriter(writer);
}
session.setLogLevel(this.staticWeaveInfo.getLogLevel());
}
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/IsolatedHashMap.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/IsolatedHashMap.java
index dafde34..bf52160 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/IsolatedHashMap.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/IsolatedHashMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2018 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -119,73 +119,73 @@
}
// All Map interface methods are delegated to Map mapped to current partition.
- /** {@inheritDoc} */
+
@Override
public int size() {
return getMap().size();
}
- /** {@inheritDoc} */
+
@Override
public boolean isEmpty() {
return getMap().isEmpty();
}
- /** {@inheritDoc} */
+
@Override
public boolean containsKey(Object key) {
return getMap().containsKey(key);
}
- /** {@inheritDoc} */
+
@Override
public boolean containsValue(Object value) {
return getMap().containsValue(value);
}
- /** {@inheritDoc} */
+
@Override
public V get(Object key) {
return getMap().get(key);
}
- /** {@inheritDoc} */
+
@Override
public V put(K key, V value) {
return getMap().put(key, value);
}
- /** {@inheritDoc} */
+
@Override
public V remove(Object key) {
return getMap().remove(key);
}
- /** {@inheritDoc} */
+
@Override
public void putAll(Map<? extends K, ? extends V> m) {
getMap().putAll(m);
}
- /** {@inheritDoc} */
+
@Override
public void clear() {
getMap().clear();
}
- /** {@inheritDoc} */
+
@Override
public Set<K> keySet() {
return getMap().keySet();
}
- /** {@inheritDoc} */
+
@Override
public Collection<V> values() {
return getMap().values();
}
- /** {@inheritDoc} */
+
@Override
public Set<java.util.Map.Entry<K, V>> entrySet() {
return getMap().entrySet();
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java
index 7565c26..daf95a8 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 1998, 2019 IBM Corporation. All rights reserved.
+ * Copyright (c) 1998, 2021 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -843,6 +843,7 @@
super(QueryHints.PESSIMISTIC_LOCK_TIMEOUT_UNIT, "");
}
+ @Override
DatabaseQuery applyToDatabaseQuery(Object valueToApply, DatabaseQuery query, ClassLoader loader, AbstractSession activeSession) {
if (query.isObjectLevelReadQuery()) {
TimeUnit unit = TimeUnit.valueOf((String)valueToApply);
@@ -869,8 +870,8 @@
if (query.isObjectBuildingQuery()) {
((ObjectBuildingQuery)query).setShouldRefreshIdentityMapResult(((Boolean)valueToApply).booleanValue());
// Set default cascade to be by mapping.
- if (!((ObjectBuildingQuery)query).shouldCascadeParts()) {
- ((ObjectBuildingQuery)query).cascadeByMapping();
+ if (!query.shouldCascadeParts()) {
+ query.cascadeByMapping();
}
} else {
throw new IllegalArgumentException(ExceptionLocalization.buildMessage("ejb30-wrong-type-for-query-hint",new Object[]{getQueryId(query), name, getPrintValue(valueToApply)}));
@@ -1606,7 +1607,7 @@
while (mapping.isAggregateObjectMapping() && tokenizer.hasMoreTokens()){
expression = expression.get(token);
token = tokenizer.nextToken();
- descriptor = ((org.eclipse.persistence.mappings.AggregateObjectMapping)mapping).getReferenceDescriptor();
+ descriptor = mapping.getReferenceDescriptor();
mapping = descriptor.getObjectBuilder().getMappingForAttributeName(token);
}
if (!mapping.isForeignReferenceMapping()){
@@ -1659,7 +1660,7 @@
while (mapping.isAggregateObjectMapping() && tokenizer.hasMoreTokens()){
expression = expression.get(token);
token = tokenizer.nextToken();
- descriptor = ((org.eclipse.persistence.mappings.AggregateObjectMapping)mapping).getReferenceDescriptor();
+ descriptor = mapping.getReferenceDescriptor();
mapping = descriptor.getObjectBuilder().getMappingForAttributeName(token);
}
if (!mapping.isForeignReferenceMapping()){
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java
index 4e6076e..5da220d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java
@@ -443,7 +443,7 @@
entityManager.verifyOpen();
if (!getDatabaseQueryInternal().isObjectLevelReadQuery()) {
- throw new IllegalStateException(ExceptionLocalization.buildMessage("invalid_lock_query", (Object[]) null));
+ throw new IllegalStateException(ExceptionLocalization.buildMessage("invalid_lock_query", null));
}
return this.lockMode;
@@ -532,16 +532,16 @@
List results = (List) result;
if (results.isEmpty()) {
rollbackOnException = false;
- throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", (Object[]) null));
+ throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", null));
} else if (results.size() > 1) {
rollbackOnException = false;
- throwNonUniqueResultException(ExceptionLocalization.buildMessage("too_many_results_for_get_single_result", (Object[]) null));
+ throwNonUniqueResultException(ExceptionLocalization.buildMessage("too_many_results_for_get_single_result", null));
}
return results.get(0);
} else {
if (result == null) {
rollbackOnException = false;
- throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", (Object[]) null));
+ throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", null));
}
return result;
}
@@ -661,7 +661,7 @@
*/
protected void setFirstResultInternal(int startPosition) {
if (startPosition < 0) {
- throw new IllegalArgumentException(ExceptionLocalization.buildMessage("negative_start_position", (Object[]) null));
+ throw new IllegalArgumentException(ExceptionLocalization.buildMessage("negative_start_position", null));
}
// bug 362804
firstResultIndex = startPosition;
@@ -791,7 +791,7 @@
entityManager.verifyOpen();
if (!getDatabaseQueryInternal().isObjectLevelReadQuery()) {
- throw new IllegalStateException(ExceptionLocalization.buildMessage("invalid_lock_query", (Object[]) null));
+ throw new IllegalStateException(ExceptionLocalization.buildMessage("invalid_lock_query", null));
}
this.lockMode = lockMode;
@@ -824,7 +824,7 @@
* @return an object representing the given TemporalType.
*/
protected Object convertTemporalType(Object value, TemporalType type) {
- ConversionManager conversionManager = ((org.eclipse.persistence.internal.sessions.AbstractSession) getEntityManager().getActiveSession()).getDatasourcePlatform().getConversionManager();
+ ConversionManager conversionManager = getEntityManager().getActiveSession().getDatasourcePlatform().getConversionManager();
if (type == TemporalType.TIME) {
return conversionManager.convertObject(value, ClassConstants.TIME);
} else if (type == TemporalType.TIMESTAMP) {
@@ -879,7 +879,7 @@
*/
public void setMaxResultsInternal(int maxResult) {
if (maxResult < 0) {
- throw new IllegalArgumentException(ExceptionLocalization.buildMessage("negative_max_result", (Object[]) null));
+ throw new IllegalArgumentException(ExceptionLocalization.buildMessage("negative_max_result", null));
}
if (maxResult == Integer.MAX_VALUE) {
this.maxResults = UNDEFINED;
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java
index c2f2447..3cf7d7b 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java
@@ -667,9 +667,9 @@
}
if (results.size() > 1) {
- throwNonUniqueResultException(ExceptionLocalization.buildMessage("too_many_results_for_get_single_result", (Object[]) null));
+ throwNonUniqueResultException(ExceptionLocalization.buildMessage("too_many_results_for_get_single_result", null));
} else if (results.isEmpty()) {
- throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", (Object[]) null));
+ throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", null));
}
// TODO: if hasMoreResults is true, we 'could' and maybe should throw an exception here.
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java
index 7643f39..3ac7eb0 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2018 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -98,7 +98,7 @@
if(!isInitialized) {
initializeTopLinkLoggingFile();
if(fromAgent) {
- AbstractSessionLog.getLog().log(SessionLog.FINER, SessionLog.WEAVER, "cmp_init_initialize_from_agent", (Object[])null);
+ AbstractSessionLog.getLog().log(SessionLog.FINER, SessionLog.WEAVER, "cmp_init_initialize_from_agent", null);
}
usesAgent = true;
initializer = new JavaSECMPInitializer(classLoader);
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/xml/parser/XPathEngine.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/xml/parser/XPathEngine.java
index 36c9bfe..135cd70 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/xml/parser/XPathEngine.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/xml/parser/XPathEngine.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -199,7 +199,7 @@
for (int i = 0; i < childrenNodes.getLength(); i++) {
Node next = childrenNodes.item(i);
if (next.getNodeType() == Node.TEXT_NODE) {
- String val = ((Text)next).getNodeValue();
+ String val = next.getNodeValue();
if (val != null) {
if (returnVal == null) {
returnVal = "";
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/ElementCollectionAccessor.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/ElementCollectionAccessor.java
index 87ac7b6..80ee6d0 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/ElementCollectionAccessor.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/ElementCollectionAccessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2018 IBM Corporation. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@ -922,7 +922,7 @@
// Add the reference key field for the direct collection mapping.
((DirectCollectionMapping) mapping).addReferenceKeyField(fkField, pkField);
} else {
- ((AggregateCollectionMapping) mapping).addTargetForeignKeyField(fkField, pkField);
+ mapping.addTargetForeignKeyField(fkField, pkField);
}
}
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java
index 65213a2..37f17eb 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java
@@ -230,8 +230,8 @@
// check for cursor return type
if (Direction.OUT_CURSOR.name().equals(m_direction)) {
// the constructor by default adds a RETURN argument, so remove it
- ((PLSQLStoredFunctionCall)call).getArguments().remove(0);
- ((PLSQLStoredFunctionCall)call).useNamedCursorOutputAsResultSet(Direction.OUT_CURSOR.name(), type);
+ call.getArguments().remove(0);
+ call.useNamedCursorOutputAsResultSet(Direction.OUT_CURSOR.name(), type);
} else {
if (getLength() != null) {
((PLSQLStoredFunctionCall)call).setResult(type, getLength());
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/IdentifiableTypeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/IdentifiableTypeImpl.java
index 4596b14..153ca6b 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/IdentifiableTypeImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/IdentifiableTypeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -248,7 +248,7 @@
// There already is an instance of the PKclass on the policy
if (cmpPolicy != null && cmpPolicy.isCMP3Policy()) {
// BasicType, EntityType or IdentifiableType are handled here, lookup the class in the types map and create a wrapper if it does not exist yet
- return this.getMetamodel().getType(((CMP3Policy) cmpPolicy).getPKClass());
+ return this.getMetamodel().getType(cmpPolicy.getPKClass());
}
// Non-specification mandated exception
throw new IllegalArgumentException(ExceptionLocalization.buildMessage(
@@ -342,7 +342,7 @@
// Optional: Verify the mapping on the each field and whether it is an IdClass
Class pkClass = null;
if(this.getDescriptor().hasCMPPolicy()) {
- pkClass = ((CMP3Policy)this.getDescriptor().getCMPPolicy()).getPKClass();
+ pkClass = this.getDescriptor().getCMPPolicy().getPKClass();
if(null == pkClass) {
return false;
}
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/ManagedTypeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/ManagedTypeImpl.java
index c9e1726..d179257 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/ManagedTypeImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/ManagedTypeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1232,7 +1232,7 @@
* The following call will perform a getMethod call for us.
* If no getMethod exists, we will secondarily check the getMethodName below.
*/
- aType = ((MethodAttributeAccessor)colMapping.getAttributeAccessor()).getAttributeClass();
+ aType = colMapping.getAttributeAccessor().getAttributeClass();
if((aType != null) && List.class.isAssignableFrom(aType)) {
member = new ListAttributeImpl(this, colMapping, true);
} else if((aType != null) && Collection.class.isAssignableFrom(aType)) {
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/MappedSuperclassTypeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/MappedSuperclassTypeImpl.java
index a851f7a..0e86b69 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/MappedSuperclassTypeImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/MappedSuperclassTypeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -102,7 +102,7 @@
Map inheritingTypeMembers = inheritingType.getMembers();
if ((null == inheritingTypeMembers) && inheritingType.isMappedSuperclass()) {
//not initialized
- ((ManagedTypeImpl) inheritingType).initialize();
+ inheritingType.initialize();
inheritingTypeMembers = inheritingType.getMembers();
}
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/PluralAttributeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/PluralAttributeImpl.java
index 706b885..9db85dc 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/PluralAttributeImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/PluralAttributeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -118,7 +118,7 @@
attributeClass = mapping.getReferenceClass();
} else if (mapping.isAggregateCollectionMapping()) {
// get reference class and check if managedType is a MappedSuperclass
- attributeClass = ((AggregateCollectionMapping)mapping).getReferenceClass();
+ attributeClass = mapping.getReferenceClass();
}
// TODO: refactor exception handling
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/SingularAttributeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/SingularAttributeImpl.java
index 537183c..2d5b699 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/SingularAttributeImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/SingularAttributeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -193,7 +193,7 @@
if (getDescriptor().usesOptimisticLocking() && getMapping().isDirectToFieldMapping()) {
OptimisticLockingPolicy policy = getDescriptor().getOptimisticLockingPolicy();
- return policy.getWriteLockField().equals(((AbstractDirectMapping) getMapping()).getField());
+ return policy.getWriteLockField().equals(getMapping().getField());
}
return false;
}
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CompoundSelectionImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CompoundSelectionImpl.java
index 9913f01..a501a70 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CompoundSelectionImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CompoundSelectionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,7 +55,7 @@
java.util.Map tempMap = new java.util.TreeMap();
for (Selection sel : subSelections) {
if (validate) {
- if (((SelectionImpl)sel).isCompoundSelection() && !((SelectionImpl)sel).isConstructor()) {
+ if (sel.isCompoundSelection() && !((SelectionImpl)sel).isConstructor()) {
throw new IllegalArgumentException(ExceptionLocalization.buildMessage("jpa_criteriaapi_illegal_tuple_or_array_value", new Object[] { sel }));
}
}
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/ConstructorSelectionImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/ConstructorSelectionImpl.java
index a10079e..ee0c52c 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/ConstructorSelectionImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/ConstructorSelectionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,7 +49,7 @@
item.setResultType(this.getJavaType());
item.setConstructor(constructor);
for(Selection selection : this.getCompoundSelectionItems()){
- if (((SelectionImpl)selection).isCompoundSelection()){
+ if (selection.isCompoundSelection()){
item.addItem(((ConstructorSelectionImpl)selection).translate());
}else{
ReportItem reportItem = new ReportItem(item.getName()+item.getReportItems().size(),
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaQueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaQueryImpl.java
index 9cd12a9..c76116f 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaQueryImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaQueryImpl.java
@@ -533,7 +533,7 @@
for (Selection nested : this.selection.getCompoundSelectionItems()) {
if (((SelectionImpl) nested).isConstructor()) {
reportQuery.addConstructorReportItem(((ConstructorSelectionImpl) nested).translate());
- } else if (((SelectionImpl) nested).isCompoundSelection()) {
+ } else if (nested.isCompoundSelection()) {
throw new IllegalStateException(ExceptionLocalization.buildMessage("NESTED_COMPOUND_SELECTION_OTHER_THAN_CONSTRUCTOR_NOT_SUPPORTED"));
} else {
if (((InternalSelection) nested).isFrom()) {
@@ -631,7 +631,7 @@
} else {
query = new ReportQuery();
- query.setReferenceClass(((SelectionImpl) this.selection).getCurrentNode().getBuilder().getQueryClass());
+ query.setReferenceClass(this.selection.getCurrentNode().getBuilder().getQueryClass());
if (!this.selection.isCompoundSelection() && ((InternalExpression) this.selection).isCompoundExpression()) {
if (((FunctionExpressionImpl) this.selection).getOperation() == CriteriaBuilderImpl.SIZE) {
//selecting size not all databases support subselect in select clause so convert to count/groupby
@@ -640,10 +640,10 @@
((ReportQuery) query).addAttribute(this.selection.getAlias(), collectionExpression.getCurrentNode().count(), ClassConstants.INTEGER);
((ReportQuery) query).addGrouping(fromExpression.getCurrentNode());
}
- ((ReportQuery) query).addAttribute(this.selection.getAlias(), ((FunctionExpressionImpl) this.selection).getCurrentNode(), this.selection.getJavaType());
+ ((ReportQuery) query).addAttribute(this.selection.getAlias(), this.selection.getCurrentNode(), this.selection.getJavaType());
} else {
- ((ReportQuery) query).addItem(this.selection.getAlias(), ((SelectionImpl) this.selection).getCurrentNode());
+ ((ReportQuery) query).addItem(this.selection.getAlias(), this.selection.getCurrentNode());
((ReportQuery) query).setShouldReturnSingleAttribute(true);
}
}
@@ -653,7 +653,7 @@
if (this.selection != null && (!((InternalSelection) this.selection).isRoot())) {
query = new ReportQuery();
query.setReferenceClass(this.queryType);
- ((ReportQuery) query).addItem(this.selection.getAlias(), ((SelectionImpl) this.selection).getCurrentNode(), ((FromImpl) this.selection).findJoinFetches());
+ ((ReportQuery) query).addItem(this.selection.getAlias(), this.selection.getCurrentNode(), ((FromImpl) this.selection).findJoinFetches());
((ReportQuery) query).setShouldReturnSingleAttribute(true);
} else {
query = new ReadAllQuery(this.queryType);
@@ -689,13 +689,13 @@
reportQuery.addAttribute(this.selection.getAlias(), collectionExpression.getCurrentNode().count(), ClassConstants.INTEGER);
reportQuery.addGrouping(fromExpression.getCurrentNode());
}else{
- reportQuery.addAttribute(this.selection.getAlias(), ((FunctionExpressionImpl)this.selection).getCurrentNode(), this.selection.getJavaType());
+ reportQuery.addAttribute(this.selection.getAlias(), this.selection.getCurrentNode(), this.selection.getJavaType());
}}else{
if (((InternalSelection) selection).isFrom()) {
- reportQuery.addItem(selection.getAlias(), ((SelectionImpl) selection).getCurrentNode(), ((FromImpl) selection).findJoinFetches());
+ reportQuery.addItem(selection.getAlias(), selection.getCurrentNode(), ((FromImpl) selection).findJoinFetches());
} else {
- reportQuery.addAttribute(selection.getAlias(), ((SelectionImpl) selection).getCurrentNode(), selection.getJavaType());
+ reportQuery.addAttribute(selection.getAlias(), selection.getCurrentNode(), selection.getJavaType());
}}
reportQuery.setReferenceClass(((InternalSelection) this.selection).getCurrentNode().getBuilder().getQueryClass());
reportQuery.setExpressionBuilder(((InternalSelection) this.selection).getCurrentNode().getBuilder());
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java
index 22fd73b..c0ce99c 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -503,11 +503,11 @@
if (attribute.isCollection()) {
org.eclipse.persistence.expressions.Expression node;
if (jt.equals(JoinType.INNER)) {
- node = this.currentNode.anyOf(((PluralAttribute) attribute).getName());
+ node = this.currentNode.anyOf(attribute.getName());
} else if (jt.equals(JoinType.RIGHT)) {
throw new UnsupportedOperationException(ExceptionLocalization.buildMessage("RIGHT_JOIN_NOT_SUPPORTED"));
} else {
- node = this.currentNode.anyOfAllowingNone(((PluralAttribute) attribute).getName());
+ node = this.currentNode.anyOfAllowingNone(attribute.getName());
}
Join join;
if (((PluralAttribute) attribute).getElementType().getPersistenceType().equals(PersistenceType.BASIC)) {
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/RootImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/RootImpl.java
index 9754d58..c7ceceb 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/RootImpl.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/RootImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,11 +39,11 @@
public class RootImpl<X> extends FromImpl<X, X> implements Root<X> {
public <T> RootImpl(ManagedType managedType, Metamodel metamodel, Class<X> javaClass, org.eclipse.persistence.expressions.Expression expressionNode, Bindable modelArtifact) {
- super((Path) null, managedType, metamodel, javaClass, expressionNode, modelArtifact);
+ super(null, managedType, metamodel, javaClass, expressionNode, modelArtifact);
}
public <T> RootImpl(ManagedType managedType, Metamodel metamodel, Class<X> javaClass, org.eclipse.persistence.expressions.Expression expressionNode, Bindable modelArtifact, FromImpl correlatedParent) {
- super((Path) null, managedType, metamodel, javaClass, expressionNode, modelArtifact, correlatedParent);
+ super(null, managedType, metamodel, javaClass, expressionNode, modelArtifact, correlatedParent);
}
/**
diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveProcessor.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveProcessor.java
index e02cb9d..8669d0d 100644
--- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveProcessor.java
+++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -183,7 +183,7 @@
//Instantiate default session log
AbstractSessionLog.getLog().setLevel(this.logLevel);
if(logWriter!=null){
- ((DefaultSessionLog)AbstractSessionLog.getLog()).setWriter(logWriter);
+ AbstractSessionLog.getLog().setWriter(logWriter);
}
//Make sure the source is existing
diff --git a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/noversion/ServerEmployeeTest.java b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/noversion/ServerEmployeeTest.java
index 6247f14..dedd116 100644
--- a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/noversion/ServerEmployeeTest.java
+++ b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/noversion/ServerEmployeeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -604,7 +604,7 @@
employee1.setFirstName("Miles");
employee1.setLastName("Davis");
employee1.setGender(Gender.Male);
- employee1.setSalary((double) 20000);
+ employee1.setSalary(20000);
employee1 = RestUtils.restUpdate(context, employee1, Employee.class, null, mediaType, true);
assertNotNull("Employee1 create failed.", employee1);
@@ -614,7 +614,7 @@
employee2.setFirstName("Charlie");
employee2.setLastName("Parker");
employee2.setGender(Gender.Male);
- employee2.setSalary((double) 30000);
+ employee2.setSalary(30000);
employee2 = RestUtils.restUpdate(context, employee2, Employee.class, null, mediaType, true);
assertNotNull("Employee2 create failed.", employee2);
@@ -648,7 +648,7 @@
employee.setFirstName("Miles");
employee.setLastName("Davis");
employee.setGender(Gender.Male);
- employee.setSalary((double) 20000);
+ employee.setSalary(20000);
employee = RestUtils.restUpdate(context, employee, Employee.class, null, mediaType, true);
assertNotNull("Employee create failed.", employee);
diff --git a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/v2/ServerEmployeeV2Test.java b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/v2/ServerEmployeeV2Test.java
index d1cd63a..dc53961 100644
--- a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/v2/ServerEmployeeV2Test.java
+++ b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/v2/ServerEmployeeV2Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
initContext("jpars_employee-static", "v2.0");
}
+ @Override
@After
public void cleanup() throws URISyntaxException {
RestUtils.restUpdateQuery(context, "Employee.deleteAll", null, null, MediaType.APPLICATION_JSON_TYPE);
diff --git a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/util/TestURIInfo.java b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/util/TestURIInfo.java
index f878a29..5627767 100644
--- a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/util/TestURIInfo.java
+++ b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/util/TestURIInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -168,10 +168,12 @@
}
}
+ @Override
public URI relativize(URI arg0) {
return null;
}
+ @Override
public URI resolve(URI arg0) {
return null;
}
diff --git a/moxy/org.eclipse.persistence.moxy.utils.xjc/src/main/java/org/eclipse/persistence/jaxb/xjc/MOXyXJC.java b/moxy/org.eclipse.persistence.moxy.utils.xjc/src/main/java/org/eclipse/persistence/jaxb/xjc/MOXyXJC.java
index 1f13e99..4111801 100644
--- a/moxy/org.eclipse.persistence.moxy.utils.xjc/src/main/java/org/eclipse/persistence/jaxb/xjc/MOXyXJC.java
+++ b/moxy/org.eclipse.persistence.moxy.utils.xjc/src/main/java/org/eclipse/persistence/jaxb/xjc/MOXyXJC.java
@@ -91,6 +91,7 @@
private ConsoleErrorReporter cer = new ConsoleErrorReporter(System.err);
private String generatedPackagePath = null;
+ @Override
public void generatedFile(String fileName, int count, int total) {
message(fileName);
if (this.generatedPackagePath == null) {
@@ -102,22 +103,27 @@
return generatedPackagePath;
}
+ @Override
public void message(String msg) {
System.out.println(msg);
}
+ @Override
public void error(SAXParseException exception) {
cer.error(exception);
}
+ @Override
public void fatalError(SAXParseException exception) {
cer.fatalError(exception);
}
+ @Override
public void warning(SAXParseException exception) {
cer.warning(exception);
}
+ @Override
public void info(SAXParseException exception) {
cer.info(exception);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/internal/jaxb/many/MapValueAttributeAccessor.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/internal/jaxb/many/MapValueAttributeAccessor.java
index 402e1b1..0f7033b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/internal/jaxb/many/MapValueAttributeAccessor.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/internal/jaxb/many/MapValueAttributeAccessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,7 +61,7 @@
for(Entry entry : entrySet) {
MapEntry nextEntry;
try {
- nextEntry = (MapEntry)generatedEntryClass.newInstance();
+ nextEntry = (MapEntry)generatedEntryClass.getConstructor().newInstance();
} catch (Exception e) {
return null;
}
@@ -77,10 +77,8 @@
Map mapValue = null;;
try{
- mapValue = (Map)mapClass.newInstance();
- } catch (InstantiationException e) {
- throw XMLMarshalException.unmarshalException(e);
- } catch (IllegalAccessException e) {
+ mapValue = (Map)mapClass.getConstructor().newInstance();
+ } catch (ReflectiveOperationException e) {
throw XMLMarshalException.unmarshalException(e);
}
if(value != null) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/BeanValidationChecker.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/BeanValidationChecker.java
index a30301f..e6dc7cd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/BeanValidationChecker.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/BeanValidationChecker.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@
*/
static boolean isBeanValidationPresent() {
try {
- Class.forName("jakarta.validation.Validation").newInstance();
+ Class.forName("jakarta.validation.Validation").getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/JAXBContext.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/JAXBContext.java
index 2164171..3c7d3ff 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/JAXBContext.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/JAXBContext.java
@@ -1335,7 +1335,7 @@
Class adapterClass = entry.getValue();
if (adapterClass != null) {
try {
- XmlAdapter adapter = (XmlAdapter) adapterClass.newInstance();
+ XmlAdapter adapter = (XmlAdapter) adapterClass.getConstructor().newInstance();
Class boundType = getBoundTypeForXmlAdapterClass(adapterClass);
RootLevelXmlAdapter rootLevelXmlAdapter = new RootLevelXmlAdapter(adapter, boundType);
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/TypeMappingInfo.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/TypeMappingInfo.java
index 9c499b0..5c158fb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/TypeMappingInfo.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/TypeMappingInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -98,7 +98,7 @@
public void setType(Type t) {
this.type = t;
if(type instanceof Class){
- if (((Class)type) == CoreClassConstants.ABYTE || ((Class)type) == CoreClassConstants.APBYTE ||
+ if (type == CoreClassConstants.ABYTE || type == CoreClassConstants.APBYTE ||
((Class)type).getCanonicalName().equals("jakarta.activation.DataHandler")) {
schemaType = Constants.BASE_64_BINARY_QNAME;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java
index 3a42fc6..06e9c3b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/AnnotationsProcessor.java
@@ -825,20 +825,16 @@
XmlNameTransformer xmlNameTransformer = (XmlNameTransformer) helper.getAnnotation(javaClass, XmlNameTransformer.class);
Class nameTransformerClass = xmlNameTransformer.value();
try {
- info.setXmlNameTransformer((XMLNameTransformer) nameTransformerClass.newInstance());
- } catch (InstantiationException ex) {
- throw JAXBException.exceptionWithNameTransformerClass(nameTransformerClass.getName(), ex);
- } catch (IllegalAccessException ex) {
+ info.setXmlNameTransformer((XMLNameTransformer) nameTransformerClass.getConstructor().newInstance());
+ } catch (ReflectiveOperationException ex) {
throw JAXBException.exceptionWithNameTransformerClass(nameTransformerClass.getName(), ex);
}
} else if (helper.isAnnotationPresent(javaClass.getPackage(), XmlNameTransformer.class)) {
XmlNameTransformer xmlNameTransformer = (XmlNameTransformer) helper.getAnnotation(javaClass.getPackage(), XmlNameTransformer.class);
Class nameTransformerClass = xmlNameTransformer.value();
try {
- info.setXmlNameTransformer((XMLNameTransformer) nameTransformerClass.newInstance());
- } catch (InstantiationException ex) {
- throw JAXBException.exceptionWithNameTransformerClass(nameTransformerClass.getName(), ex);
- } catch (IllegalAccessException ex) {
+ info.setXmlNameTransformer((XMLNameTransformer) nameTransformerClass.getConstructor().newInstance());
+ } catch (ReflectiveOperationException ex) {
throw JAXBException.exceptionWithNameTransformerClass(nameTransformerClass.getName(), ex);
}
}
@@ -4334,7 +4330,7 @@
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
mv.visitVarInsn(Opcodes.ALOAD, 0);
- mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "org/eclipse/persistence/internal/jaxb/many/MapValue", "<init>", "()V");
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "org/eclipse/persistence/internal/jaxb/many/MapValue", "<init>", "()V", false);
mv.visitInsn(Opcodes.RETURN);
mv.visitMaxs(1, 1);
mv.visitEnd();
@@ -4665,7 +4661,7 @@
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitFieldInsn(Opcodes.GETFIELD, classNameSeparatedBySlash, "adaptedValue", "Ljava/util/Collection;");
mv.visitVarInsn(Opcodes.ALOAD, 2);
- mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Collection", "toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;");
+ mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Collection", "toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", true);
mv.visitInsn(Opcodes.POP);
mv.visitVarInsn(Opcodes.ALOAD, 2);
@@ -4848,7 +4844,7 @@
}
private Class getObjectClass(Class primitiveClass) {
- return ConversionManager.getDefaultManager().getObjectClass(primitiveClass);
+ return ConversionManager.getObjectClass(primitiveClass);
}
public Map<java.lang.reflect.Type, Class> getCollectionClassesToGeneratedClasses() {
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java
index 899a837..4918e06 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/MappingsGenerator.java
@@ -1428,7 +1428,7 @@
}else if(nestedMapping instanceof BinaryDataCollectionMapping){
nullPolicy = ((BinaryDataCollectionMapping)nestedMapping).getNullPolicy();
if(element.isList()){
- ((XMLField)((BinaryDataCollectionMapping)nestedMapping).getField()).setUsesSingleNode(true);
+ ((XMLField) nestedMapping.getField()).setUsesSingleNode(true);
}
}
@@ -2090,7 +2090,7 @@
((CompositeObjectMapping)mapping).setXPath(attributeName);
if(typeIsObject){
((CompositeObjectMapping)mapping).setKeepAsElementPolicy(UnmarshalKeepAsElementPolicy.KEEP_UNKNOWN_AS_ELEMENT);
- setTypedTextField((Field)((CompositeObjectMapping)mapping).getField());
+ setTypedTextField((Field) mapping.getField());
}else{
((CompositeObjectMapping)mapping).setReferenceClassName(theType.getQualifiedName());
}
@@ -2108,7 +2108,7 @@
accessor.setComponentClass(primitiveClass);
directCollectionMapping.setAttributeAccessor(accessor);
- Class declaredClass = XMLConversionManager.getDefaultManager().getObjectClass(primitiveClass);
+ Class declaredClass = XMLConversionManager.getObjectClass(primitiveClass);
directCollectionMapping.setAttributeElementClass(declaredClass);
} else {
accessor.setComponentClassName(componentClassName);
@@ -2168,7 +2168,7 @@
if (schemaType == null) {
schemaType = (QName) helper.getXMLToJavaTypeMap().get(theType);
}
- ((Field)((DirectMapping)mapping).getField()).setSchemaType(schemaType);
+ ((Field) mapping.getField()).setSchemaType(schemaType);
if(info != null && info.isEnumerationType()) {
((DirectMapping)mapping).setConverter(buildJAXBEnumTypeConverter(mapping, (EnumTypeInfo)info));
}
@@ -2282,7 +2282,7 @@
accessor.setComponentClass(primitiveClass);
mapping.setAttributeAccessor(accessor);
- Class declaredClass = XMLConversionManager.getDefaultManager().getObjectClass(primitiveClass);
+ Class declaredClass = XMLConversionManager.getObjectClass(primitiveClass);
mapping.setAttributeElementClass(declaredClass);
} else {
accessor.setComponentClassName(componentClassName);
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/SchemaGenerator.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/SchemaGenerator.java
index 364a7fc..251f6f9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/SchemaGenerator.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/SchemaGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1102,7 +1102,7 @@
* @param next
* @return
*/
- protected AddToSchemaResult buildSchemaComponentsForXPath(XPathFragment frag, AddToSchemaResult xpr, boolean isChoice, Property next) {
+ private AddToSchemaResult buildSchemaComponentsForXPath(XPathFragment frag, AddToSchemaResult xpr, boolean isChoice, Property next) {
boolean isAny = next.isAny() || next.isAnyAttribute();
TypeDefParticle currentParticle = xpr.particle;
Schema workingSchema = xpr.schema;
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/XMLProcessor.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/XMLProcessor.java
index b615c26..82252c4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/XMLProcessor.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/compiler/XMLProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -483,10 +483,8 @@
throw JAXBException.exceptionWithNameTransformerClass(transformerClassName, ex);
}
try {
- transformer = (XMLNameTransformer) nameTransformerClass.newInstance();
- } catch (InstantiationException ex) {
- throw JAXBException.exceptionWithNameTransformerClass(transformerClassName, ex);
- } catch (IllegalAccessException ex) {
+ transformer = (XMLNameTransformer) nameTransformerClass.getConstructor().newInstance();
+ } catch (ReflectiveOperationException ex) {
throw JAXBException.exceptionWithNameTransformerClass(transformerClassName, ex);
}
}
@@ -1601,9 +1599,9 @@
}
// process XmlSchema
XmlNsForm form = schema.getAttributeFormDefault();
- nsInfo.setAttributeFormQualified(form.equals(form.QUALIFIED));
+ nsInfo.setAttributeFormQualified(form.equals(XmlNsForm.QUALIFIED));
form = schema.getElementFormDefault();
- nsInfo.setElementFormQualified(form.equals(form.QUALIFIED));
+ nsInfo.setElementFormQualified(form.equals(XmlNsForm.QUALIFIED));
if (!nsInfo.isElementFormQualified() || nsInfo.isAttributeFormQualified()) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/dynamic/DynamicJAXBContext.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/dynamic/DynamicJAXBContext.java
index c0b5a28..6cd6336 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/dynamic/DynamicJAXBContext.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/dynamic/DynamicJAXBContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -330,7 +330,7 @@
Class<?> schemaMetadataClass = PrivilegedAccessHelper.getClassForName(SCHEMAMETADATA_CLASS_NAME);
Class<?>[] constructorClassArgs = {DynamicClassLoader.class, Map.class, constructorArg.getClass(), EntityResolver.class};
Constructor<?> constructor = PrivilegedAccessHelper.getConstructorFor(schemaMetadataClass, constructorClassArgs, true);
- Object[] contructorObjectArgs = {(DynamicClassLoader) classLoader, properties, constructorArg, entityResolver};
+ Object[] contructorObjectArgs = {classLoader, properties, constructorArg, entityResolver};
schemaMetadata = (Metadata) PrivilegedAccessHelper.invokeConstructor(constructor, contructorObjectArgs);
} catch (InvocationTargetException e) {
Throwable cause = e.getCause();
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/dynamic/DynamicJAXBContextFactory.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/dynamic/DynamicJAXBContextFactory.java
index 2cb677d..4d273ee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/dynamic/DynamicJAXBContextFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/dynamic/DynamicJAXBContextFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -357,11 +357,11 @@
private static void fixDateTimeConversion(DynamicJAXBContext ctx) {
XMLConversionManager conversionManager = (XMLConversionManager) ctx.getXMLContext().getSession().getDatasourcePlatform().getConversionManager();
- Map defaultXmlTypes = conversionManager.getDefaultXMLTypes();
+ Map defaultXmlTypes = XMLConversionManager.getDefaultXMLTypes();
defaultXmlTypes.remove(Constants.DATE_TIME_QNAME);
defaultXmlTypes.put(Constants.DATE_TIME_QNAME, CoreClassConstants.XML_GREGORIAN_CALENDAR);
- Map defaultJavaTypes = conversionManager.getDefaultJavaTypes();
+ Map defaultJavaTypes = XMLConversionManager.getDefaultJavaTypes();
defaultJavaTypes.remove(CoreClassConstants.CALENDAR);
defaultJavaTypes.put(CoreClassConstants.XML_GREGORIAN_CALENDAR, Constants.DATE_TIME_QNAME);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/javamodel/xjc/XJCJavaMethodImpl.java b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/javamodel/xjc/XJCJavaMethodImpl.java
index da9b88d..d7c399c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/javamodel/xjc/XJCJavaMethodImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/javamodel/xjc/XJCJavaMethodImpl.java
@@ -207,7 +207,7 @@
for (JavaClass type : allParams) {
Class<?> paramClass = Class.forName(type.getPackageName() + "." + type.getName());
- if (paramClass.newInstance() instanceof ParameterizedType) {
+ if (paramClass.getConstructor().newInstance() instanceof ParameterizedType) {
return true;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
index f9aa59f..d6e3cb0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/JAXBTestCases.java
@@ -102,10 +102,12 @@
super(name);
}
+ @Override
public XMLContext getXMLContext(Project project) {
return new XMLContext(project, classLoader);
}
+ @Override
public void setUp() throws Exception {
setupParser();
setupControlDocs();
@@ -120,6 +122,7 @@
bindingsFileXSDSource = new StreamSource(bindingsFileXSDInputStream);
}
+ @Override
public void tearDown() {
super.tearDown();
jaxbContext = null;
@@ -129,6 +132,7 @@
bindingsFileXSDSource = null;
}
+ @Override
protected void setProject(Project project) {
this.project = project;
}
@@ -346,6 +350,7 @@
return null;
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
if(isUnmarshalTest()) {
@@ -353,7 +358,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.MEDIA_TYPE, getXMLUnmarshalMediaType());
Object testObject = null;
if(getUnmarshalClass() != null){
- testObject = ((JAXBUnmarshaller)jaxbUnmarshaller).unmarshal(new StreamSource(instream), getUnmarshalClass());
+ testObject = jaxbUnmarshaller.unmarshal(new StreamSource(instream), getUnmarshalClass());
}else{
testObject = jaxbUnmarshaller.unmarshal(instream);
}
@@ -371,7 +376,7 @@
log("************test with JSON bindings*********");
InputStream instream2 = ClassLoader.getSystemResourceAsStream(resourceName);
if(getUnmarshalClass() != null){
- testObject2 = ((JAXBUnmarshaller)jaxbUnmarshallerFromJSONBindings).unmarshal(new StreamSource(instream2), getUnmarshalClass());
+ testObject2 = jaxbUnmarshallerFromJSONBindings.unmarshal(new StreamSource(instream2), getUnmarshalClass());
}else{
testObject2 = jaxbUnmarshallerFromJSONBindings.unmarshal(instream2);
}
@@ -420,6 +425,7 @@
}
}
+ @Override
public void testObjectToOutputStream() throws Exception {
Object objectToWrite = getWriteControlObject();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -479,6 +485,7 @@
}
}
+ @Override
public void testObjectToOutputStreamASCIIEncoding() throws Exception {
Object objectToWrite = getWriteControlObject();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -530,6 +537,7 @@
return doc;
}
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
objectToXMLStringWriter(getWriteControlObject());
}
@@ -573,12 +581,13 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
if(XML_OUTPUT_FACTORY != null) {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -618,7 +627,7 @@
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -655,12 +664,13 @@
}
+ @Override
public void testObjectToXMLEventWriter() throws Exception {
if(XML_OUTPUT_FACTORY != null) {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLEventWriter eventWriter= factory.createXMLEventWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -694,6 +704,7 @@
}
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
Object objectToWrite = getWriteControlObject();
@@ -735,6 +746,7 @@
assertXMLIdentical(controlDocument, testDocument);
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
if(isUnmarshalTest()) {
java.net.URL url = ClassLoader.getSystemResource(resourceName);
@@ -742,7 +754,7 @@
Object testObject = null;
if(getUnmarshalClass() != null){
- testObject = ((JAXBUnmarshaller)jaxbUnmarshaller).unmarshal(new StreamSource(url.openStream()), getUnmarshalClass());
+ testObject = jaxbUnmarshaller.unmarshal(new StreamSource(url.openStream()), getUnmarshalClass());
}else{
testObject = jaxbUnmarshaller.unmarshal(url);
}
@@ -750,6 +762,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY && isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -766,6 +779,7 @@
xmlToObjectTest(testObject);
}
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
if(isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -805,6 +819,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY && isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -821,6 +836,7 @@
}
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
Object objectToWrite = getWriteControlObject();
XMLDescriptor desc = null;
@@ -850,6 +866,7 @@
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
xmlToObjectTest(testObject, getReadControlObject());
}
@@ -869,6 +886,7 @@
super.xmlToObjectTest(testObject);
}
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
if(isUnmarshalTest()) {
SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
@@ -950,6 +968,7 @@
schemaFiles = new ArrayList<File>();
}
+ @Override
public Result createOutput(String namespaceURI, String suggestedFileName)throws IOException {
File schemaFile = new File(suggestedFileName);
if(namespaceURI == null){
@@ -977,6 +996,7 @@
schemaFiles = new ArrayList<Writer>();
}
+ @Override
public Result createOutput(String namespaceURI, String suggestedFileName) throws IOException {
if (namespaceURI == null) {
namespaceURI = "";
@@ -1002,6 +1022,7 @@
schemaFiles = new HashMap<String, Writer>();
}
+ @Override
public Result createOutput(String namespaceURI, String suggestedFileName) throws IOException {
//return new StreamResult(System.out);
if (namespaceURI == null) {
@@ -1093,6 +1114,7 @@
public ResourceResolver(MyMapStreamSchemaOutputResolver resolver) {
oResolver = resolver;
}
+ @Override
public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseUri) {
return new MyLSInput(namespaceURI, oResolver);
}
@@ -1111,23 +1133,39 @@
sValue = value;
oResolver = resolver;
}
+ @Override
public void setSystemId(String arg0) {}
+ @Override
public void setStringData(String arg0) {}
+ @Override
public void setPublicId(String arg0) {}
+ @Override
public void setEncoding(String arg0) {}
+ @Override
public void setCharacterStream(Reader arg0) {}
+ @Override
public void setCertifiedText(boolean arg0) {}
+ @Override
public void setByteStream(InputStream arg0) {}
+ @Override
public void setBaseURI(String arg0) {}
+ @Override
public String getSystemId() {return null;}
+ @Override
public String getStringData() {
return oResolver.schemaFiles.get(sValue).toString();
}
+ @Override
public String getPublicId() {return null;}
+ @Override
public String getEncoding() {return null;}
+ @Override
public Reader getCharacterStream() {return null;}
+ @Override
public boolean getCertifiedText() {return false;}
+ @Override
public InputStream getByteStream() {return null;}
+ @Override
public String getBaseURI() {return null;}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/PropertyTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/PropertyTypeTestCases.java
index 3ae6b95..68f61de 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/PropertyTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/PropertyTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
initXsiType();
}
+ @Override
public Object getControlObject() {
TestObject testObject = new TestObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATAOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATAOverrideTestCases.java
index d1e163d..562098e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATAOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATAOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setTypes(new Class[]{Employee.class});
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.name = "Jane Doe";
@@ -59,6 +60,7 @@
//CDATA sections don't work with content handlers
}
+ @Override
protected Map getProperties() {
String bindings =
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATATestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATATestCases.java
index 02e5f16..87d4eb6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATATestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/cdata/XmlCDATATestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.name = "Jane Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessmethods/XmlAccessMethodsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessmethods/XmlAccessMethodsTestCases.java
index f3ad785..8dcd181 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessmethods/XmlAccessMethodsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessmethods/XmlAccessMethodsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setWriteControlJSON(WRITE_JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.property1 = "Value1";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/ClassLevelAccessorFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/ClassLevelAccessorFactory.java
index 5028715..aa148e7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/ClassLevelAccessorFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/ClassLevelAccessorFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,10 +25,12 @@
public class ClassLevelAccessorFactory implements AccessorFactory {
+ @Override
public Accessor createFieldAccessor(Class beanClass, Field field, boolean isReadOnly) throws JAXBException {
return new ClassLevelAccessorFactory.MyCustomFieldAccessor(beanClass);
}
+ @Override
public Accessor createPropertyAccessor(Class beanClass, Method getMethod, Method setMethod) throws JAXBException {
return new ClassLevelAccessorFactory.MyCustomPropertyAccessor(beanClass);
}
@@ -40,11 +42,13 @@
super(valueType);
}
+ @Override
public Object get(Object arg0) throws AccessorException {
CustomerClassOverride cust = (CustomerClassOverride)arg0;
return "class:field:" + cust.fieldProperty;
}
+ @Override
public void set(Object arg0, Object arg1) throws AccessorException {
String value = (String)arg1;
value = value.substring(value.lastIndexOf(":") + 1);
@@ -58,11 +62,13 @@
super(valueType);
}
+ @Override
public Object get(Object arg0) throws AccessorException {
CustomerClassOverride cust = (CustomerClassOverride)arg0;
return "class:prop:" + cust.getProperty();
}
+ @Override
public void set(Object arg0, Object arg1) throws AccessorException {
String value = (String)arg1;
value = value.substring(value.lastIndexOf(":") + 1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/ClassLevelAccessorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/ClassLevelAccessorTestCases.java
index f89377d..c742e9a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/ClassLevelAccessorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/ClassLevelAccessorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
return properties;
}
+ @Override
public Object getControlObject() {
CustomerClassOverride cust = new CustomerClassOverride();
cust.fieldProperty = "fieldPropertyValue";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/MyCustomAccessorFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/MyCustomAccessorFactory.java
index 1d2684e..7f285d7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/MyCustomAccessorFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/MyCustomAccessorFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,10 +24,12 @@
import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor;
public class MyCustomAccessorFactory implements AccessorFactory {
+ @Override
public Accessor createFieldAccessor(Class beanClass, Field field, boolean isReadOnly) throws JAXBException {
return new MyCustomAccessorFactory.MyCustomFieldAccessor(beanClass);
}
+ @Override
public Accessor createPropertyAccessor(Class beanClass, Method getMethod, Method setMethod) throws JAXBException {
return new MyCustomAccessorFactory.MyCustomPropertyAccessor(beanClass);
}
@@ -39,11 +41,13 @@
super(valueType);
}
+ @Override
public Object get(Object arg0) throws AccessorException {
CustomerPackageLevel cust = (CustomerPackageLevel)arg0;
return "package:field:" + cust.fieldProperty;
}
+ @Override
public void set(Object arg0, Object arg1) throws AccessorException {
String value = (String)arg1;
value = value.substring(value.lastIndexOf(":") + 1);
@@ -57,11 +61,13 @@
super(valueType);
}
+ @Override
public Object get(Object arg0) throws AccessorException {
CustomerPackageLevel cust = (CustomerPackageLevel)arg0;
return "package:prop:" + cust.getProperty();
}
+ @Override
public void set(Object arg0, Object arg1) throws AccessorException {
String value = (String)arg1;
value = value.substring(value.lastIndexOf(":") + 1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/PackageLevelAccessorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/PackageLevelAccessorTestCases.java
index 6861671..47c1ab6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/PackageLevelAccessorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlaccessorfactory/PackageLevelAccessorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
CustomerPackageLevel cust = new CustomerPackageLevel();
cust.fieldProperty = "fieldPropertyValue";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/MyClassExtractor.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/MyClassExtractor.java
index 287df86..540a2d3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/MyClassExtractor.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/MyClassExtractor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
import org.eclipse.persistence.sessions.Session;
public class MyClassExtractor extends ClassExtractor {
+ @Override
public Class extractClassFromRow(Record databaseRow, Session session) {
return Car.class;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/ParkingLot.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/ParkingLot.java
index 443f1a5..d91140d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/ParkingLot.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/ParkingLot.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,7 +62,7 @@
public String toString() {
String returnString = "ParkingLot has " + vehicles.size() + " vehicles:";
for (int i = 0; i < vehicles.size(); i++) {
- Vehicle nextVehicle = (Vehicle) vehicles.get(i);
+ Vehicle nextVehicle = vehicles.get(i);
returnString += (" " + nextVehicle.toString());
}
return returnString;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/XmlClassExtractorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/XmlClassExtractorTestCases.java
index 6cc8882..033c3b7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/XmlClassExtractorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlclassextractor/XmlClassExtractorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlcontainerproperty/ContainerPropertyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlcontainerproperty/ContainerPropertyTestCases.java
index bfe5a9e..7e8346d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlcontainerproperty/ContainerPropertyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlcontainerproperty/ContainerPropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Employee getControlObject() {
Employee emp = new Employee();
emp.id = 10;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/XmlDiscriminatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/XmlDiscriminatorTestCases.java
index 74064f7..35cb357 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/XmlDiscriminatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/XmlDiscriminatorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setWriteControlJSON(JSON_RESOURCE_WRITE);
}
+ @Override
public Object getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
@@ -43,6 +44,7 @@
return new JAXBElement(new QName("vehicle-data"), Vehicle.class, car);
}
+ @Override
public Object getReadControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
@@ -52,6 +54,7 @@
car.topSpeed = 354;
return car;
}
+ @Override
public void testRoundTrip() throws Exception{}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/ns/XmlDiscriminatorNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/ns/XmlDiscriminatorNSTestCases.java
index f4832f2..def2211 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/ns/XmlDiscriminatorNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/ns/XmlDiscriminatorNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Root getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/ns/XmlDiscriminatorRootNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/ns/XmlDiscriminatorRootNSTestCases.java
index a98472c..880be7a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/ns/XmlDiscriminatorRootNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmldiscriminator/ns/XmlDiscriminatorRootNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Car getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/noxmlrootelement/NoRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/noxmlrootelement/NoRootElementTestCases.java
index 41203a8..676d6e6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/noxmlrootelement/NoRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/noxmlrootelement/NoRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
return f;
}
+ @Override
public void setupControlDocs() throws Exception{
Document doc = parser.newDocument();
@@ -62,6 +63,7 @@
controlDocument = doc;
}
+ @Override
public Document getTestDocument(InputStream is) throws Exception{
byte[] bytes = new byte[is.available()];
@@ -72,6 +74,7 @@
return parser.parse(new InputSource(new StringReader(s)));
}
+ @Override
public Document getTestDocument(String s) throws Exception{
s = "<DUMMYROOT>" + s + "</DUMMYROOT>";
return parser.parse(new InputSource(new StringReader(s)));
@@ -82,6 +85,7 @@
return false;
}
+ @Override
public void testObjectToContentHandler() throws Exception{
try{
super.testObjectToContentHandler();
@@ -91,6 +95,7 @@
fail("an error was expected");
}
+ @Override
public void testObjectToXMLDocument() throws Exception{
try{
super.testObjectToXMLDocument();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/qualified/ComplexType.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/qualified/ComplexType.java
index 9461d62..e34b67a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/qualified/ComplexType.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/qualified/ComplexType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,11 +70,11 @@
protected final static QName NAME = new QName("", "Local");
public TestLocal(String value) {
- super(NAME, ((Class) String.class), ComplexType.class, value);
+ super(NAME, String.class, ComplexType.class, value);
}
public TestLocal() {
- super(NAME, ((Class) String.class), ComplexType.class, null);
+ super(NAME, String.class, ComplexType.class, null);
}
@Override
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/unqualified/ComplexType.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/unqualified/ComplexType.java
index 27082e6..e9d88c9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/unqualified/ComplexType.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/unqualified/ComplexType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,11 +70,11 @@
protected final static QName NAME = new QName("", "Local");
public TestLocal(String value) {
- super(NAME, ((Class) String.class), ComplexType.class, value);
+ super(NAME, String.class, ComplexType.class, value);
}
public TestLocal() {
- super(NAME, ((Class) String.class), ComplexType.class, null);
+ super(NAME, String.class, ComplexType.class, null);
}
@Override
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/xsitype2/FooBarXsiTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/xsitype2/FooBarXsiTypeTestCases.java
index d5014f3..7816463 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/xsitype2/FooBarXsiTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementdecl/xsitype2/FooBarXsiTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,6 +63,7 @@
m.marshal(getControlObject(), System.out);
}
+ @Override
public void testRoundTrip(){
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementsjoinnodes/XmlElementsJoinNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementsjoinnodes/XmlElementsJoinNodeTestCases.java
index a2f95a7..6fec513 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementsjoinnodes/XmlElementsJoinNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementsjoinnodes/XmlElementsJoinNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
}
+ @Override
public Object getControlObject() {
Address address1 = new Address("a100", "123 Some Street", "shipping");
Address address2 = new Address("a101", "66 Dead End Rd.", "home");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementsjoinnodes/collection/XmlElementsJoinNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementsjoinnodes/collection/XmlElementsJoinNodeTestCases.java
index b1f52eb..778ea39 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementsjoinnodes/collection/XmlElementsJoinNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlelementsjoinnodes/collection/XmlElementsJoinNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_VALUE_WRAPPER, "value");
}
+ @Override
public Object getJSONReadControlObject() {
Address address1 = new Address("a100", "123 Some Street", "shipping");
Address address2 = new Address("a101", "66 Dead End Rd.", "home");
@@ -80,6 +81,7 @@
return new Root(clients, addressList, phoneList);
}
+ @Override
public Object getControlObject() {
Address address1 = new Address("a100", "123 Some Street", "shipping");
Address address2 = new Address("a101", "66 Dead End Rd.", "home");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdRefMissingIdEventHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdRefMissingIdEventHandlerTestCases.java
index 6bd5183..1f1ed41 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdRefMissingIdEventHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdRefMissingIdEventHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,8 +45,10 @@
}
//Not applicable
+ @Override
public void testRoundTrip(){}
+ @Override
public void testJSONUnmarshalFromInputSource() throws Exception{
try{
super.testJSONUnmarshalFromInputSource();
@@ -58,6 +60,7 @@
}
+ @Override
public void testJSONUnmarshalFromJsonStructureSource() throws Exception{
try{
super.testJSONUnmarshalFromJsonStructureSource();
@@ -78,6 +81,7 @@
}
}
+ @Override
public void testJSONUnmarshalFromInputStream() throws Exception{
try{
super.testJSONUnmarshalFromInputStream();
@@ -88,6 +92,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testJSONUnmarshalFromReader() throws Exception{
try{
super.testJSONUnmarshalFromReader();
@@ -98,6 +103,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testUnmarshalAutoDetect() throws Exception{
try{
super.testUnmarshalAutoDetect();
@@ -108,6 +114,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testJSONUnmarshalFromSource() throws Exception{
try{
super.testJSONUnmarshalFromSource();
@@ -118,6 +125,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testJSONUnmarshalFromURL() throws Exception{
try{
super.testJSONUnmarshalFromURL();
@@ -128,6 +136,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception{
try{
super.testXMLToObjectFromInputStream();
@@ -138,6 +147,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testXMLToObjectFromNode() throws Exception{
try{
super.testXMLToObjectFromNode();
@@ -148,6 +158,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testXMLToObjectFromURL() throws Exception{
try{
super.testXMLToObjectFromURL();
@@ -158,6 +169,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testUnmarshallerHandler() throws Exception{
try{
super.testUnmarshallerHandler();
@@ -168,6 +180,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception{
try{
super.testXMLToObjectFromXMLEventReader();
@@ -178,6 +191,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testXMLToObjectFromXMLStreamReaderEx() throws Exception{
try{
super.testXMLToObjectFromXMLStreamReaderEx();
@@ -188,6 +202,7 @@
fail("An Exception should have occurred");
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception{
try{
super.testXMLToObjectFromXMLStreamReader();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdRefMissingIdTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdRefMissingIdTestCases.java
index 26fbf65..4f596fd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdRefMissingIdTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdRefMissingIdTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,5 +51,6 @@
}
//Not applicable
+ @Override
public void testRoundTrip(){}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdSystemPropertyNonDefaultTestCase.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdSystemPropertyNonDefaultTestCase.java
index 2aa242c..c464ff8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdSystemPropertyNonDefaultTestCase.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlidref/XmlIdSystemPropertyNonDefaultTestCase.java
@@ -55,5 +55,6 @@
}
//Not applicable
+ @Override
public void testRoundTrip() { }
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseRefChoiceAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseRefChoiceAdapterTestCases.java
index 45eba24..89b350c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseRefChoiceAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseRefChoiceAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlJSON(JSON_RESOURCE);;
}
+ @Override
public Object getControlObject() {
Owner owner = new Owner();
owner.owned = new ArrayList<Owned>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseReferenceAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseReferenceAdapterTestCases.java
index 234ce3c..333c127 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseReferenceAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseReferenceAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
loader = Parent.class.getClassLoader();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseReferenceWithRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseReferenceWithRefTestCases.java
index 49dad19..73f635b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseReferenceWithRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlinversereference/InverseReferenceWithRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
Parent parent = new Parent();
parent.children = new ArrayList<Child>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmljoinnode/XmlJoinNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmljoinnode/XmlJoinNodeTestCases.java
index 17f27b8..3cd1498 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmljoinnode/XmlJoinNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmljoinnode/XmlJoinNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
Address ottawa100 = new Address(100, "45 O'Connor St.", "400", "Ottawa", "K1P1A4");
Address ottawa200 = new Address(200, "1 Anystreet Rd.", "9", "Ottawa", "K4P1A2");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmllocation/XmlLocationNonTransientTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmllocation/XmlLocationNonTransientTestCases.java
index 617c2c6..688308d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmllocation/XmlLocationNonTransientTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmllocation/XmlLocationNonTransientTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,10 +88,12 @@
this.alternateColumn = alt;
}
+ @Override
public String getPublicId() {
return null;
}
+ @Override
public String getSystemId() {
if (!includeSysId) {
return null;
@@ -100,10 +102,12 @@
}
}
+ @Override
public int getLineNumber() {
return line;
}
+ @Override
public int getColumnNumber() {
return column;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmllocation/XmlLocationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmllocation/XmlLocationTestCases.java
index 56c436d..af54828 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmllocation/XmlLocationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmllocation/XmlLocationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -85,10 +85,12 @@
this.alternateColumn = alt;
}
+ @Override
public String getPublicId() {
return null;
}
+ @Override
public String getSystemId() {
if (!includeSysId) {
return null;
@@ -97,10 +99,12 @@
}
}
+ @Override
public int getLineNumber() {
return line;
}
+ @Override
public int getColumnNumber() {
return column;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/JAXBDefaultNameTransformerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/JAXBDefaultNameTransformerTestCases.java
index b20d49d..80ae26b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/JAXBDefaultNameTransformerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/JAXBDefaultNameTransformerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -83,6 +84,7 @@
return employee;
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLInputFactory factory = javax.xml.stream.XMLInputFactory.newInstance();
@@ -92,6 +94,7 @@
this.xmlToObjectTest(obj);
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLInputFactory factory = javax.xml.stream.XMLInputFactory.newInstance();
@@ -101,6 +104,7 @@
this.xmlToObjectTest(obj);
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/JAXBClassLevelUpperNameTransformerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/JAXBClassLevelUpperNameTransformerTestCases.java
index f03975a..eb178e1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/JAXBClassLevelUpperNameTransformerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/JAXBClassLevelUpperNameTransformerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -86,6 +87,7 @@
return employee;
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLInputFactory factory = javax.xml.stream.XMLInputFactory.newInstance();
@@ -95,6 +97,7 @@
this.xmlToObjectTest(obj);
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLInputFactory factory = javax.xml.stream.XMLInputFactory.newInstance();
@@ -104,6 +107,7 @@
this.xmlToObjectTest(obj);
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/MyLowerNameTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/MyLowerNameTransformer.java
index 63989d2..af69e94 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/MyLowerNameTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/MyLowerNameTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,18 +20,22 @@
public class MyLowerNameTransformer implements XMLNameTransformer{
+ @Override
public String transformTypeName(String name) {
return name.toLowerCase();
}
+ @Override
public String transformElementName(String name) {
return name.toLowerCase();
}
+ @Override
public String transformAttributeName(String name) {
return name.toLowerCase();
}
+ @Override
public String transformRootElementName(String name) {
name = name.substring(name.lastIndexOf('.') + 1);
return name.toLowerCase();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/MyUpperNameTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/MyUpperNameTransformer.java
index cd45711..8171913 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/MyUpperNameTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/classlevel/upper/MyUpperNameTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,18 +20,22 @@
public class MyUpperNameTransformer implements XMLNameTransformer{
+ @Override
public String transformTypeName(String name) {
return name.toUpperCase();
}
+ @Override
public String transformElementName(String name) {
return name.toUpperCase();
}
+ @Override
public String transformAttributeName(String name) {
return name.toUpperCase();
}
+ @Override
public String transformRootElementName(String name) {
name = name.substring(name.lastIndexOf('.') + 1);
return name.toUpperCase();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/upper/JAXBUpperNameTransformerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/upper/JAXBUpperNameTransformerTestCases.java
index f530b91..03a1fd6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/upper/JAXBUpperNameTransformerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/upper/JAXBUpperNameTransformerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -86,6 +87,7 @@
return employee;
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLInputFactory factory = javax.xml.stream.XMLInputFactory.newInstance();
@@ -95,6 +97,7 @@
this.xmlToObjectTest(obj);
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLInputFactory factory = javax.xml.stream.XMLInputFactory.newInstance();
@@ -104,6 +107,7 @@
this.xmlToObjectTest(obj);
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/upper/MyUpperNameTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/upper/MyUpperNameTransformer.java
index 230bda5..984c1ff 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/upper/MyUpperNameTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnametransformer/upper/MyUpperNameTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,18 +20,22 @@
public class MyUpperNameTransformer implements XMLNameTransformer{
+ @Override
public String transformTypeName(String name) {
return name.toUpperCase();
}
+ @Override
public String transformElementName(String name) {
return name.toUpperCase();
}
+ @Override
public String transformAttributeName(String name) {
return name.toUpperCase();
}
+ @Override
public String transformRootElementName(String name) {
name = name.substring(name.lastIndexOf('.') + 1);
return name.toUpperCase();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyNoXmlElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyNoXmlElementTestCases.java
index eabbf4a..abd5410 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyNoXmlElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyNoXmlElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setWriteControlDocument(XML_WRITE_RESOURCE);
}
+ @Override
public Object getControlObject() {
EmployeeNoXmlElement ctrlEmp = new EmployeeNoXmlElement();
ctrlEmp.firstName = FNAME;
@@ -81,6 +82,7 @@
return ctrlEmp;
}
+ @Override
public Object getWriteControlObject() {
if(ctrlEmp == null){
ctrlEmp = new EmployeeNoXmlElement();
@@ -100,6 +102,7 @@
return ctrlEmp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/noxmlelement-eclipselink-oxm.xml");
@@ -111,12 +114,14 @@
return properties;
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception{
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", ctrlEmp.wasGetCalled);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception{
super.xmlToObjectTest(testObject);
EmployeeNoXmlElement empObj = (EmployeeNoXmlElement)testObject;
@@ -126,10 +131,12 @@
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
+ @Override
public void testObjectToContentHandler() throws Exception {
//See Bug 355143
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyTestCases.java
index fc46318..de05a88 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/XmlNullPolicyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setWriteControlDocument(XML_WRITE_RESOURCE);
}
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
ctrlEmp.firstName = FNAME;
@@ -81,6 +82,7 @@
return ctrlEmp;
}
+ @Override
public Object getWriteControlObject() {
if(ctrlEmp == null){
ctrlEmp = new Employee();
@@ -108,6 +110,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/annotations/xmlnullpolicy/eclipselink-oxm.xml");
@@ -119,12 +122,14 @@
return properties;
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception{
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", ctrlEmp.wasGetCalled);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception{
super.xmlToObjectTest(testObject);
Employee empObj = (Employee)testObject;
@@ -134,10 +139,12 @@
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
+ @Override
public void testObjectToContentHandler() throws Exception {
//See Bug 355143
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathOverrideTestCases.java
index acc2e4b..b1583ae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setTypes(new Class[]{Employee.class, Address.class, Root.class, PhoneNumber.class});
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.id = 101;
@@ -78,6 +79,7 @@
return root;
}
+ @Override
protected Map getProperties() throws JAXBException{
String bindings =
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathTestCases.java
index fb673c4..ecdce09 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getJSONReadControlObject(){
Root root = (Root)getControlObject();
Employee emp = root.employees.get(0);
@@ -45,6 +46,7 @@
return root;
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.id = 101;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathUnmappedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathUnmappedTestCases.java
index b04f57a..49d0096 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathUnmappedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/XmlPathUnmappedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setWriteControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getJSONReadControlObject(){
Root root = (Root)getControlObject();
Employee emp = root.employees.get(0);
@@ -46,6 +47,7 @@
return root;
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.id = 101;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/attributecollection/XmlPathCollectionAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/attributecollection/XmlPathCollectionAttributeTestCases.java
index 0a0944f..cb2e962 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/attributecollection/XmlPathCollectionAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/attributecollection/XmlPathCollectionAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,7 +60,7 @@
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(instream);
- Object testObject = (TestClass) jaxbUnmarshaller.unmarshal(doc);
+ Object testObject = jaxbUnmarshaller.unmarshal(doc);
instream.close();
xmlToObjectTest(testObject);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/schematype/SchemaTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/schematype/SchemaTypeTestCases.java
index d616394..7c1241b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/schematype/SchemaTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpath/schematype/SchemaTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,6 +62,7 @@
"}}";
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/XmlPathsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/XmlPathsTestCases.java
index 7c05b4c..a805a70 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/XmlPathsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/XmlPathsTestCases.java
@@ -53,6 +53,7 @@
*
* @return
*/
+ @Override
public Employee getControlObject() {
Employee emp = new Employee();
emp.thing = Integer.valueOf(INT_VAL);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java
index 784c020..7f36362 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/XmlPathsOverrideTestCases.java
@@ -49,6 +49,7 @@
setClasses(new Class[]{});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/annotations/xmlpaths/override/employee-oxm.xml");
@@ -66,6 +67,7 @@
*
* @return
*/
+ @Override
public Employee getControlObject() {
Employee emp = new Employee();
emp.thing = Integer.valueOf(INT_VAL);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyOverrideTestCases.java
index 512f2bc..7950c51 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setTypes(new Class[] {Employee.class});
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.name = "Jane Doe";
@@ -48,6 +49,7 @@
return emp;
}
+ @Override
protected Map getProperties() {
String bindings =
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyTestCases.java
index d6f4036..ef2d956 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlreadonly/XmlReadOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setWriteControlJSON(JSON_WRITE_RESOURCE);
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.name = "Jane Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/AddressTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/AddressTransformer.java
index 6429111..740bab2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/AddressTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/AddressTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,9 +22,11 @@
public class AddressTransformer implements FieldTransformer, AttributeTransformer {
+ @Override
public void initialize(AbstractTransformationMapping mapping) {
}
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session) {
if (instance instanceof EmployeeWithAddress) {
if (fieldName.contains("street")) {
@@ -43,6 +45,7 @@
return null;
}
+ @Override
public Object buildAttributeValue(Record record, Object object, Session session) {
String street = (String) record.get("address/street/text()");
String city =(String) record.get("address/city/text()");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/EndTimeTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/EndTimeTransformer.java
index 6c3fb81..9d48493 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/EndTimeTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/EndTimeTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,10 +24,12 @@
public class EndTimeTransformer implements FieldTransformer {
+ @Override
public String buildFieldValue(Object instance, String fieldName, Session session) {
return ((Employee)instance).normalHours[1];
}
+ @Override
public void initialize(AbstractTransformationMapping mapping) {
// TODO Auto-generated method stub
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/NormalHoursTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/NormalHoursTransformer.java
index c1b1337..81d149a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/NormalHoursTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/NormalHoursTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
public class NormalHoursTransformer implements AttributeTransformer {
+ @Override
public String[] buildAttributeValue(Record record, Object object, Session session) {
String startTime = (String)record.get("normal-hours/start-time/text()");
String endTime = (String)record.get("normal-hours/end-time/text()");
@@ -33,6 +34,7 @@
}
+ @Override
public void initialize(AbstractTransformationMapping mapping) {
// TODO Auto-generated method stub
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/StartTimeTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/StartTimeTransformer.java
index fb713be..295eac5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/StartTimeTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/StartTimeTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,10 +23,12 @@
public class StartTimeTransformer implements FieldTransformer {
+ @Override
public String buildFieldValue(Object instance, String fieldName, Session session) {
return ((Employee)instance).normalHours[0];
}
+ @Override
public void initialize(AbstractTransformationMapping mapping) {
// TODO Auto-generated method stub
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorTestCases.java
index 9c9c00c..6e3a52d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/employee.json");
}
+ @Override
public Object getControlObject() {
EmployeeWithAddressAndTransformer emp = new EmployeeWithAddressAndTransformer();
emp.name = "John Smith";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorXMLBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorXMLBindingsTestCases.java
index 135360e..c53538f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorXMLBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XMLTransformationNoArgCtorXMLBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/employee.json");
}
+ @Override
public Object getControlObject() {
EmployeeWithAddress emp = new EmployeeWithAddress();
emp.name = "John Smith";
@@ -42,6 +43,7 @@
return emp;
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XmlTransformationMethodTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XmlTransformationMethodTestCases.java
index 3cd876c..a3ea598 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XmlTransformationMethodTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XmlTransformationMethodTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/transformation/employee1.json");
}
+ @Override
public Object getControlObject() {
EmployeeTransformationMethod emp = new EmployeeTransformationMethod();
emp.name = "John Smith";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XmlTransformationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XmlTransformationTestCases.java
index e52cd2f..b21e997 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XmlTransformationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransformation/XmlTransformationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/transformation/employee1.json");
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.name = "John Smith";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ChildClass.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ChildClass.java
index 865af01..94d8bcd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ChildClass.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ChildClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
private String lastName;
+ @Override
public String getFirstName() {
return super.getFirstName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ObjectWithTransientListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ObjectWithTransientListTestCases.java
index b60afb1..c54c55f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ObjectWithTransientListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ObjectWithTransientListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
return obj;
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ObjectWithTransientTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ObjectWithTransientTestCases.java
index 1f510eb..85623e7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ObjectWithTransientTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/ObjectWithTransientTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
return obj;
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/PropOrderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/PropOrderTestCases.java
index 690077f..b685a72 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/PropOrderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmltransient/PropOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
*/
public class PropOrderTestCases extends TestCase {
+ @Override
public String getName() {
return "XmlTransient PropOrderTestCases: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyOverrideTestCases.java
index 3d47a49..eecc9ca 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setTypes(new Class[] {Employee.class});
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.name = "Jane Doe";
@@ -47,6 +48,7 @@
return emp;
}
+ @Override
protected Map getProperties() {
String bindings =
"<xml-bindings xmlns=\"http://www.eclipse.org/eclipselink/xsds/persistence/oxm\"> " +
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyTestCases.java
index 1cd67b4..ec087c4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/annotations/xmlwriteonly/XmlWriteOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
return getWriteControlObject();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/any/AnyWithJAXBElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/any/AnyWithJAXBElementTestCases.java
index 3c76005..4754c08 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/any/AnyWithJAXBElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/any/AnyWithJAXBElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Root theRoot = new Root();
QName qname = new QName("namespace","dateLocalName");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationRuntimeTestCase.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationRuntimeTestCase.java
index d00fb6a..4e149dc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationRuntimeTestCase.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationRuntimeTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -231,6 +231,7 @@
assertTrue(FILE_JSON_INVALID.delete());
}
+ @Override
@Before
public void setUp() throws Exception {
preferredValidatorFactory = Validation.buildDefaultValidatorFactory();
@@ -259,6 +260,7 @@
FILE_JSON_INVALID = new File(RESOURCES_PATH + "employeeInvalid.json");
}
+ @Override
@After
public void tearDown() throws Exception {
marshallerValidOn = marshallerValidOff = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationSpecialtiesTestCase.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationSpecialtiesTestCase.java
index 6adae00..7d51625 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationSpecialtiesTestCase.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationSpecialtiesTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -378,8 +378,10 @@
}
+ @Override
public ClockProvider getClockProvider() {
return new ClockProvider() {
+ @Override
public Clock getClock() {
return Clock.systemUTC();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/ValidationXMLTestCase.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/ValidationXMLTestCase.java
index d3367b6..060fcee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/ValidationXMLTestCase.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/beanvalidation/ValidationXMLTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -134,6 +134,7 @@
assertTrue(i == 0b1001);
}
+ @Override
@Before
public void setUp() throws Exception {
classLoader = new ValidationClassLoader(currentThread.getContextClassLoader());
@@ -155,6 +156,7 @@
beanValidationPresent.setAccessible(false);
}
+ @Override
@After
public void tearDown() throws Exception {
currentThread.setContextClassLoader(classLoader.getParent());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/binder/adapter/MapEntryAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/binder/adapter/MapEntryAdapter.java
index 5414885..8085f39 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/binder/adapter/MapEntryAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/binder/adapter/MapEntryAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
*
*/
public class MapEntryAdapter extends XmlAdapter<MapEntry, Map<Integer, String>> {
+ @Override
public Map<Integer, String> unmarshal(MapEntry mapEntry) throws Exception {
Map<Integer, String> map = new TreeMap<Integer, String>();
while (mapEntry != null) {
@@ -33,6 +34,7 @@
return map;
}
+ @Override
public MapEntry marshal(Map<Integer, String> map) throws Exception {
MapEntry lastEntry = null;
for (Map.Entry<Integer, String> mapEntry : map.entrySet()) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/casesensitivity/JAXBCaseInsensitivityTestCase.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/casesensitivity/JAXBCaseInsensitivityTestCase.java
index 4b13e15..1cf7d09 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/casesensitivity/JAXBCaseInsensitivityTestCase.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/casesensitivity/JAXBCaseInsensitivityTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -101,6 +101,7 @@
return otherCaseCustomer;
}
+ @Override
@Before
public void setUp() throws Exception {
baseCustomer = new CustomerImpl();
@@ -129,6 +130,7 @@
unmarshallerCorrectCaseSensitive = ctxCorrectCaseSensitive.createUnmarshaller();
}
+ @Override
@After
public void tearDown() throws Exception {
baseCustomer = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/classloader/DifferentClassLoaderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/classloader/DifferentClassLoaderTestCases.java
index 4360d01..021d133 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/classloader/DifferentClassLoaderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/classloader/DifferentClassLoaderTestCases.java
@@ -58,6 +58,7 @@
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
}
+ @Override
protected Object getControlObject() {
try{
Object classA = rootClass.newInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderELTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderELTestCases.java
index e8b11c7..fe291d1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderELTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderELTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
return ch;
}
+ @Override
public Object getReadControlObject(){
CollectionHolder ch = new CollectionHolder();
ch.collection2 = new ArrayList();
@@ -65,6 +66,7 @@
return ch;
}
+ @Override
public Object getJSONReadControlObject(){
CollectionHolder ch = new CollectionHolder();
ch.collection1 = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderInitializedELTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderInitializedELTestCases.java
index b522b2e..04cdcc3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderInitializedELTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderInitializedELTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
return new CollectionHolderInitialized();
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderInitializedWithNullsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderInitializedWithNullsTestCases.java
index 662757d..49b7728 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderInitializedWithNullsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderInitializedWithNullsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -113,9 +113,11 @@
return obj;
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
+ @Override
public void testRoundTrip() throws Exception{
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderNillableWithNullsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderNillableWithNullsTestCases.java
index 39a22b2..7c83e99 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderNillableWithNullsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderNillableWithNullsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,6 +80,7 @@
return obj;
}
+ @Override
public Object getReadControlObject() {
CollectionHolderNillable obj = new CollectionHolderNillable();
obj.collection1 = new ArrayList();
@@ -121,6 +122,7 @@
return obj;
}
+ @Override
public void testRoundTrip() throws Exception{
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedSingleItemReducedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedSingleItemReducedTestCases.java
index 641852f..0adda57 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedSingleItemReducedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedSingleItemReducedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -87,6 +87,7 @@
return ch;
}
+ @Override
public Object getReadControlObject() {
CollectionHolderInitialized ch = new CollectionHolderInitialized();
ch.getCollection1().add(10);
@@ -135,6 +136,7 @@
return ch;
}
+ @Override
protected Object getJSONReadControlObject() {
CollectionHolderInitialized obj = (CollectionHolderInitialized)getControlObject();
obj.collection5.get(0).collection10.put(new QName("type"), "collectionHolderInitialized");
@@ -151,11 +153,13 @@
return obj;
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
//not applicable
+ @Override
public void testRoundTrip(){
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedSingleItemTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedSingleItemTestCases.java
index 196c3c4..07c4ad7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedSingleItemTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedSingleItemTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -87,6 +87,7 @@
return ch;
}
+ @Override
public Object getReadControlObject() {
CollectionHolderInitialized ch = new CollectionHolderInitialized();
ch.getCollection1().add(10);
@@ -135,6 +136,7 @@
return ch;
}
+ @Override
protected Object getJSONReadControlObject() {
CollectionHolderInitialized obj = (CollectionHolderInitialized)getControlObject();
obj.collection5.get(0).collection10.put(new QName("type"), "collectionHolderInitialized");
@@ -151,11 +153,13 @@
return obj;
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
//not applicable
+ @Override
public void testRoundTrip(){
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedTestCases.java
index dd3b6a9..847aca6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderPopulatedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -97,6 +97,7 @@
return ch;
}
+ @Override
public Object getReadControlObject() {
CollectionHolderInitialized ch = new CollectionHolderInitialized();
ch.getCollection1().add(10);
@@ -154,6 +155,7 @@
return ch;
}
+ @Override
protected Object getJSONReadControlObject() {
CollectionHolderInitialized obj = (CollectionHolderInitialized)getControlObject();
obj.collection5.get(0).collection10.put(new QName("type"), "collectionHolderInitialized");
@@ -170,11 +172,13 @@
return obj;
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
//not applicable
+ @Override
public void testRoundTrip(){
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersInitializedELTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersInitializedELTestCases.java
index f2bc406..a5f9846 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersInitializedELTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersInitializedELTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
return new CollectionHolderWrappersInitialized();
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersPopulatedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersPopulatedTestCases.java
index 9418714..8edbebb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersPopulatedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/collections/CollectionHolderWrappersPopulatedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,6 +71,7 @@
return obj;
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/CycleRecoverableTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/CycleRecoverableTestCases.java
index adc84d4..5318908 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/CycleRecoverableTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/CycleRecoverableTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -97,7 +97,7 @@
}
assertNotNull("No exception caught as expected.", expectedException);
- XMLMarshalException xmlMarshalException = (XMLMarshalException) expectedException;
+ XMLMarshalException xmlMarshalException = expectedException;
assertEquals("Incorrect exception code.", xmlMarshalException.getErrorCode(), XMLMarshalException.OBJECT_CYCLE_DETECTED);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/Employee.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/Employee.java
index 21f4845..28a0a86 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/Employee.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/cycle/Employee.java
@@ -27,6 +27,7 @@
public String name;
public List<ContactInfo> contactInfos = new ArrayList<ContactInfo>();
+ @Override
public Object onCycleDetected(Context arg0) {
// Ensure Context's marshaller was set
String marshallerString = arg0.getMarshaller().toString();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBCollectionTestCases.java
index 0023b29..80b6eb5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,15 +45,16 @@
super(name);
}
+ @Override
public String getName() {
return "Dynamic JAXB: Collections: " + super.getName();
}
public void testXSDSingleListUnmarshal() throws Exception {
- InputStream schemaStream = classLoader.getSystemResourceAsStream(XSD_SINGLE);
+ InputStream schemaStream = ClassLoader.getSystemResourceAsStream(XSD_SINGLE);
jaxbContext = DynamicJAXBContextFactory.createContextFromXSD(schemaStream, null, null, null);
- InputStream xmlStream = classLoader.getSystemResourceAsStream(XSD_SINGLE_INSTANCE);
+ InputStream xmlStream = ClassLoader.getSystemResourceAsStream(XSD_SINGLE_INSTANCE);
JAXBElement<DynamicEntity> jaxbElement = (JAXBElement<DynamicEntity>) jaxbContext.createUnmarshaller().unmarshal(xmlStream);
DynamicEntity customer = jaxbElement.getValue();
@@ -66,7 +67,7 @@
}
public void testXSDMultipleListUnmarshal() throws Exception {
- InputStream schemaStream = classLoader.getSystemResourceAsStream(XSD_MULTI);
+ InputStream schemaStream = ClassLoader.getSystemResourceAsStream(XSD_MULTI);
jaxbContext = DynamicJAXBContextFactory.createContextFromXSD(schemaStream, null, null, null);
InputStream xmlStream = Thread.currentThread().getContextClassLoader().getSystemResourceAsStream(XSD_MULTI_INSTANCE);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBContextCreationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBContextCreationTestCases.java
index 73259de..f6fa3b5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBContextCreationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBContextCreationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
super(name);
}
+ @Override
public String getName() {
return "Dynamic JAXB: Context Creation: " + super.getName();
}
@@ -137,7 +138,7 @@
DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
docFactory.setNamespaceAware(true);
- InputStream xsdStream = classLoader.getSystemResourceAsStream(EXAMPLE_XSD);
+ InputStream xsdStream = ClassLoader.getSystemResourceAsStream(EXAMPLE_XSD);
Source xsdSource = new StreamSource(xsdStream);
// Set SYSTEM_ID to the filename part of the fully qualified EXAMPLE_XSD
xsdSource.setSystemId(EXAMPLE_XSD.substring(EXAMPLE_XSD.lastIndexOf('/') + 1));
@@ -221,7 +222,7 @@
// To use schema imports, schemas must be given as Sources
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- InputStream inputStream = classLoader.getSystemResourceAsStream(EXAMPLE_XSD);
+ InputStream inputStream = ClassLoader.getSystemResourceAsStream(EXAMPLE_XSD);
DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
docFactory.setNamespaceAware(true);
DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
@@ -278,7 +279,7 @@
DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
docFactory.setNamespaceAware(true);
- InputStream xsdStream = classLoader.getSystemResourceAsStream(EXAMPLE_XSD);
+ InputStream xsdStream = ClassLoader.getSystemResourceAsStream(EXAMPLE_XSD);
Source xsdSource = new StreamSource(xsdStream);
// Set SYSTEM_ID to the filename part of the fully qualified EXAMPLE_XSD
xsdSource.setSystemId(EXAMPLE_XSD.substring(EXAMPLE_XSD.lastIndexOf('/') + 1));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromOXMTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromOXMTestCases.java
index f5ca68d..321347a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromOXMTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromOXMTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -79,6 +79,7 @@
super(name);
}
+ @Override
public String getName() {
return "Dynamic JAXB: OXM: " + super.getName();
}
@@ -798,7 +799,7 @@
InputStream xmlStream = ClassLoader.getSystemResourceAsStream(PERSON_XML);
JAXBElement person = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(xmlStream);
assertEquals("Element was not substituted properly: ", new QName("myNamespace", "person"), person.getName());
- JAXBElement name = (JAXBElement) ((DynamicEntity) person.getValue()).get("name");
+ JAXBElement name = ((DynamicEntity) person.getValue()).get("name");
assertEquals("Element was not substituted properly: ", new QName("myNamespace", "name"), name.getName());
// ====================================================================
@@ -806,7 +807,7 @@
InputStream xmlStream2 = ClassLoader.getSystemResourceAsStream(PERSONNE_XML);
JAXBElement person2 = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(xmlStream2);
assertEquals("Element was not substituted properly: ", new QName("myNamespace", "personne"), person2.getName());
- JAXBElement name2 = (JAXBElement) ((DynamicEntity) person2.getValue()).get("name");
+ JAXBElement name2 = ((DynamicEntity) person2.getValue()).get("name");
assertEquals("Element was not substituted properly: ", new QName("myNamespace", "nom"), name2.getName());
} catch (UndeclaredThrowableException e) {
if (e.getUndeclaredThrowable() instanceof NoSuchMethodException) {
@@ -1306,7 +1307,7 @@
DynamicEntity readAddress = readPerson.get("address");
assertEquals("Backpointer was not properly set.", readPerson, readAddress.get("person"));
- Vector<DynamicEntity> readPhones = (Vector<DynamicEntity>) readPerson.get("phoneNumbers");
+ Vector<DynamicEntity> readPhones = readPerson.get("phoneNumbers");
for (DynamicEntity readPhone : readPhones) {
assertEquals("Backpointer was not properly set.", readPerson, readPhone.get("person"));
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromSessionsXMLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromSessionsXMLTestCases.java
index b83da03..435366d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromSessionsXMLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromSessionsXMLTestCases.java
@@ -84,6 +84,7 @@
xmlContext = ((DynamicJAXBContext) jaxbContext).getXMLContext();
}
+ @Override
protected Object getControlObject() {
DynamicEntity docWrapper = ((DynamicJAXBContext) jaxbContext).newDynamicEntity(DOCWRAPPER_CLASS_NAME);
@@ -269,8 +270,8 @@
Text text2 = (Text) controlElement;
equal = equal && text1.getNodeValue().equals(text2.getNodeValue());
} else if (testElement.getNodeType() == controlElement.ELEMENT_NODE && controlElement.getNodeType() == controlElement.ELEMENT_NODE) {
- Element elem1 = (Element) testElement;
- Element elem2 = (Element) controlElement;
+ Element elem1 = testElement;
+ Element elem2 = controlElement;
equal = equal && elem1.getNodeName().equals(elem2.getNodeName());
equal = equal && (elem1.getChildNodes().getLength() == elem2.getChildNodes().getLength());
compareObjects(elem1.getFirstChild().getNodeValue(), elem2.getFirstChild().getNodeValue());
@@ -336,6 +337,7 @@
}
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromXSDTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromXSDTestCases.java
index 618186f..26ca8a8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromXSDTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBFromXSDTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,6 +68,7 @@
super(name);
}
+ @Override
public String getName() {
return "Dynamic JAXB: XSD: " + super.getName();
}
@@ -722,7 +723,7 @@
InputStream xmlStream = ClassLoader.getSystemResourceAsStream(PERSON_XML);
JAXBElement person = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(xmlStream);
assertEquals("Element was not substituted properly: ", new QName("myNamespace", "person"), person.getName());
- JAXBElement name = (JAXBElement) ((DynamicEntity) person.getValue()).get("name");
+ JAXBElement name = ((DynamicEntity) person.getValue()).get("name");
assertEquals("Element was not substituted properly: ", new QName("myNamespace", "name"), name.getName());
// ====================================================================
@@ -730,7 +731,7 @@
InputStream xmlStream2 = ClassLoader.getSystemResourceAsStream(PERSONNE_XML);
JAXBElement person2 = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(xmlStream2);
assertEquals("Element was not substituted properly: ", new QName("myNamespace", "personne"), person2.getName());
- JAXBElement name2 = (JAXBElement) ((DynamicEntity) person2.getValue()).get("name");
+ JAXBElement name2 = ((DynamicEntity) person2.getValue()).get("name");
assertEquals("Element was not substituted properly: ", new QName("myNamespace", "nom"), name2.getName());
} catch (JAXBException e) {
// If running in a non-JAXB 2.2 environment, we will get this error because the required() method
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBRefreshTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBRefreshTestCases.java
index 67dd4d5..d21c9c0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBRefreshTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBRefreshTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
private static final String XML_RESOURCE_BEFORE = "org/eclipse/persistence/testing/jaxb/dynamic/before.xml";
private static final String XML_RESOURCE_AFTER = "org/eclipse/persistence/testing/jaxb/dynamic/after.xml";
+ @Override
public String getName() {
return "Dynamic JAXB: Metadata Refresh: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBUsingXMLNamesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBUsingXMLNamesTestCases.java
index 06d2d82..5e9bd6c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBUsingXMLNamesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBUsingXMLNamesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
super(name);
}
+ @Override
public String getName() {
return "Dynamic JAXB: Using XML Names: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/EmptyContextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/EmptyContextTestCases.java
index 82df2b4..9b5fc87 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/EmptyContextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/EmptyContextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
private static class TestMetadataSource implements MetadataSource {
+ @Override
public XmlBindings getXmlBindings(Map<String, ?> properties, ClassLoader classLoader) {
XmlBindings xmlBindings = new XmlBindings();
xmlBindings.setPackageName("test");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/SessionEventListenerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/SessionEventListenerTestCases.java
index 2b7e554..5483658 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/SessionEventListenerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/SessionEventListenerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,7 +49,7 @@
Map<String, Object> properties = new HashMap<String, Object>(2);
properties.put(JAXBContextProperties.SESSION_EVENT_LISTENER, sessionEventListener);
properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, "org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/oxm.xml");
- JAXBContext jc = (JAXBContext) DynamicJAXBContextFactory.createContextFromOXM(this.getClass().getClassLoader(), properties);
+ JAXBContext jc = DynamicJAXBContextFactory.createContextFromOXM(this.getClass().getClassLoader(), properties);
unmarshalTest(jc);
}
@@ -58,8 +58,8 @@
properties.put(JAXBContextProperties.SESSION_EVENT_LISTENER, sessionEventListener);
ClassLoader classLoader = SessionEventListenerTestCases.class.getClassLoader();
- InputStream schemaStream = classLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/schema.xsd");
- JAXBContext jc = (JAXBContext) DynamicJAXBContextFactory.createContextFromXSD(schemaStream, null, classLoader, properties);
+ InputStream schemaStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/dynamic/sessioneventlistener/schema.xsd");
+ JAXBContext jc = DynamicJAXBContextFactory.createContextFromXSD(schemaStream, null, classLoader, properties);
unmarshalTest(jc);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/AttributeTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/AttributeTransformer.java
index eb5463c..0b85d7a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/AttributeTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/AttributeTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
public class AttributeTransformer extends AttributeTransformerAdapter {
+ @Override
public Object buildAttributeValue(Record record, Object instance, Session session) {
String[] objectValue = new String[2];
objectValue[0] = (String) record.get("transform/first-val/text()");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/ComputerAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/ComputerAdapter.java
index 5839c51..de4c703 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/ComputerAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/ComputerAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
private final String DELIM = "::";
+ @Override
public String marshal(Computer arg0) throws Exception {
String marshalString = "";
@@ -37,6 +38,7 @@
return marshalString;
}
+ @Override
public Computer unmarshal(String arg0) throws Exception {
Computer c = new Computer();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/CustomEntityResolver.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/CustomEntityResolver.java
index 8ea22a5..43ca12c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/CustomEntityResolver.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/CustomEntityResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,14 +29,15 @@
private static boolean withExtension = false;
public CustomEntityResolver(boolean withExtension) {
- this.withExtension = withExtension;
+ CustomEntityResolver.withExtension = withExtension;
}
+ @Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
// Grab only the filename part from the full path
File f = new File(systemId);
- String correctedId = RESOURCE_DIR + f.getName() + (this.withExtension ? "" : ".xsd");
+ String correctedId = RESOURCE_DIR + f.getName() + (withExtension ? "" : ".xsd");
InputSource is = new InputSource(ClassLoader.getSystemResourceAsStream(correctedId));
is.setSystemId(correctedId);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/FirstFieldTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/FirstFieldTransformer.java
index 876b221..201d98c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/FirstFieldTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/FirstFieldTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
public class FirstFieldTransformer extends FieldTransformerAdapter {
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session) {
DynamicEntity entity = (DynamicEntity) instance;
String[] objectValue = entity.get("transform");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/LinkAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/LinkAdapter.java
index a4d74ee..d1194be 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/LinkAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/LinkAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,7 +33,7 @@
}
public LinkAdapter(DynamicJAXBContext jc) {
- this.jc = jc;
+ LinkAdapter.jc = jc;
}
@Override
@@ -42,7 +42,7 @@
DynamicEntity address = jc.newDynamicEntity("mynamespace.Address");
- StringTokenizer tokenizer = new StringTokenizer(((Object)link.get("href")).toString(), "&", false);
+ StringTokenizer tokenizer = new StringTokenizer(link.get("href").toString(), "&", false);
String street = tokenizer.nextToken();
street = street.substring(street.lastIndexOf("=") + 1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/LinkAdapterString.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/LinkAdapterString.java
index dc65d45..5a987f5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/LinkAdapterString.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/LinkAdapterString.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,14 +33,14 @@
}
public LinkAdapterString(DynamicJAXBContext jc) {
- this.jc = jc;
+ LinkAdapterString.jc = jc;
}
@Override
public DynamicEntity unmarshal(String v) throws Exception {
DynamicEntity address = jc.newDynamicEntity("mynamespace.Address");
- StringTokenizer tokenizer = new StringTokenizer((String) v, "|");
+ StringTokenizer tokenizer = new StringTokenizer(v, "|");
String street = tokenizer.nextToken();
street = street.replace('_', ' ');
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/MarshalTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/MarshalTransformer.java
index bd84f94..ec779aa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/MarshalTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/MarshalTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
public class MarshalTransformer extends FieldTransformerAdapter {
+ @Override
public String buildFieldValue(Object instance, String fieldName, Session session) {
DynamicEntity person = (DynamicEntity) instance;
return person.get("start-time");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/PersonCustomizer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/PersonCustomizer.java
index 7166bfe..dd44cfa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/PersonCustomizer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/PersonCustomizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public class PersonCustomizer implements DescriptorCustomizer {
+ @Override
public void customize(ClassDescriptor descriptor) throws Exception {
XMLDirectMapping nameMapping = (XMLDirectMapping) descriptor.getMappingForAttributeName("name");
XMLField nameField = (XMLField) nameMapping.getField();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/SecondFieldTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/SecondFieldTransformer.java
index 93ce179..275746f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/SecondFieldTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/SecondFieldTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
public class SecondFieldTransformer extends FieldTransformerAdapter {
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session) {
DynamicEntity entity = (DynamicEntity) instance;
String[] objectValue = entity.get("transform");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/TestClassExtractor.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/TestClassExtractor.java
index a07dd94..fb89cb0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/TestClassExtractor.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/TestClassExtractor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
public class TestClassExtractor extends ClassExtractor {
+ @Override
public Class extractClassFromRow(Record databaseRow, Session session) {
Class empClass = session.getProject().getDescriptorForAlias("Employee").getJavaClass();
return empClass;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/UnmarshalTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/UnmarshalTransformer.java
index 129f74d..bca5839 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/UnmarshalTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/util/UnmarshalTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@
public class UnmarshalTransformer extends AttributeTransformerAdapter {
+ @Override
public Object buildAttributeValue(Record record, Object instance, Session session) {
String[] hours = new String[2];
hours[0] = (String) record.get("normal-hours/start-time/text()");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticAddressNoPropsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticAddressNoPropsTestCases.java
index e6ebd5d..066c611 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticAddressNoPropsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticAddressNoPropsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setControlJSON(JSON_CONTROL_DOC);
}
+ @Override
public String getName() {
return "Dynamic JAXB: OXM: " + super.getName();
}
@@ -98,6 +99,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_VALUE_WRAPPER, "value");
}
+ @Override
public void xmlToObjectTest(Object testObject, Object controlObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -108,6 +110,7 @@
compareDynamicEntities(testObject, controlObject);
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticOverrideTestCases.java
index 64f56a3..f630bdf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setControlJSON(JSON_CONTROL_DOC);
}
+ @Override
public String getName() {
return "Dynamic JAXB: OXM: " + super.getName();
}
@@ -98,6 +99,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_VALUE_WRAPPER, "value");
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -108,6 +110,7 @@
}
+ @Override
public void xmlToObjectTest(Object testObject, Object controlObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticTestCases.java
index 4cfdf54..e9ea959 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/DynamicWithStaticTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setControlJSON(JSON_CONTROL_DOC);
}
+ @Override
public String getName() {
return "Dynamic JAXB: OXM: " + super.getName();
}
@@ -98,6 +99,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_VALUE_WRAPPER, "value");
}
+ @Override
public void xmlToObjectTest(Object testObject, Object controlObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -108,6 +110,7 @@
compareDynamicEntities(testObject, controlObject);
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/StaticWithDynamicTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/StaticWithDynamicTestCases.java
index a6a84d8..22f2999 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/StaticWithDynamicTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/dynamic/withstatic/StaticWithDynamicTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setControlJSON(JSON_CONTROL_DOC);
}
+ @Override
public String getName() {
return "Dynamic JAXB: OXM: " + super.getName();
}
@@ -102,6 +103,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_VALUE_WRAPPER, "value");
}
+ @Override
public void xmlToObjectTest(Object testObject, Object controlObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -112,6 +114,7 @@
compareDynamicEntities(testObject, controlObject);
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/EmployeeNamespaceCancellationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/EmployeeNamespaceCancellationTestCases.java
index 8054b01..46be32a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/EmployeeNamespaceCancellationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/EmployeeNamespaceCancellationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,10 +46,12 @@
setClasses(classes);
}
+ @Override
public void testRoundTrip(){
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -74,6 +76,7 @@
return employee;
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLInputFactory factory = javax.xml.stream.XMLInputFactory.newInstance();
@@ -84,6 +87,7 @@
}
// Bug #283424 needs to be fixed then this test can be added
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLInputFactory factory = javax.xml.stream.XMLInputFactory.newInstance();
@@ -93,6 +97,7 @@
this.xmlToObjectTest(obj);
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/EmployeeNullInCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/EmployeeNullInCollectionTestCases.java
index 5b54797..9320789 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/EmployeeNullInCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/EmployeeNullInCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,10 +52,12 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, Boolean.TRUE);
}
+ @Override
public void testRoundTrip(){
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -82,6 +84,7 @@
return elem;
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
@@ -99,6 +102,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public Class getUnmarshalClass(){
return Employee_B.class;
}
@@ -189,6 +193,7 @@
}
}
*/
+ @Override
public void testUnmarshallerHandler() throws Exception {
//Not Applicable.
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeNSTestCases.java
index c1a8423..9ddec40 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_USE_XSD_TYPES_WITH_PREFIX, true);
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeNoWrapperTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeNoWrapperTestCases.java
index 0dfa599..2831216 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeNoWrapperTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeNoWrapperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
jaxbMarshaller.setProperty(MarshallerProperties.JSON_USE_XSD_TYPES_WITH_PREFIX, true);
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeTestCases.java
index 42428c7..f640967 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/employee/JAXBEmployeeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,6 +62,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -87,10 +88,12 @@
return employee;
}
+ @Override
public String getWriteControlJSONFormatted(){
return JSON_RESOURCE_FORMATTED;
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/emptystring/ListsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/emptystring/ListsTestCases.java
index dfe0b6c..e3c255f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/emptystring/ListsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/emptystring/ListsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
ListsTestObject testObject = new ListsTestObject();
ArrayList<String> strings = new ArrayList<String>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeEnumInvalidTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeEnumInvalidTypeTestCases.java
index ac7ab4a..a31b14e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeEnumInvalidTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeEnumInvalidTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
}
+ @Override
public void setUp() throws Exception{
super.setUp();
handler = new MyEventHandler();
@@ -45,14 +46,17 @@
return myClass;
}
+ @Override
public void jsonToObjectTest(Object testObject, Object controlObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void testRoundTrip(){};
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeEnumInvalidValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeEnumInvalidValueTestCases.java
index 9167756..f7a9e7b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeEnumInvalidValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeEnumInvalidValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
}
+ @Override
public void setUp() throws Exception{
super.setUp();
handler = new MyEventHandler();
@@ -45,14 +46,17 @@
return myClass;
}
+ @Override
public void jsonToObjectTest(Object testObject, Object controlObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void testRoundTrip(){};
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeInvalidTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeInvalidTypeTestCases.java
index 9a888ed..7efac6e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeInvalidTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/AttributeInvalidTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
}
+ @Override
public void setUp() throws Exception{
super.setUp();
handler = new MyEventHandler();
@@ -45,14 +46,17 @@
return myClass;
}
+ @Override
public void jsonToObjectTest(Object testObject, Object controlObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void testRoundTrip(){};
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementEnumInvalidTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementEnumInvalidTypeTestCases.java
index eb090bf..69d3208 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementEnumInvalidTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementEnumInvalidTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
}
+ @Override
public void setUp() throws Exception{
super.setUp();
handler = new MyEventHandler();
@@ -45,14 +46,17 @@
return myClass;
}
+ @Override
public void jsonToObjectTest(Object testObject, Object controlObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void testRoundTrip(){};
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementEnumInvalidValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementEnumInvalidValueTestCases.java
index 3c4abf9..ddd0680 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementEnumInvalidValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementEnumInvalidValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
}
+ @Override
public void setUp() throws Exception{
super.setUp();
handler = new MyEventHandler();
@@ -45,14 +46,17 @@
return myClass;
}
+ @Override
public void jsonToObjectTest(Object testObject, Object controlObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void testRoundTrip(){};
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementInvalidTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementInvalidTypeTestCases.java
index 7234d95..1ccb005 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementInvalidTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ElementInvalidTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
}
+ @Override
public void setUp() throws Exception{
super.setUp();
handler = new MyEventHandler();
@@ -45,14 +46,17 @@
return myClass;
}
+ @Override
public void jsonToObjectTest(Object testObject, Object controlObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
assertEquals(ValidationEvent.ERROR, handler.getSeverity());
}
+ @Override
public void testRoundTrip(){};
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ValidDocTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ValidDocTestCases.java
index 0986853..f362d1d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ValidDocTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/eventhandler/ValidDocTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/eventhandler/valid.json");
}
+ @Override
public void setUp() throws Exception{
super.setUp();
handler = new MyEventHandler();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/ExternalMetadataTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/ExternalMetadataTestCases.java
index 8217ee4..8b6750f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/ExternalMetadataTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/ExternalMetadataTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
return properties;
}
+ @Override
public void testObjectToOutputStream() throws Exception {
Object objectToWrite = getWriteControlObject();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBMarshalListenerImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBMarshalListenerImpl.java
index 476e2fe..4e10e12 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBMarshalListenerImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBMarshalListenerImpl.java
@@ -32,6 +32,7 @@
public JAXBMarshalListenerImpl() {
events = new ArrayList();
}
+ @Override
public void beforeMarshal(Object obj) {
if(obj instanceof Employee) {
events.add(EMPLOYEE_BEFORE_MARSHAL);
@@ -41,6 +42,7 @@
events.add(PHONE_BEFORE_MARSHAL);
}
}
+ @Override
public void afterMarshal(Object obj) {
if(obj instanceof Employee) {
events.add(EMPLOYEE_AFTER_MARSHAL);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBUnmarshalListenerImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBUnmarshalListenerImpl.java
index 732c708..75111c7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBUnmarshalListenerImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/JAXBUnmarshalListenerImpl.java
@@ -31,6 +31,7 @@
public JAXBUnmarshalListenerImpl() {
events = new ArrayList();
}
+ @Override
public void beforeUnmarshal(Object obj, Object parent) {
if(obj instanceof Employee) {
events.add(EMPLOYEE_BEFORE_UNMARSHAL);
@@ -40,6 +41,7 @@
events.add(PHONE_BEFORE_UNMARSHAL);
}
}
+ @Override
public void afterUnmarshal(Object obj, Object parent) {
if(obj instanceof Employee) {
events.add(EMPLOYEE_AFTER_UNMARSHAL);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/RootWithCompositeCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/RootWithCompositeCollectionTestCases.java
index 5e730fe..898d190 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/RootWithCompositeCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/RootWithCompositeCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,14 +71,16 @@
}
+ @Override
public void setUp() throws Exception {
super.setUp();
listener = new JAXBMarshalListenerImpl();
unmarshalListener = new JAXBUnmarshalListenerImpl();
- this.getJAXBMarshaller().setListener((Marshaller.Listener)listener);
- this.getJAXBUnmarshaller().setListener((Unmarshaller.Listener)unmarshalListener);
+ this.getJAXBMarshaller().setListener(listener);
+ this.getJAXBUnmarshaller().setListener(unmarshalListener);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Class based callbacks not correct", ((Employee)testObject).triggeredEvents.equals(expectedClassBasedUnmarshalEvents));
@@ -87,6 +89,7 @@
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
super.jsonToObjectTest(testObject);
assertTrue("Class based callbacks not correct", ((Employee)testObject).triggeredEvents.equals(expectedClassBasedUnmarshalEvents));
@@ -95,6 +98,7 @@
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Class based callbacks not correct", ((Employee)getWriteControlObject()).triggeredEvents.equals(expectedClassBasedMarshalEvents));
@@ -102,6 +106,7 @@
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
employee.phoneNumbers = new ArrayList();
@@ -117,6 +122,7 @@
}
+ @Override
public Object getWriteControlObject() {
if(writeControlObject == null) {
writeControlObject = getControlObject();
@@ -124,6 +130,7 @@
return writeControlObject;
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
Object testObject = getJAXBUnmarshaller().unmarshal(instream);
@@ -131,11 +138,13 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
//Document testDocument = getJAXBMarshaller().objectToXML(getWriteControlObject());
//objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
StringWriter writer = new StringWriter();
getJAXBMarshaller().marshal(getWriteControlObject(), writer);
@@ -149,6 +158,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testRoundTrip() throws Exception{
if(isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -178,6 +188,7 @@
}
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
getJAXBMarshaller().marshal(getWriteControlObject(), builder);
@@ -194,12 +205,14 @@
assertXMLIdentical(controlDocument, testDocument);
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(resourceName);
Object testObject = getJAXBUnmarshaller().unmarshal(url);
xmlToObjectTest(testObject);
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/RootWithCompositeObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/RootWithCompositeObjectTestCases.java
index 01b87a3..01421ce 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/RootWithCompositeObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/events/RootWithCompositeObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,6 +67,7 @@
}
+ @Override
public void setUp() throws Exception {
super.setUp();
listener = new JAXBMarshalListenerImpl();
@@ -77,6 +78,7 @@
this.getJAXBMarshaller().setListener(listener);
this.getJAXBUnmarshaller().setListener(unmarshalListener);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Class based callbacks not correct", ((Employee)testObject).triggeredEvents.equals(expectedClassBasedUnmarshalEvents));
@@ -85,6 +87,7 @@
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
super.jsonToObjectTest(testObject);
assertTrue("Class based callbacks not correct", ((Employee)testObject).triggeredEvents.equals(expectedClassBasedUnmarshalEvents));
@@ -92,12 +95,14 @@
unmarshalListener.events = new ArrayList();
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Class based callbacks not correct", ((Employee)getWriteControlObject()).triggeredEvents.equals(expectedClassBasedMarshalEvents));
assertTrue("Expected sequence of Marshal events not found", expectedMarshalEvents.equals(listener.events));
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
Address address = new Address();
@@ -105,12 +110,14 @@
employee.address = address;
return employee;
}
+ @Override
public Object getWriteControlObject() {
if(writeControlObject == null) {
writeControlObject = getControlObject();
}
return writeControlObject;
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
Object testObject = getJAXBUnmarshaller().unmarshal(instream);
@@ -118,11 +125,13 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
//Document testDocument = getJAXBMarshaller().objectToXML(getWriteControlObject());
//objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testRoundTrip() throws Exception{
if(isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -152,6 +161,7 @@
}
}
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
StringWriter writer = new StringWriter();
getJAXBMarshaller().marshal(getWriteControlObject(), writer);
@@ -166,6 +176,7 @@
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
getJAXBMarshaller().marshal(getWriteControlObject(), builder);
@@ -182,12 +193,14 @@
assertXMLIdentical(controlDocument, testDocument);
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(resourceName);
Object testObject = getJAXBUnmarshaller().unmarshal(url);
xmlToObjectTest(testObject);
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java
index d2b324a..e274c76 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,6 +83,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setNamespaceAware(true);
@@ -536,6 +537,7 @@
public ResourceResolver(MyStreamSchemaOutputResolver resolver) {
oResolver = resolver;
}
+ @Override
public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseUri) {
return new MyLSInput(namespaceURI, oResolver);
}
@@ -554,23 +556,39 @@
sValue = value;
oResolver = resolver;
}
+ @Override
public void setSystemId(String arg0) {}
+ @Override
public void setStringData(String arg0) {}
+ @Override
public void setPublicId(String arg0) {}
+ @Override
public void setEncoding(String arg0) {}
+ @Override
public void setCharacterStream(Reader arg0) {}
+ @Override
public void setCertifiedText(boolean arg0) {}
+ @Override
public void setByteStream(InputStream arg0) {}
+ @Override
public void setBaseURI(String arg0) {}
+ @Override
public String getSystemId() {return null;}
+ @Override
public String getStringData() {
return oResolver.schemaFiles.get(sValue).toString();
}
+ @Override
public String getPublicId() {return null;}
+ @Override
public String getEncoding() {return null;}
+ @Override
public Reader getCharacterStream() {return null;}
+ @Override
public boolean getCertifiedText() {return false;}
+ @Override
public InputStream getByteStream() {return null;}
+ @Override
public String getBaseURI() {return null;}
}
@@ -704,6 +722,7 @@
schemaFiles = new HashMap<String, File>();
}
+ @Override
public Result createOutput(String namespaceURI, String suggestedFileName) throws IOException {
//return new StreamResult(System.out);
if (namespaceURI == null) {
@@ -729,6 +748,7 @@
schemaFiles = new HashMap<String, Writer>();
}
+ @Override
public Result createOutput(String namespaceURI, String suggestedFileName) throws IOException {
//return new StreamResult(System.out);
if (namespaceURI == null) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/jaxbcontextfactory/JAXBContextFactoryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/jaxbcontextfactory/JAXBContextFactoryTestCases.java
index b798022..395b718 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/jaxbcontextfactory/JAXBContextFactoryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/jaxbcontextfactory/JAXBContextFactoryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -101,6 +101,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeMappingTestCases.java
index bac8291..c7d93bf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
JAXBMarshaller jsonMarshaller = (JAXBMarshaller) jaxbContext.createMarshaller();
jsonMarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
@@ -76,6 +77,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
HashMap stuff = new HashMap();
@@ -87,6 +89,7 @@
return ctrlEmp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/employee-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeReadOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeReadOnlyMappingTestCases.java
index de47040..6b2fb6b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeReadOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeReadOnlyMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
JAXBMarshaller jsonMarshaller = (JAXBMarshaller) jaxbContext.createMarshaller();
jsonMarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
@@ -65,6 +66,7 @@
return jsonMarshaller;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/read-only-employee-oxm.xml");
@@ -79,6 +81,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
HashMap stuff = new HashMap();
@@ -96,6 +99,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeSubTypeMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeSubTypeMappingTestCases.java
index 08098a6..cd2af1f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeSubTypeMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeSubTypeMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,6 +63,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
JAXBMarshaller jsonMarshaller = (JAXBMarshaller) jaxbContext.createMarshaller();
jsonMarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
@@ -77,6 +78,7 @@
/**
* Create the control XmlAnyAttributeSubTypeMapModel.
*/
+ @Override
public Object getControlObject() {
XmlAnyAttributeSubTypeMapModel anyAttributeSubTypeMapModel = new XmlAnyAttributeSubTypeMapModel();
LinkedHashMap children = new LinkedHashMap();
@@ -88,6 +90,7 @@
return anyAttributeSubTypeMapModel;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/subtype-map-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeWriteOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeWriteOnlyMappingTestCases.java
index d7a553d..07d6e75 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeWriteOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/AnyAttributeWriteOnlyMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
JAXBMarshaller jsonMarshaller = (JAXBMarshaller) jaxbContext.createMarshaller();
jsonMarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
@@ -64,6 +65,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyattribute/write-only-employee-oxm.xml");
@@ -78,6 +80,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
@@ -85,6 +88,7 @@
return ctrlEmp;
}
+ @Override
public Object getWriteControlObject() {
Employee ctrlEmp = new Employee();
HashMap stuff = new HashMap();
@@ -104,6 +108,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionMappingTestCases.java
index 9d6db26..7c21352 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
List<Object> stuff = new ArrayList<Object>();
stuff.add(STUFF);
@@ -61,6 +62,7 @@
return ctrlEmp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/employee-oxm.xml");
@@ -83,6 +85,7 @@
}
+ @Override
public void testRoundTrip(){
//whitespace difference
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionReadOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionReadOnlyMappingTestCases.java
index 19d6df8..4cac8d7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionReadOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionReadOnlyMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setClasses(new Class[] { Employee.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/read-only-employee-oxm.xml");
@@ -58,6 +59,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
@@ -73,6 +75,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionWriteOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionWriteOnlyMappingTestCases.java
index b322cd1..e65d838 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionWriteOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/AnyCollectionWriteOnlyMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setClasses(new Class[] { Employee.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anycollection/write-only-employee-oxm.xml");
@@ -54,6 +55,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
@@ -61,6 +63,7 @@
return ctrlEmp;
}
+ @Override
public Object getWriteControlObject() {
List<Object> stuff = new ArrayList<Object>();
stuff.add(STUFF);
@@ -78,6 +81,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectMappingTestCases.java
index dc9374d..75c41ea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
@@ -73,6 +74,7 @@
return ctrlEmp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/employee-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectReadOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectReadOnlyMappingTestCases.java
index e44aa4d..1ceadac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectReadOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectReadOnlyMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
setClasses(new Class[] { Employee.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/read-only-employee-oxm.xml");
@@ -65,6 +66,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
@@ -87,6 +89,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectWriteOnlyMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectWriteOnlyMappingTestCases.java
index 86d9e04..89c9fbd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectWriteOnlyMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/AnyObjectWriteOnlyMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setClasses(new Class[] { Employee.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/anyobject/write-only-employee-oxm.xml");
@@ -58,6 +59,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
@@ -65,6 +67,7 @@
return ctrlEmp;
}
+ @Override
public Object getWriteControlObject() {
Employee ctrlEmp = new Employee();
@@ -89,6 +92,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydata/BinaryDataMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydata/BinaryDataMappingTestCases.java
index 4f836be..effd24f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydata/BinaryDataMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydata/BinaryDataMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,6 +67,7 @@
*
* @return
*/
+ @Override
public Object getControlObject() {
// setup control object
MyData ctrlData = new MyData();
@@ -78,6 +79,7 @@
return ctrlData;
}
+ @Override
public Object getWriteControlObject() {
if(ctrlObject == null){
// setup control object
@@ -91,6 +93,7 @@
return ctrlObject;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydata/mydata-oxm.xml");
@@ -102,6 +105,7 @@
return properties;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception{
super.xmlToObjectTest(testObject);
MyData myObj=(MyData)testObject;
@@ -109,6 +113,7 @@
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception{
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", ctrlObject.wasGetCalled);
@@ -122,6 +127,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydatacollection/BinaryDataCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydatacollection/BinaryDataCollectionMappingTestCases.java
index 7548b75..ddb6329 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydatacollection/BinaryDataCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydatacollection/BinaryDataCollectionMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,6 +63,7 @@
*
* @return
*/
+ @Override
public MyData getControlObject() {
// setup control object
List<byte[]> bytesList = new ArrayList<byte[]>();
@@ -80,6 +81,7 @@
return ctrlData;
}
+ @Override
public MyData getWriteControlObject() {
if(ctrlObject == null){
// setup control object
@@ -101,6 +103,7 @@
return ctrlObject;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/binarydatacollection/mydata-oxm.xml");
@@ -112,6 +115,7 @@
return properties;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception{
super.xmlToObjectTest(testObject);
MyData myObj=(MyData)testObject;
@@ -119,6 +123,7 @@
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception{
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", ctrlObject.wasGetCalled);
@@ -131,6 +136,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java
index 5f10f23..b8b2305 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingEmployeeTestCases.java
@@ -46,6 +46,7 @@
setContextPath("org.eclipse.persistence.testing.jaxb.externalizedmetadata.mappings.choice");
}
+ @Override
public Object getWriteControlObject() {
if(ctrlObject ==null){
Employee emp = new Employee();
@@ -57,6 +58,7 @@
return ctrlObject;
}
+ @Override
public Object getControlObject() {
if(ctrlObject ==null){
Employee emp = new Employee();
@@ -67,6 +69,7 @@
return ctrlObject;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/employee-oxm.xml");
@@ -79,11 +82,13 @@
return properties;
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", ctrlObject.wasGetCalled);
}
+ @Override
public void testRoundTrip() throws Exception{
//doesn't apply since read and write only mappings are present
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingWithJoinNodesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingWithJoinNodesTestCases.java
index 148ef90..0378fa5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingWithJoinNodesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/ChoiceMappingWithJoinNodesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_VALUE_WRAPPER, "value");
}
+ @Override
protected Object getControlObject() {
Address address1 = new Address("a100", "123 Some Street", "shipping");
Address address2 = new Address("a101", "66 Dead End Rd.", "home");
@@ -82,6 +83,7 @@
return ctrlRoot;
}
+ @Override
public Map getProperties(){
Map<String, Object> props = new HashMap<String, Object>();
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choice/reference/root-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java
index 118b525..e1b4a98 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/ChoiceCollectionMappingTestCases.java
@@ -60,6 +60,7 @@
*
* @return
*/
+ @Override
public Object getWriteControlObject() {
if(writeCtrlObject == null){
List<Object> things = new ArrayList<Object>();
@@ -80,6 +81,7 @@
return writeCtrlObject;
}
+ @Override
public Object getControlObject() {
List<Object> things = new ArrayList<Object>();
@@ -96,6 +98,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/choicecollection/employee-oxm.xml");
@@ -133,23 +136,28 @@
assertTrue("Instance doc validation (write-employee) failed unxepectedly: " + result, result == null);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Accessor method was not called as expected", ((Employee)testObject).wasSetCalled);
}
+ @Override
public void testRoundTrip() throws Exception{
//doesn't apply since read and write only mappings are present
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", writeCtrlObject.wasGetCalled);
}
+ @Override
public void testJSONMarshalToBuilderResult() throws Exception{
//Currently not supported, 101.1 will get written as 101.0999984741211
}
+ @Override
public void testJSONMarshalToGeneratorResult() throws Exception{
//Currently not supported, 101.1 will get written as 101.0999984741211
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceMappingTestCases.java
index 0de1d88..babb2d5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/root-oxm.xml");
@@ -77,6 +78,7 @@
/**
* Create the control Root.
*/
+ @Override
public Object getControlObject() {
if(ctrlObj == null){
Root root = new Root();
@@ -110,12 +112,14 @@
return ctrlObj;
}
+ @Override
public void objectToXMLDocumentTest (Document testDocument) throws Exception{
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", ctrlObj.employees.get(0).wasGetCalled);
}
+ @Override
public void testRoundTrip(){
//accessor method wont get hit with this test as the check is on the ctrlObj but in this
//case it isn' tthe ctrlObj that gets written.
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceReadOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceReadOnlyTestCases.java
index 31975f7..43f8265 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceReadOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceReadOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
/**
* Create the control Root.
*/
+ @Override
public Object getControlObject() {
Root root = new Root();
List<Employee> emps = new ArrayList<Employee>();
@@ -80,6 +81,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/read-only-oxm.xml");
@@ -102,6 +104,7 @@
}
+ @Override
public void testRoundTrip(){
//not applicable since read and write docs are different
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceWriteOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceWriteOnlyTestCases.java
index 273b50e..c060453 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceWriteOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/CollectionReferenceWriteOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
/**
* Create the control write-only Root.
*/
+ @Override
public Object getControlObject() {
Root root = new Root();
List<Employee> emps = new ArrayList<Employee>();
@@ -74,6 +75,7 @@
/**
* Create the control Root.
*/
+ @Override
public Object getWriteControlObject() {
Root root = new Root();
List<Employee> emps = new ArrayList<Employee>();
@@ -104,6 +106,7 @@
return root;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/collectionreference/write-only-oxm.xml");
@@ -125,6 +128,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/composite/CompositeMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/composite/CompositeMappingTestCases.java
index c8291ed..b8a3cee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/composite/CompositeMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/composite/CompositeMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,6 +68,7 @@
setWriteControlDocument(XML_WRITE_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/composite/employee-oxm.xml");
@@ -129,6 +130,7 @@
*
* @return
*/
+ @Override
public Object getControlObject() {
Address hAddress = new Address();
hAddress.city = HOME_CITY;
@@ -176,6 +178,7 @@
return emp;
}
+ @Override
public Object getWriteControlObject(){
if(writeCtrlObject == null){
Employee emp = (Employee)getControlObject();
@@ -189,16 +192,19 @@
return writeCtrlObject;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Accessor method was not called as expected", ((Employee)testObject).wasSetCalled);
assertTrue("Set was not called for absent node as expected", ((Employee)testObject).isADeptSet);
}
+ @Override
public void testRoundTrip() throws Exception{
//doesn't apply since read and write only mappings are present
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", writeCtrlObject.wasGetCalled);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/compositecollection/CompositeCollecitonMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/compositecollection/CompositeCollecitonMappingTestCases.java
index 3145b44..64c9b6c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/compositecollection/CompositeCollecitonMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/compositecollection/CompositeCollecitonMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -75,6 +75,7 @@
setWriteControlJSON(JSON_WRITE_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/compositecollection/employee-oxm.xml");
@@ -90,6 +91,7 @@
* Create the control Employee object for reading.
*
*/
+ @Override
public Object getControlObject() {
// setup Addresses
Address hAddress = new Address();
@@ -136,6 +138,7 @@
* For null policy test of ABSENT_NODE we will add some null addresses.
*
*/
+ @Override
public Object getWriteControlObject() {
if(writeCtrlObject == null){
Employee emp = (Employee)getReadControlObject();
@@ -158,15 +161,18 @@
return writeCtrlObject;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Accessor method was not called as expected", ((Employee)testObject).wasSetCalled);
}
+ @Override
public void testRoundTrip() throws Exception{
//doesn't apply since read and write only mappings are present
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", writeCtrlObject.wasGetCalled);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTeamTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTeamTestCases.java
index 7234e70..d64ad6f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTeamTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTeamTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setClasses(new Class[]{Team.class});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/team-oxm.xml");
@@ -62,6 +63,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
protected Object getControlObject() {
Team team = new Team();
team.address = "theAddress";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTestCases.java
index d57c59e..7c77e83 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,6 +71,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
ctrlEmp.firstName = FNAME;
@@ -92,6 +93,7 @@
return ctrlEmp;
}
+ @Override
public Object getWriteControlObject() {
if(ctrlEmp == null){
ctrlEmp = new Employee();
@@ -112,6 +114,7 @@
return ctrlEmp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/eclipselink-oxm.xml");
@@ -134,6 +137,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception{
super.xmlToObjectTest(testObject);
Employee empObj=(Employee)testObject;
@@ -141,15 +145,18 @@
assertTrue("Set was not called for absent node as expected", empObj.isAStringSet);
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception{
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", ctrlEmp.wasGetCalled);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
+ @Override
public void testObjectToContentHandler() throws Exception {
//See Bug 355143
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingVehicleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingVehicleTestCases.java
index 30fffab..8c828b2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingVehicleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingVehicleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setClasses(new Class[]{Car.class, Truck.class});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/vehicles-oxm.xml");
@@ -60,6 +61,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
protected Object getControlObject() {
Car car = new Car();
car.horsepower = "123";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingXmlValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingXmlValueTestCases.java
index 3f733e9..c256d3c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingXmlValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/DirectMappingXmlValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setClasses(new Class[]{Price.class});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/direct/eclipselink-oxm-xml-value.xml");
@@ -64,6 +65,7 @@
assertTrue("Instance doc validation (price.xml) failed unxepectedly: " + result, result == null);
}
+ @Override
public Object getWriteControlObject() {
Price ctrlPrice = new Price();
ctrlPrice.currency = CURRENCY;
@@ -71,12 +73,14 @@
return ctrlPrice;
}
+ @Override
protected Object getControlObject() {
Price ctrlPrice = new Price();
ctrlPrice.currency = CURRENCY;
return ctrlPrice;
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/directcollection/DirectCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/directcollection/DirectCollectionMappingTestCases.java
index b84793f..dfacbf2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/directcollection/DirectCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/directcollection/DirectCollectionMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,6 +70,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
List<String> prjIds = new ArrayList<String>();
prjIds.add(PRJ_ID1);
@@ -98,12 +99,14 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getJSONReadControlObject() {
Employee emp = (Employee) getWriteControlObject();
emp.privateData = null;
return emp;
}
+ @Override
public Object getWriteControlObject() {
if(writeCtrlObject == null){
writeCtrlObject = (Employee)getControlObject();
@@ -121,6 +124,7 @@
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/directcollection/eclipselink-oxm.xml");
@@ -132,15 +136,18 @@
return properties;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Accessor method was not called as expected", ((Employee)testObject).wasSetCalled);
}
+ @Override
public void testRoundTrip() throws Exception{
//doesn't apply since read and write only mappings are present
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", writeCtrlObject.wasGetCalled);
@@ -177,6 +184,7 @@
assertTrue("Instance doc validation (write-employee) failed unxepectedly: " + result, result == null);
}
+ @Override
public void testObjectToContentHandler() throws Exception {
//See Bug 355143
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/DateAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/DateAdapter.java
index d688c63..5665985 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/DateAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/DateAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public final class DateAdapter extends XmlAdapter<CustomDateType, Calendar> {
public DateAdapter() {}
+ @Override
public CustomDateType marshal(Calendar arg0) throws Exception {
CustomDateType cType = new CustomDateType();
Calendar newCal = (Calendar) arg0.clone();
@@ -31,6 +32,7 @@
return cType;
}
+ @Override
public Calendar unmarshal(CustomDateType arg0) throws Exception {
return new GregorianCalendar(arg0.year, arg0.month, arg0.day);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/InstrmtAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/InstrmtAdapter.java
index 9bb6710..af0e43a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/InstrmtAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/InstrmtAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,10 +19,12 @@
public final class InstrmtAdapter extends XmlAdapter<String, String> {
public InstrmtAdapter() {}
+ @Override
public String marshal(String arg0) throws Exception {
return "$CAD";
}
+ @Override
public String unmarshal(String arg0) throws Exception {
return "CAD";
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/LegAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/LegAdapter.java
index 8774ca2..80ef6ca 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/LegAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/LegAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,10 +19,12 @@
public final class LegAdapter extends XmlAdapter<String, String> {
public LegAdapter() {}
+ @Override
public String marshal(String arg0) throws Exception {
return "CAD$";
}
+ @Override
public String unmarshal(String arg0) throws Exception {
return null;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/MultipleMappingPerFieldTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/MultipleMappingPerFieldTestCases.java
index ac78e36..725ec17 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/MultipleMappingPerFieldTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/MultipleMappingPerFieldTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,6 +63,7 @@
/**
* Create the control Object.
*/
+ @Override
public Object getControlObject() {
CustomQuoteRequest ctrlObj = new CustomQuoteRequest();
ctrlObj.requestId = "100";
@@ -71,6 +72,7 @@
return ctrlObj;
}
+ @Override
public Map getProperties() {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/multiple/oxm.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingReadOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingReadOnlyTestCases.java
index 4705d86..4ebd7e5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingReadOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingReadOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
/**
* Create the control Root.
*/
+ @Override
public Object getControlObject() {
Root root = new Root();
List<Employee> emps = new ArrayList<Employee>();
@@ -102,10 +103,12 @@
assertTrue("Instance doc validation (root-marshal.xml) failed unxepectedly: " + result2, result2 == null);
}
+ @Override
public void testRoundTrip() throws Exception{
//doesn't apply since read and write only mappings are present
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/read-only-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingTestCases.java
index 281f71a..564ee87 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
/**
* Create the control Root.
*/
+ @Override
public Object getControlObject() {
if(ctrlObject ==null){
Root root = new Root();
@@ -91,20 +92,24 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Accessor method was not called as expected", ((Root)testObject).employees.get(0).wasSetCalled);
}
+ @Override
public void testRoundTrip() throws Exception{
//doesn't apply since read and write only mappings are present
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Accessor method was not called as expected", ctrlObject.employees.get(0).wasGetCalled);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/root-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingWriteOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingWriteOnlyTestCases.java
index 3faf038..a1e37b8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingWriteOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/ObjectReferenceMappingWriteOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
/**
* Create the control Root.
*/
+ @Override
public Object getWriteControlObject() {
Root root = new Root();
List<Employee> emps = new ArrayList<Employee>();
@@ -74,6 +75,7 @@
return root;
}
+ @Override
public Object getControlObject() {
Root root = new Root();
List<Employee> emps = new ArrayList<Employee>();
@@ -118,10 +120,12 @@
assertTrue("Instance doc validation (root.xml) failed unxepectedly: " + result, result == null);
}
+ @Override
public void testRoundTrip() throws Exception{
//doesn't apply since read and write only mappings are present
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/objectreference/write-only-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmlinversereference/XmlInverseReferenceMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmlinversereference/XmlInverseReferenceMappingTestCases.java
index f6749a7..3723ade 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmlinversereference/XmlInverseReferenceMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmlinversereference/XmlInverseReferenceMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
setClasses(new Class[]{Root.class});
}
+ @Override
protected Root getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
@@ -96,6 +97,7 @@
return root;
}
+ @Override
public Root getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
ArrayList rootPhones = new ArrayList();
@@ -146,6 +148,7 @@
return root;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmlinversereference/root-oxm.xml");
@@ -170,6 +173,6 @@
DatabaseMapping mapping = xDesc.getMappingForAttributeName("emp");
assertNotNull("No mapping exists on Address for attribute [emp].", mapping);
assertTrue("Expected an XMLInverseReferenceMapping for attribute [emp], but was [" + mapping.toString() +"].", mapping instanceof XMLInverseReferenceMapping);
- assertTrue("Expected container class [java.util.LinkedList] but was ["+((XMLInverseReferenceMapping) mapping).getContainerPolicy().getContainerClassName()+"]", ((XMLInverseReferenceMapping) mapping).getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
+ assertTrue("Expected container class [java.util.LinkedList] but was ["+ mapping.getContainerPolicy().getContainerClassName()+"]", mapping.getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/EndTimeTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/EndTimeTransformer.java
index f53b811..174c91d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/EndTimeTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/EndTimeTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,8 +19,10 @@
import org.eclipse.persistence.sessions.Session;
public class EndTimeTransformer implements FieldTransformer {
+ @Override
public void initialize(AbstractTransformationMapping mapping) {}
+ @Override
public String buildFieldValue(Object instance, String fieldName, Session session) {
Employee emp = (Employee) instance;
return emp.getEndTime();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/JAXBContextTransformationMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/JAXBContextTransformationMappingTestCases.java
index 4c37ad2..f567e43 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/JAXBContextTransformationMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/JAXBContextTransformationMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,7 +56,7 @@
properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
try {
- JAXBContext jaxbContext = (JAXBContext) JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
+ JAXBContext jaxbContext = JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
} catch (JAXBException e) {
return;
}
@@ -78,7 +78,7 @@
properties.put(JAXBContextFactory.ECLIPSELINK_OXM_XML_KEY, metadataSourceMap);
try {
- JAXBContext jaxbContext = (JAXBContext) JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
+ JAXBContext jaxbContext = JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
} catch (JAXBException e) {
return;
@@ -104,7 +104,7 @@
int exceptionCount = 0;
try {
- JAXBContext jaxbContext = (JAXBContext) JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
+ JAXBContext jaxbContext = JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
} catch (JAXBException e) {
exceptionCount++;
@@ -141,7 +141,7 @@
int exceptionCount = 0;
// test exception from MappingsGenerator
try {
- JAXBContext jaxbContext = (JAXBContext) JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
+ JAXBContext jaxbContext = JAXBContextFactory.createContext(new Class[]{Employee.class}, properties, Thread.currentThread().getContextClassLoader());
} catch (JAXBException e) {
exceptionCount++;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/MethodSetOnTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/MethodSetOnTypeTestCases.java
index 89e280b..9936e4f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/MethodSetOnTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/MethodSetOnTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public Employee getControlObject() {
Employee emp = new Employee();
emp.setName(EMP_NAME);
@@ -49,6 +50,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/method-att-xformer.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/NormalHoursAttributeTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/NormalHoursAttributeTransformer.java
index 7ed12e1..070759f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/NormalHoursAttributeTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/NormalHoursAttributeTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,8 +20,10 @@
import org.eclipse.persistence.sessions.Session;
public class NormalHoursAttributeTransformer implements AttributeTransformer {
+ @Override
public void initialize(AbstractTransformationMapping mapping) {}
+ @Override
public Object buildAttributeValue(Record record, Object instance, Session session) {
String[] hours = new String[2];
hours[0] = (String) record.get("normal-hours/start-time/text()");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/StartTimeTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/StartTimeTransformer.java
index 3778ab8..42b7e6f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/StartTimeTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/StartTimeTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,8 +19,10 @@
import org.eclipse.persistence.sessions.Session;
public class StartTimeTransformer implements FieldTransformer {
+ @Override
public void initialize(AbstractTransformationMapping mapping) {}
+ @Override
public String buildFieldValue(Object instance, String fieldName, Session session) {
Employee emp = (Employee) instance;
return emp.getStartTime();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/XmlTransformationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/XmlTransformationTestCases.java
index d324774..e336d02 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/XmlTransformationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/XmlTransformationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public Employee getControlObject() {
Employee emp = new Employee();
emp.setName(EMP_NAME);
@@ -55,6 +56,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/mappings/xmltransformation/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsFourFilesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsFourFilesTestCases.java
index d56cf57..3f99350 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsFourFilesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsFourFilesTestCases.java
@@ -41,6 +41,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -58,6 +59,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.age = 35;
@@ -85,6 +87,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
@@ -159,7 +162,7 @@
// verify values
assertTrue("Expected property value [" + PROPVAL_1 + "] for key [" + PROPKEY_1 + "] but was [" + props.get(PROPKEY_1) + "]", PROPVAL_1.equals(props.get(PROPKEY_1)));
assertTrue("Expected property value [" + PROPVAL_2 + "] for key [" + PROPKEY_2 + "] but was [" + props.get(PROPKEY_2) + "]", PROPVAL_2.equals(props.get(PROPKEY_2)));
- assertTrue("Expected property value [" + PROPVAL_3 + "] for key [" + PROPKEY_3 + "] but was [" + props.get(PROPKEY_3) + "]", PROPVAL_3 == (Boolean) props.get(PROPKEY_3));
+ assertTrue("Expected property value [" + PROPVAL_3 + "] for key [" + PROPKEY_3 + "] but was [" + props.get(PROPKEY_3) + "]", PROPVAL_3 == props.get(PROPKEY_3));
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsSimpleTestCases.java
index dab3e7b..46eb3d5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/multiplebindings/MultipleBindingsSimpleTestCases.java
@@ -40,6 +40,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -57,6 +58,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.age = 35;
@@ -126,6 +128,7 @@
return props;
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/namespace/NamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/namespace/NamespaceTestCases.java
index b977a8d..396971f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/namespace/NamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/namespace/NamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
super(name);
}
+ @Override
public String getName() {
return "ExternalizedMetadata - Namespace: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/superclassoverride/SpecialMap.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/superclassoverride/SpecialMap.java
index 9aa6ba6..59c46ed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/superclassoverride/SpecialMap.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/superclassoverride/SpecialMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,50 +36,62 @@
this.map = map;
}
+ @Override
public int size() {
return map.size();
}
+ @Override
public boolean isEmpty() {
return map.isEmpty();
}
+ @Override
public boolean containsKey(Object key) {
return map.containsKey(key);
}
+ @Override
public boolean containsValue(Object value) {
return map.containsValue(value);
}
+ @Override
public T2 get(Object key) {
return map.get(key);
}
+ @Override
public T2 put(T1 key, T2 value) {
return map.put(key, value);
}
+ @Override
public T2 remove(Object key) {
return map.remove(key);
}
+ @Override
public void putAll(Map<? extends T1, ? extends T2> m) {
map.putAll(m);
}
+ @Override
public void clear() {
map.clear();
}
+ @Override
public Set<T1> keySet() {
return map.keySet();
}
+ @Override
public Collection<T2> values() {
return map.values();
}
+ @Override
public Set<java.util.Map.Entry<T1, T2>> entrySet() {
return map.entrySet();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/XmlAccessorOrderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/XmlAccessorOrderTestCases.java
index 5c30c02..329aa32 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/XmlAccessorOrderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/XmlAccessorOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/eclipselink-oxm.xml");
@@ -94,6 +95,7 @@
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.a = "A-String";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/XMLAccessorOrderPackageInfoTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/XMLAccessorOrderPackageInfoTestCases.java
index f7e09c1..a9c683b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/XMLAccessorOrderPackageInfoTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/XMLAccessorOrderPackageInfoTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.a = "A-String";
@@ -54,6 +55,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/classoverride/XMLAccessorOrderClassOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/classoverride/XMLAccessorOrderClassOverrideTestCases.java
index f1cbf6e..1f6c22b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/classoverride/XMLAccessorOrderClassOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/classoverride/XMLAccessorOrderClassOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.a = "A-String";
@@ -53,6 +54,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/classoverride/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/javaclassoverride/XMLAccessorOrderJavaClassOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/javaclassoverride/XMLAccessorOrderJavaClassOverrideTestCases.java
index 4dac82c..0e97161 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/javaclassoverride/XMLAccessorOrderJavaClassOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/javaclassoverride/XMLAccessorOrderJavaClassOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.a = "A-String";
@@ -52,6 +53,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessororder/packagelevel/javaclassoverride/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/XmlAccessorTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/XmlAccessorTypeTestCases.java
index b07625c..73ad4cb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/XmlAccessorTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/XmlAccessorTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,11 +47,13 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/field/XmlAccessorTypeFieldTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/field/XmlAccessorTypeFieldTestCases.java
index ce25a7d..85ac0ae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/field/XmlAccessorTypeFieldTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/field/XmlAccessorTypeFieldTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
@@ -56,6 +57,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/field/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/inheritance/XmlAccessorTypeInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/inheritance/XmlAccessorTypeInheritanceTestCases.java
index a4e64c1..9c30ebe 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/inheritance/XmlAccessorTypeInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/inheritance/XmlAccessorTypeInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,14 +43,17 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
return new B();
}
+ @Override
public Object getWriteControlObject() {
return new B();
}
+ @Override
public Map getProperties() {
InputStream inputStream = ClassLoader.getSystemResourceAsStream(BINDINGS);
@@ -62,6 +65,7 @@
return properties;
}
+ @Override
public void testRoundTrip() throws Exception {
// Not applicable since id is a write only mapping
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneTestCases.java
index 04bb62c..44b3c94 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(0);
emp.firstName = "firstName";
@@ -54,12 +55,14 @@
}
+ @Override
public Object getWriteControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
emp.lastName = "lastName";
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/eclipselink-oxm.xml");
@@ -89,6 +92,7 @@
controlSchemas.add(is);
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip() throws Exception{
// Not applicable since id is a write only mapping
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneWithPropOrderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneWithPropOrderTestCases.java
index 5cfa8d1..d6053c0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneWithPropOrderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/XmlAccessorTypeNoneWithPropOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(0);
emp.firstName = "firstName";
@@ -54,12 +55,14 @@
}
+ @Override
public Object getWriteControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
emp.lastName = "lastName";
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/none/eclipselink-proporder-oxm.xml");
@@ -71,6 +74,7 @@
return properties;
}
+ @Override
public void testRoundTrip() throws Exception{
// Not applicable since id is a write only mapping
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/XmlAccessorTypePackageTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/XmlAccessorTypePackageTestCases.java
index e8b9f1f..dc7b8b7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/XmlAccessorTypePackageTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/XmlAccessorTypePackageTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
@@ -57,6 +58,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/classoverride/XmlAccessorTypePackageClassOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/classoverride/XmlAccessorTypePackageClassOverrideTestCases.java
index a7fb9d3..11d8cb9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/classoverride/XmlAccessorTypePackageClassOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/classoverride/XmlAccessorTypePackageClassOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
@@ -57,6 +58,7 @@
return emp;
}
+ @Override
public Object getWriteControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
@@ -64,6 +66,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/classoverride/eclipselink-oxm.xml");
@@ -93,6 +96,7 @@
controlSchemas.add(is);
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip() throws Exception{
//Not applicable since id is a write only mapping
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/javaclassoverride/XmlAccessorTypePackageJavaClassOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/javaclassoverride/XmlAccessorTypePackageJavaClassOverrideTestCases.java
index a2c05c2..6b3b323 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/javaclassoverride/XmlAccessorTypePackageJavaClassOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/javaclassoverride/XmlAccessorTypePackageJavaClassOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
@@ -58,6 +59,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/javaclassoverride/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/nooverride/XmlAccessorTypePackageNoOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/nooverride/XmlAccessorTypePackageNoOverrideTestCases.java
index ab7bd9b..0017685 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/nooverride/XmlAccessorTypePackageNoOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/packagelevel/nooverride/XmlAccessorTypePackageNoOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,11 +44,13 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(0);
return emp;
}
+ @Override
public Object getWriteControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/property/XmlAccessorTypePropertyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/property/XmlAccessorTypePropertyTestCases.java
index d16282f..8ac82e5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/property/XmlAccessorTypePropertyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/property/XmlAccessorTypePropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,11 +49,13 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(66);
return emp;
}
+ @Override
public Object getWriteControlObject() {
Employee emp = new Employee(66);
emp.firstName = "firstName";
@@ -61,6 +63,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/property/eclipselink-oxm.xml");
@@ -90,6 +93,7 @@
controlSchemas.add(is);
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip() throws Exception{
//Not applicable since id is a write only mapping
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/FieldAccessTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/FieldAccessTestCases.java
index 2af1876..8f42357 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/FieldAccessTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/FieldAccessTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Customer cust = new Customer();
cust.property = "control value";
@@ -42,6 +43,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/field-access-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/PropertyAccessTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/PropertyAccessTestCases.java
index 666d578..13c61c6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/PropertyAccessTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/PropertyAccessTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Customer cust = new Customer();
cust.property = "control value";
@@ -42,6 +43,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/property-access-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/UnspecifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/UnspecifiedTestCases.java
index 068df6d..1f604c2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/UnspecifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/UnspecifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,10 +36,12 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
return new Customer();
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/propertylevel/unspecified-access-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/publicmember/XmlAccessorTypePublicMemberTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/publicmember/XmlAccessorTypePublicMemberTestCases.java
index 2ce9d93..89b10c4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/publicmember/XmlAccessorTypePublicMemberTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/publicmember/XmlAccessorTypePublicMemberTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
@@ -56,6 +57,7 @@
return emp;
}
+ @Override
public Object getWriteControlObject() {
Employee emp = new Employee(666);
emp.firstName = "firstName";
@@ -63,6 +65,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlaccessortype/publicmember/eclipselink-oxm.xml");
@@ -92,6 +95,7 @@
controlSchemas.add(is);
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip() throws Exception{
//Not applicable since id is a write only mapping
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/DateAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/DateAdapter.java
index ebf821e..12ba561 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/DateAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/DateAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public final class DateAdapter extends XmlAdapter<CustomDateType, Calendar> {
public DateAdapter() {}
+ @Override
public CustomDateType marshal(Calendar arg0) throws Exception {
CustomDateType cType = new CustomDateType();
cType.day = arg0.get(Calendar.DATE);
@@ -29,6 +30,7 @@
return cType;
}
+ @Override
public Calendar unmarshal(CustomDateType arg0) throws Exception {
return new GregorianCalendar(arg0.year, arg0.month, arg0.day);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/IdAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/IdAdapter.java
index 6f7972e..4499bf2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/IdAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/IdAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,10 +19,12 @@
public final class IdAdapter extends XmlAdapter<String, Integer> {
public IdAdapter() {}
+ @Override
public String marshal(Integer arg0) throws Exception {
return String.valueOf(arg0.intValue());
}
+ @Override
public Integer unmarshal(String arg0) throws Exception {
return Integer.valueOf(arg0);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/AdapterOnClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/AdapterOnClassTestCases.java
index 69402f7..fe6922e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/AdapterOnClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/AdapterOnClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.classlevel.MyClass sc = new org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.classlevel.MyClass();
MyCalendar mCal = new MyCalendar();
@@ -56,6 +57,7 @@
return sc;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/MyCalendarAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/MyCalendarAdapter.java
index 05b1733..cb40756 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/MyCalendarAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/classlevel/MyCalendarAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public final class MyCalendarAdapter extends XmlAdapter<Calendar, MyCalendar> {
public MyCalendarAdapter() {}
+ @Override
public MyCalendar unmarshal(Calendar arg0) throws Exception {
MyCalendar cType = new MyCalendar();
cType.day = arg0.get(Calendar.DATE);
@@ -29,6 +30,7 @@
return cType;
}
+ @Override
public Calendar marshal(MyCalendar arg0) throws Exception {
return new GregorianCalendar(arg0.year, arg0.month, arg0.day);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/AdapterHexBinaryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/AdapterHexBinaryTestCases.java
index 392db54..25cb0bc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/AdapterHexBinaryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/AdapterHexBinaryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
byte[] bytes = new byte[] {30,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4};
Customer customer = new Customer();
@@ -47,6 +48,7 @@
return customer;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/hexbinary/hexbinary-oxm.xml");
HashMap<String, Source> properties = new HashMap<String, Source>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/MyAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/MyAdapter.java
index 79e8385..ba5b908 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/MyAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/MyAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
public MyAdapter() {}
+ @Override
public String unmarshal(Object arg0) throws Exception {
String id = EMPTY_STR;
if (arg0 instanceof Bar) {
@@ -32,6 +33,7 @@
return id;
}
+ @Override
public Object marshal(String arg0) throws Exception {
Bar bar = new Bar();
bar.id = arg0;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/MyListAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/MyListAdapter.java
index d3c1ae6..888743a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/MyListAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/MyListAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
public MyListAdapter() {}
+ @Override
public List<String> unmarshal(Object arg0) throws Exception {
List<String> list = new ArrayList<String>();
if (arg0 instanceof Bar) {
@@ -41,6 +42,7 @@
return list;
}
+ @Override
public Object marshal(List<String> arg0) throws Exception {
Bar bar = new Bar();
String id = EMPTY_STR;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/XmlAdapterListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/XmlAdapterListTestCases.java
index d1e1444..e5924df 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/XmlAdapterListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/XmlAdapterListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
FooWithBar fooWithBar = new FooWithBar();
List<String> itemlist = new ArrayList<String>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/XmlAdapterListsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/XmlAdapterListsTestCases.java
index 1f77074..007acae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/XmlAdapterListsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/list/XmlAdapterListsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
FooWithBars foo = new FooWithBars();
List<String> itemlist = new ArrayList<String>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/AdapterOnPackageTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/AdapterOnPackageTestCases.java
index a9a88f1..f89693b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/AdapterOnPackageTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/AdapterOnPackageTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.packagelevel.MyClass sc = new org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.packagelevel.MyClass();
sc.cal = CALENDAR;
@@ -54,6 +55,7 @@
return sc;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/eclipselink-oxm.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/MyClass.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/MyClass.java
index d1fa055..1f56161 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/MyClass.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/MyClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,6 @@
if (sc.id != this.id) {
return false;
}
- return (this.cal.YEAR == sc.cal.YEAR && this.cal.MONTH == sc.cal.MONTH && this.cal.DATE == sc.cal.DATE);
+ return (Calendar.YEAR == Calendar.YEAR && Calendar.MONTH == Calendar.MONTH && Calendar.DATE == Calendar.DATE);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/unspecified/XmlAdapterUnspecifiedClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/unspecified/XmlAdapterUnspecifiedClassTestCases.java
index aa4e4a5..3f8b3ec 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/unspecified/XmlAdapterUnspecifiedClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/packagelevel/unspecified/XmlAdapterUnspecifiedClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
public XmlAdapterUnspecifiedClassTestCases(String name) throws Exception {
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -46,6 +47,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
MyCalendar myCalendar = new MyCalendar();
myCalendar.day = 1;
@@ -65,6 +67,7 @@
return emp;
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/AdapterOnPropertyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/AdapterOnPropertyTestCases.java
index 9b2d742..8bfe016 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/AdapterOnPropertyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/AdapterOnPropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.property.MyClass sc = new org.eclipse.persistence.testing.jaxb.externalizedmetadata.xmladapter.property.MyClass();
sc.cal = CALENDAR;
@@ -53,6 +54,7 @@
return sc;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/eclipselink-oxm.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/MyClass.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/MyClass.java
index f391c1b..a8f9428 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/MyClass.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/property/MyClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,6 @@
return false;
}
//return (this.cal.YEAR == sc.cal.YEAR && this.cal.MONTH == sc.cal.MONTH && this.cal.DATE == sc.cal.DATE);
- return (this.cal.get(cal.YEAR) == sc.cal.get(cal.YEAR) && this.cal.get(cal.MONTH) == sc.cal.get(cal.MONTH) && cal.get(cal.DATE) == sc.cal.get(cal.DATE));
+ return (this.cal.get(Calendar.YEAR) == sc.cal.get(Calendar.YEAR) && this.cal.get(Calendar.MONTH) == sc.cal.get(Calendar.MONTH) && cal.get(Calendar.DATE) == sc.cal.get(Calendar.DATE));
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/ClassLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/ClassLevelTestCases.java
index 80de806..f2d5bd3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/ClassLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/ClassLevelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
import org.w3c.dom.Document;
public class ClassLevelTestCases extends JAXBWithJSONTestCases {
+ @Override
protected Map getProperties() {
InputStream inStream1 = getClass().getClassLoader().getResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/package1/no-adapter.xml");
@@ -60,6 +61,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/container_class.json");
}
+ @Override
public Object getControlObject() {
Container container = new Container();
container.setContainerProperty(Unmappable.getInstance("aaa"));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PackageLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PackageLevelTestCases.java
index f16b783..2982e91 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PackageLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PackageLevelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
import junit.framework.TestCase;
public class PackageLevelTestCases extends JAXBWithJSONTestCases {
+ @Override
protected Map getProperties() {
InputStream inStream = getClass().getClassLoader().getResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/package1/package-adapter.xml");
@@ -60,6 +61,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/container.json");
}
+ @Override
public Object getControlObject() {
Container container = new Container();
container.setContainerProperty(Unmappable.getInstance("aaa"));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PropertyLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PropertyLevelTestCases.java
index e008d67..d0a325c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PropertyLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/PropertyLevelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
import org.w3c.dom.Document;
public class PropertyLevelTestCases extends JAXBWithJSONTestCases {
+ @Override
protected Map getProperties() {
InputStream inStream = getClass().getClassLoader().getResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/package1/property-adapter.xml");
@@ -56,6 +57,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/unmappable/container.json");
}
+ @Override
public Object getControlObject() {
Container container = new Container();
container.setContainerProperty(Unmappable.getInstance("aaa"));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefTestCases.java
index 67209b5..026b82a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,12 +38,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Foo foo = new Foo();
foo.item = BAR_ITEM;
return foo;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/foo-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefsTestCases.java
index 88d6e45..55313ed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/AdapterWithElementRefsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Foo foo = new Foo();
@@ -47,6 +48,7 @@
return foo;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/foobar-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/BarAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/BarAdapter.java
index 366e468..ffcc6ea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/BarAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmladapter/xmlelementref/BarAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
public final class BarAdapter extends XmlAdapter<Object, String> {
public BarAdapter() {}
+ @Override
public String unmarshal(Object arg0) throws Exception {
if (arg0 instanceof Bar) {
return ((Bar)arg0).id;
@@ -26,6 +27,7 @@
return Integer.toString(((FooBar)arg0).id);
}
+ @Override
public Object marshal(String arg0) throws Exception {
if (arg0.equals("66")) {
Bar bar = new Bar();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyattribute/XmlAnyAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyattribute/XmlAnyAttributeTestCases.java
index de7d3e1..fcd2106 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyattribute/XmlAnyAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyattribute/XmlAnyAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
Map<String, String> namespaces = new HashMap<String, String>();
@@ -72,6 +73,7 @@
return jsonMarhsaller;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyattribute/eclipselink-oxm.xml");
@@ -95,9 +97,10 @@
DatabaseMapping mapping = xDesc.getMappingForAttributeName("stuff");
assertNotNull("No mapping exists on Employee for attribute [stuff].", mapping);
assertTrue("Expected an XMLAnyAttributeMapping for attribute [stuff], but was [" + mapping.toString() +"].", mapping instanceof XMLAnyAttributeMapping);
- assertTrue("Expected map class [java.util.LinkedHashMap] but was ["+((XMLAnyAttributeMapping) mapping).getContainerPolicy().getContainerClassName()+"]", ((XMLAnyAttributeMapping) mapping).getContainerPolicy().getContainerClassName().equals("java.util.LinkedHashMap"));
+ assertTrue("Expected map class [java.util.LinkedHashMap] but was ["+ mapping.getContainerPolicy().getContainerClassName()+"]", mapping.getContainerPolicy().getContainerClassName().equals("java.util.LinkedHashMap"));
}
+ @Override
protected Object getControlObject() {
Employee ctrlEmp = new Employee();
ctrlEmp.a = 1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyDomAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyDomAdapter.java
index f9967e5..4b55fa1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyDomAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyDomAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
public MyDomAdapter() {}
+ @Override
public Node marshal(Dom arg0) throws Exception {
Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
Element elt = doc.createElement(STUFF_STR);
@@ -34,6 +35,7 @@
return elt;
}
+ @Override
public Dom unmarshal(Node arg0) throws Exception {
Dom stuff = new Dom();
Node elt = arg0.getFirstChild();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyDomHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyDomHandler.java
index 652879b..a2092a6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyDomHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyDomHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,10 +35,12 @@
theHandler = new W3CDomHandler();
}
+ @Override
public Result createUnmarshaller(ValidationEventHandler errorHandler) {
return theHandler.createUnmarshaller(errorHandler);
}
+ @Override
public Object getElement(Result rt) {
if (rt instanceof DOMResult) {
return theHandler.getElement((DOMResult) rt);
@@ -46,6 +48,7 @@
return null;
}
+ @Override
public Source marshal(Object n, ValidationEventHandler errorHandler) {
if (n instanceof Element) {
return theHandler.marshal((Element) n, errorHandler);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyInvalidDomHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyInvalidDomHandler.java
index d990efb..dacf812 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyInvalidDomHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/MyInvalidDomHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,14 +35,17 @@
theHandler = new W3CDomHandler();
}
+ @Override
public Result createUnmarshaller(ValidationEventHandler errorHandler) {
return theHandler.createUnmarshaller(errorHandler);
}
+ @Override
public Object getElement(Result rt) {
return "Giggity";
}
+ @Override
public Source marshal(Object n, ValidationEventHandler errorHandler) {
if (n instanceof Element) {
return theHandler.marshal((Element) n, errorHandler);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterListTestCases.java
index b91896e..5660853 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/eclipselink-oxm-xml-adapter-list.xml");
@@ -48,6 +49,7 @@
return properties;
}
+ @Override
protected Object getControlObject() {
EmployeeWithList ctrlEmpWithList = new EmployeeWithList();
ctrlEmpWithList.a = 1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterTestCases.java
index 54a5d55..883e624 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/eclipselink-oxm-xml-adapter.xml");
@@ -47,6 +48,7 @@
return properties;
}
+ @Override
protected Object getControlObject() {
Employee ctrlEmp = new Employee();
ctrlEmp.a = 1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXFalseTestCases.java
index 27e3147..59d3d08 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/eclipselink-oxm.xml");
@@ -53,6 +54,7 @@
return properties;
}
+ @Override
public Object getControlObject(){
Element empElt = null;
try {
@@ -74,6 +76,7 @@
return ctrlEmp;
}
+ @Override
public Object getReadControlObject(){
Element empElt = null;
try {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXTrueTestCases.java
index e805d21..38a9770 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseLAXTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/eclipselink-oxm-lax.xml");
@@ -50,6 +51,7 @@
return properties;
}
+ @Override
public Object getControlObject(){
Element empElt = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseTestCases.java
index dc630ca..14355f8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementBaseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/eclipselink-oxm.xml");
@@ -53,6 +54,7 @@
return properties;
}
+ @Override
protected Object getControlObject() {
Employee ctrlEmp = new Employee();
ctrlEmp.a = 1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementDomHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementDomHandlerTestCases.java
index 3a5af0e..1eece89 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementDomHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementDomHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/eclipselink-oxm-dom-handler.xml");
@@ -51,6 +52,7 @@
return properties;
}
+ @Override
protected Object getControlObject() {
Employee ctrlEmp = new Employee();
ctrlEmp.a = 1;
@@ -67,6 +69,7 @@
return ctrlEmp;
}
+ @Override
public Object getReadControlObject() {
Employee ctrlEmp = new Employee();
ctrlEmp.a = 1;
@@ -76,6 +79,7 @@
return ctrlEmp;
}
+ @Override
public void testRoundTrip(){
//doesn't apply
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementListTestCases.java
index 8cfa5de..b25767d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/XmlAnyElementListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/eclipselink-oxm-xml-list.xml");
@@ -58,6 +59,7 @@
return properties;
}
+ @Override
public Object getControlObject(){
EmployeeWithList ctrlEmpWithList = new EmployeeWithList();
ctrlEmpWithList.a = 1;
@@ -85,7 +87,7 @@
DatabaseMapping mapping = xDesc.getMappingForAttributeName("stuff");
assertNotNull("No mapping exists on EmployeeWithList for attribute [stuff].", mapping);
assertTrue("Expected an XMLAnyCollectionMapping for attribute [stuff], but was [" + mapping.toString() +"].", mapping instanceof XMLAnyCollectionMapping);
- assertTrue("Expected container class [java.util.LinkedList] but was ["+((XMLAnyCollectionMapping) mapping).getContainerPolicy().getContainerClassName()+"]", ((XMLAnyCollectionMapping) mapping).getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
+ assertTrue("Expected container class [java.util.LinkedList] but was ["+ mapping.getContainerPolicy().getContainerClassName()+"]", mapping.getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
}
public void testSchemaGen() throws Exception{
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/FooImplNoAnnotations.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/FooImplNoAnnotations.java
index a0f8d93..e0d1903 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/FooImplNoAnnotations.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/FooImplNoAnnotations.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,10 +22,12 @@
public class FooImplNoAnnotations implements Foo {
private List<Object> others;
+ @Override
public List<Object> getOthers() {
return others;
}
+ @Override
public void setOthers(List<Object> others) {
this.others = others;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/XmlAnyElementWithEltRefsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/XmlAnyElementWithEltRefsTestCases.java
index 06052c2..1a32aae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/XmlAnyElementWithEltRefsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/XmlAnyElementWithEltRefsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/foo-oxm.xml");
@@ -61,6 +62,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public Object getControlObject(){
FooImplNoAnnotations foo = new FooImplNoAnnotations();
Bar bar = new Bar();
@@ -77,6 +79,7 @@
return foo;
}
+ @Override
public Object getJSONReadControlObject(){
FooImplNoAnnotations foo = new FooImplNoAnnotations();
Bar bar = new Bar();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs2/XmlAnyElementWithEltRefsNonGlobalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs2/XmlAnyElementWithEltRefsNonGlobalTestCases.java
index 57de7ff..4943fcb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs2/XmlAnyElementWithEltRefsNonGlobalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs2/XmlAnyElementWithEltRefsNonGlobalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs/foo-oxm.xml");
@@ -52,6 +53,7 @@
return properties;
}
+ @Override
public Object getControlObject(){
Customer c = new Customer();
c.id = 1221;
@@ -68,6 +70,7 @@
return c;
}
+ @Override
public Object getJSONReadControlObject(){
Customer c = new Customer();
c.id = 1221;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs3/FooImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs3/FooImpl.java
index 5196901..b8a2cf8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs3/FooImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs3/FooImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
public class FooImpl implements Foo {
private List<Object> others;
+ @Override
@XmlAnyElement(lax=true)
@XmlElementRefs({
@XmlElementRef(name="a", type=JAXBElement.class),
@@ -41,6 +42,7 @@
return others;
}
+ @Override
public void setOthers(List<Object> others) {
this.others = others;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs3/XmlAnyElementWithEltRefsViaAnnotationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs3/XmlAnyElementWithEltRefsViaAnnotationTestCases.java
index 25a100f..045d724 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs3/XmlAnyElementWithEltRefsViaAnnotationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlanyelement/xmlelementrefs3/XmlAnyElementWithEltRefsViaAnnotationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public Object getControlObject(){
FooImpl foo = new FooImpl();
Bar bar = new Bar();
@@ -63,6 +64,7 @@
return foo;
}
+ @Override
public Object getJSONReadControlObject(){
FooImpl foo = new FooImpl();
Bar bar = new Bar();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/MyAttachmentMarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/MyAttachmentMarshaller.java
index 6d45f20..80a7de2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/MyAttachmentMarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/MyAttachmentMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
public static HashMap attachments = new HashMap();
public boolean returnNull = false;
+ @Override
public String addSwaRefAttachment(DataHandler data) {
if(returnNull) {
return null;
@@ -45,6 +46,7 @@
return id;
}
+ @Override
public String addMtomAttachment(byte[] bytes, int start, int offset, String mimeType, String elemtnName, String namespaceURI) {
if(returnNull) {
return null;
@@ -58,6 +60,7 @@
return id;
}
+ @Override
public String addMtomAttachment(DataHandler data, String namespaceURI, String elementName) {
if(returnNull) {
return null;
@@ -70,6 +73,7 @@
return id;
}
+ @Override
public boolean isXOPPackage() {
return true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/MyAttachmentUnmarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/MyAttachmentUnmarshaller.java
index 93de4c3..c9215c4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/MyAttachmentUnmarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattachmentref/MyAttachmentUnmarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
getAttachmentAsDataHandlerWasCalled = false;
}
+ @Override
public byte[] getAttachmentAsByteArray(String cid) {
Object obj = MyAttachmentMarshaller.attachments.get(cid);
if(obj instanceof byte[]){
@@ -45,6 +46,7 @@
}
}
+ @Override
public DataHandler getAttachmentAsDataHandler(String cid) {
this.getAttachmentAsDataHandlerWasCalled = true;
Object obj = MyAttachmentMarshaller.attachments.get(cid);
@@ -54,6 +56,7 @@
return null;
}
+ @Override
public boolean isXOPPackage() {
// force attachment usage
return true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattribute/XmlAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattribute/XmlAttributeTestCases.java
index 007c6a1..4341514 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattribute/XmlAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattribute/XmlAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlattribute/eclipselink-oxm.xml");
@@ -102,7 +103,7 @@
DatabaseMapping mapping = xDesc.getMappingForAttributeName("things");
assertNotNull("No mapping exists on Employee for attribute [things].", mapping);
assertTrue("Expected an XMLCompositeDirectCollectionMapping for attribute [things], but was [" + mapping.toString() +"].", mapping instanceof XMLCompositeDirectCollectionMapping);
- assertTrue("Expected container class [java.util.LinkedList] but was ["+((XMLCompositeDirectCollectionMapping) mapping).getContainerPolicy().getContainerClassName()+"]", ((XMLCompositeDirectCollectionMapping) mapping).getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
+ assertTrue("Expected container class [java.util.LinkedList] but was ["+ mapping.getContainerPolicy().getContainerClassName()+"]", mapping.getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
}
@Override
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/MyClassExtractor.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/MyClassExtractor.java
index 42bca62..cb7abf2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/MyClassExtractor.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/MyClassExtractor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
import org.eclipse.persistence.sessions.Session;
public class MyClassExtractor extends ClassExtractor {
+ @Override
public Class extractClassFromRow(Record databaseRow, Session session) {
return Car.class;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/MyOtherClassExtractor.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/MyOtherClassExtractor.java
index 5508824..ae4c865 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/MyOtherClassExtractor.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/MyOtherClassExtractor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
import org.eclipse.persistence.sessions.Session;
public class MyOtherClassExtractor extends ClassExtractor {
+ @Override
public Class extractClassFromRow(Record databaseRow, Session session) {
return Vehicle.class;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/XmlClassExtractorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/XmlClassExtractorTestCases.java
index 7aa761b..385cd1d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/XmlClassExtractorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/XmlClassExtractorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlclassextractor/eclipselink-oxm.xml");
@@ -77,6 +78,7 @@
/**
* Returns the control ParkingLot instance.
*/
+ @Override
public Object getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/MyEmployeeCustomizer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/MyEmployeeCustomizer.java
index 49973a3..3700bb6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/MyEmployeeCustomizer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/MyEmployeeCustomizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
*/
public class MyEmployeeCustomizer implements DescriptorCustomizer {
+ @Override
public void customize(ClassDescriptor descriptor) throws Exception {
XMLDirectMapping firstNameMapping = (XMLDirectMapping) descriptor.getMappingForAttributeName("firstName");
XMLField fnxField = (XMLField) firstNameMapping.getField();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/MyXmlEmployeeCustomizer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/MyXmlEmployeeCustomizer.java
index 0562a39..54d8bc3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/MyXmlEmployeeCustomizer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/MyXmlEmployeeCustomizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
*/
public class MyXmlEmployeeCustomizer implements DescriptorCustomizer {
+ @Override
public void customize(ClassDescriptor descriptor) throws Exception {
XMLDirectMapping firstNameMapping = (XMLDirectMapping) descriptor.getMappingForAttributeName("firstName");
XMLField fnxField = (XMLField) firstNameMapping.getField();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerTestCases.java
index 1e0c0c8..86d84e4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -112,6 +112,7 @@
return "<?xml version=\"1.0\" encoding=\"UTF-8\"?><employee><firstName>Joe</firstName><lastName>Oracle</lastName></employee>";
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.firstName = "Joe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerWithOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerWithOverrideTestCases.java
index b2cb022..3409615 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerWithOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/XmlCustomizerWithOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlcustomizer/my-eclipselink-oxm.xml");
@@ -59,6 +60,7 @@
return properties;
}
+ @Override
protected Document getControlDocument() {
String contents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><employee><my-first-name>Joe</my-first-name><my-last-name>Oracle</my-last-name></employee>";
@@ -74,6 +76,7 @@
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.firstName = "Joe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmldiscriminator/XmlDiscriminatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmldiscriminator/XmlDiscriminatorTestCases.java
index fe5d2e3..4e8af83 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmldiscriminator/XmlDiscriminatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmldiscriminator/XmlDiscriminatorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
setClasses(new Class[] { Car.class, Vehicle.class });
}
+ @Override
public Object getReadControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
@@ -62,6 +63,7 @@
return car;
}
+ @Override
public Object getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
@@ -73,6 +75,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmldiscriminator/vehicle-oxm.xml");
@@ -93,6 +96,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
public void testRoundTrip(){};
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelement/XmlElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelement/XmlElementTestCases.java
index 9b57a25..b35bc7f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelement/XmlElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelement/XmlElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
setClasses(new Class[] { Employee.class});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelement/eclipselink-oxm.xml");
@@ -179,7 +180,7 @@
DatabaseMapping mapping = xDesc.getMappingForAttributeName("myEmployees");
assertNotNull("No mapping exists on Employee for attribute [myEmployees].", mapping);
assertTrue("Expected an XMLCompositeCollectionMapping for attribute [myEmployees], but was [" + mapping.toString() +"].", mapping instanceof XMLCompositeCollectionMapping);
- assertTrue("Expected container class [java.util.LinkedList] but was ["+((XMLCompositeCollectionMapping) mapping).getContainerPolicy().getContainerClassName()+"]", ((XMLCompositeCollectionMapping) mapping).getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
+ assertTrue("Expected container class [java.util.LinkedList] but was ["+ mapping.getContainerPolicy().getContainerClassName()+"]", mapping.getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
}
@Override
@@ -208,6 +209,7 @@
"}}";
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageLevelOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageLevelOverrideTestCases.java
index e034538..c209836 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageLevelOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageLevelOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { PackageRootOverride.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageLevelTestCases.java
index 11d971a..d983bf1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageLevelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { Root.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageTypeOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageTypeOverrideTestCases.java
index c62c918..a57380c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageTypeOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillablePackageTypeOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { PackageTypeOverride.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillableTypeLevelOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillableTypeLevelOverrideTestCases.java
index ea37422..38c87b5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillableTypeLevelOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillableTypeLevelOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { TypeRootOverride.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillableTypeLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillableTypeLevelTestCases.java
index 61bbb18..791aedc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillableTypeLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementnillable/XmlElementNillableTypeLevelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { TypeRoot.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefTestCases.java
index 3656ed5..cc3cf1f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
setClasses(new Class[] { Foo.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/eclipselink-oxm.xml");
@@ -70,11 +71,13 @@
}
+ @Override
public Object getControlObject() {
Foo foo = new Foo();
return foo;
}
+ @Override
public Object getWriteControlObject() {
if(writeObject == null){
Foo foo = new Foo();
@@ -87,11 +90,13 @@
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Method accessor was not called as expected.", ((Foo) writeObject).accessedViaMethod);
}
+ @Override
public void testRoundTrip(){
//not applicable with write only mappings.
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefWithWrapperTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefWithWrapperTestCases.java
index fe40be8..7d7199f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefWithWrapperTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/XmlElementRefWithWrapperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementref/eclipselink-oxm-wrapper.xml");
@@ -60,7 +61,7 @@
DatabaseMapping mapping = xDesc.getMappingForAttributeName("items");
assertNotNull("No mapping exists on Foos for attribute [items].", mapping);
assertTrue("Expected an XMLChoiceCollectionMapping for attribute [items], but was [" + mapping.toString() +"].", mapping instanceof XMLChoiceCollectionMapping);
- assertTrue("Expected container class [java.util.LinkedList] but was ["+((XMLChoiceCollectionMapping) mapping).getContainerPolicy().getContainerClassName()+"]", ((XMLChoiceCollectionMapping) mapping).getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
+ assertTrue("Expected container class [java.util.LinkedList] but was ["+ mapping.getContainerPolicy().getContainerClassName()+"]", mapping.getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
}
public void testSchemaGen() throws Exception{
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/collectiontype/Root.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/collectiontype/Root.java
index acaaef7..1f9a620 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/collectiontype/Root.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementrefs/collectiontype/Root.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,11 +62,11 @@
int len = values.length;
this.dateOrTime = ((JAXBElement<XMLGregorianCalendar> []) new JAXBElement[len] );
for (int i = 0; (i<len); i ++) {
- this.dateOrTime[i] = ((JAXBElement<XMLGregorianCalendar> ) values[i]);
+ this.dateOrTime[i] = values[i];
}
}
public JAXBElement<XMLGregorianCalendar> setDateOrTime(int idx, JAXBElement<XMLGregorianCalendar> value) {
- return this.dateOrTime[idx] = ((JAXBElement<XMLGregorianCalendar> ) value);
+ return this.dateOrTime[idx] = value;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java
index b0202acc..45c767b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XMLElementsWithWrapperTestCases.java
@@ -38,6 +38,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties() {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/eclipselink-oxm-wrapper.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java
index 8d79eb6..3c2e340 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/XmlElementsTestCases.java
@@ -57,6 +57,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelements/eclipselink-oxm.xml");
@@ -168,6 +169,6 @@
DatabaseMapping mapping = xDesc.getMappingForAttributeName("items");
assertNotNull("No mapping exists on Foo for attribute [items].", mapping);
assertTrue("Expected an XMLChoiceCollectionMapping for attribute [items], but was [" + mapping.toString() +"].", mapping instanceof XMLChoiceCollectionMapping);
- assertTrue("Expected container class [java.util.LinkedList] but was ["+((XMLChoiceCollectionMapping) mapping).getContainerPolicy().getContainerClassName()+"]", ((XMLChoiceCollectionMapping) mapping).getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
+ assertTrue("Expected container class [java.util.LinkedList] but was ["+ mapping.getContainerPolicy().getContainerClassName()+"]", mapping.getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElemenetWrapperNilTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElemenetWrapperNilTestCases.java
index 4a7a987..66d6182 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElemenetWrapperNilTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElemenetWrapperNilTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties() {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperDefaultNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperDefaultNameTestCases.java
index 5ea3a22..6d2d8e0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperDefaultNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperDefaultNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
initXsiType();
}
+ @Override
public Map getProperties() {
InputStream inputStream = ClassLoader.getSystemResourceAsStream(OXM_RESOURCE);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperElementOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperElementOverrideTestCases.java
index e4784cf..145fea3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperElementOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperElementOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties() {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/eclipselink-oxm-xmlelement.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperTestCases.java
index 797b5d6..322bdb1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/XmlElementWrapperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties() {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlelementwrapper/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumInheritanceTestCases.java
index ddb1dce..2245be3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/eclipselink-oxm-subset.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumQualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumQualifiedTestCases.java
index 189fcc0..e8a40da 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumQualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumQualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/eclipselink-oxm-game-qualified.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumTestCases.java
index 7391455..b0237c4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/eclipselink-oxm-game.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumUnqualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumUnqualifiedTestCases.java
index dcdcb82..4abb137 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumUnqualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/XmlEnumUnqualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlenum/eclipselink-oxm-game-unqualified.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlid/XmlIdExtensionOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlid/XmlIdExtensionOverrideTestCases.java
index e6008eb..7e97084 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlid/XmlIdExtensionOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlid/XmlIdExtensionOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties() {
Map<String, Map<String, Source>> properties = new HashMap<String, Map<String, Source>>();
@@ -70,6 +71,7 @@
assertTrue("Schema validation failed unxepectedly: " + result, result == null);
}
+ @Override
protected Object getControlObject() {
Customer customer = new Customer();
MyID myID = new MyID();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefTestCases.java
index 7f8904d..ad2841e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/XmlIdRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setClasses(new Class[] { Employee.class, Address.class, Root.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlidref/eclipselink-oxm.xml");
@@ -108,6 +109,7 @@
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
Root testRoot = (Root) testObject;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlinlinebinarydata/MyAttachmentMarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlinlinebinarydata/MyAttachmentMarshaller.java
index 7d83854..1f2ca58 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlinlinebinarydata/MyAttachmentMarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlinlinebinarydata/MyAttachmentMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,19 +25,23 @@
public static final String BYTES_ID = "c_id0";
public static final String DATA_ID = "c_id1";
+ @Override
public boolean isXOPPackage() {
return true;
}
// SATISFY INTERFACE IMPLEMENTATION
+ @Override
public String addSwaRefAttachment(DataHandler data) { return DATA_ID; }
public String addSwaRefAttachment(byte[] data, int offset, int length) { return BYTES_ID; }
+ @Override
public String addMtomAttachment(byte[] bytes, int start, int offset, String mimeType, String elemtnName, String namespaceURI) {
String id = BYTES_ID;
count++;
attachments.put(id, bytes);
return id;
}
+ @Override
public String addMtomAttachment(DataHandler data, String namespaceURI, String elementName) {
String id = DATA_ID;
count++;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlinlinebinarydata/MyAttachmentUnmarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlinlinebinarydata/MyAttachmentUnmarshaller.java
index 3d66060..e788bc3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlinlinebinarydata/MyAttachmentUnmarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlinlinebinarydata/MyAttachmentUnmarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,10 +19,12 @@
import jakarta.xml.bind.attachment.AttachmentUnmarshaller;
public class MyAttachmentUnmarshaller extends AttachmentUnmarshaller {
+ @Override
public boolean isXOPPackage() {
return true;
}
+ @Override
public byte[] getAttachmentAsByteArray(String cid) {
Object obj = MyAttachmentMarshaller.attachments.get(cid);
if(obj instanceof byte[]){
@@ -36,6 +38,7 @@
return null;
}
}
+ @Override
public DataHandler getAttachmentAsDataHandler(String cid) {
Object obj = MyAttachmentMarshaller.attachments.get(cid);
if (obj instanceof DataHandler) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/AccessorTypeNoneTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/AccessorTypeNoneTestCases.java
index 858b820..5ea01a1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/AccessorTypeNoneTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/AccessorTypeNoneTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setClasses(new Class[] { Company.class });
}
+ @Override
public Object getControlObject() {
AtnCompany company = new AtnCompany();
@@ -68,6 +69,7 @@
return company;
}
+ @Override
public Map getProperties() {
InputStream inputStream = ClassLoader.getSystemResourceAsStream(BINDINGS_RESOURCE);
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/XmlJoinNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/XmlJoinNodeTestCases.java
index 1926a19..7c7dc00 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/XmlJoinNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmljoinnode/XmlJoinNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,6 +67,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected Marshaller getJSONMarshaller() throws Exception{
Marshaller m = jaxbContext.createMarshaller();
Map<String, String> namespaces = new HashMap<String, String>();
@@ -80,6 +81,7 @@
/**
* Return the control Company object.
*/
+ @Override
public Object getControlObject() {
Address ottawa100 = new Address("a100", "45 O'Connor St.", "400", "Kanata", "K1P1A4");
Address ottawa200 = new Address("a200", "1 Anystreet Rd.", "9", "Ottawa", "K4P1A2");
@@ -97,6 +99,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream(OXM_DOC);
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
@@ -228,7 +231,7 @@
DatabaseMapping mapping = xDesc.getMappingForAttributeName("employees");
assertNotNull("No mapping exists on Customer for attribute [employees].", mapping);
assertTrue("Expected an XMLCollectionReferenceMapping for attribute [employees], but was [" + mapping.toString() +"].", mapping instanceof XMLCollectionReferenceMapping);
- assertTrue("Expected container class [java.util.LinkedList] but was ["+((XMLCollectionReferenceMapping) mapping).getContainerPolicy().getContainerClassName()+"]", ((XMLCollectionReferenceMapping) mapping).getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
+ assertTrue("Expected container class [java.util.LinkedList] but was ["+ mapping.getContainerPolicy().getContainerClassName()+"]", mapping.getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListNoStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListNoStringTestCases.java
index 4bdd1ec..fe4b058 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListNoStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListNoStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setContextPath(CONTEXT_PATH);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
@@ -52,6 +53,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/eclipselink-oxm-no-stringdata.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListOnXmlAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListOnXmlAttributeTestCases.java
index 8c290e6..11a4bdf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListOnXmlAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListOnXmlAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setContextPath(CONTEXT_PATH);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
@@ -52,6 +53,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/eclipselink-oxm-data-attribute.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListTestCases.java
index 8820ec1..1c8342f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/XmlListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setContextPath(CONTEXT_PATH);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmllist/eclipselink-oxm.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
@@ -101,6 +102,7 @@
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmetadatacomplete/XmlMetadataCompleteTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmetadatacomplete/XmlMetadataCompleteTestCases.java
index 2ed9a60..b85e29f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmetadatacomplete/XmlMetadataCompleteTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmetadatacomplete/XmlMetadataCompleteTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
* as well.
*
*/
+ @Override
public void setUp() throws Exception {
super.setUp();
classes = new Class[] { Employee.class };
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/MyAttachmentMarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/MyAttachmentMarshaller.java
index 1484d49..537d4e1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/MyAttachmentMarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/MyAttachmentMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
public static HashMap attachments = new HashMap();
public boolean returnNull = false;
+ @Override
public String addSwaRefAttachment(DataHandler data) {
if(returnNull) {
return null;
@@ -45,6 +46,7 @@
return id;
}
+ @Override
public String addMtomAttachment(byte[] bytes, int start, int offset, String mimeType, String elemtnName, String namespaceURI) {
if(returnNull) {
return null;
@@ -58,6 +60,7 @@
return id;
}
+ @Override
public String addMtomAttachment(DataHandler data, String namespaceURI, String elementName) {
if(returnNull) {
return null;
@@ -70,6 +73,7 @@
return id;
}
+ @Override
public boolean isXOPPackage() {
return true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/MyAttachmentUnmarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/MyAttachmentUnmarshaller.java
index fa7bffb..6569afe 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/MyAttachmentUnmarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/MyAttachmentUnmarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
getAttachmentAsDataHandlerWasCalled = false;
}
+ @Override
public byte[] getAttachmentAsByteArray(String cid) {
Object obj = MyAttachmentMarshaller.attachments.get(cid);
if(obj instanceof byte[]){
@@ -45,6 +46,7 @@
}
}
+ @Override
public DataHandler getAttachmentAsDataHandler(String cid) {
this.getAttachmentAsDataHandlerWasCalled = true;
Object obj = MyAttachmentMarshaller.attachments.get(cid);
@@ -54,6 +56,7 @@
return null;
}
+ @Override
public boolean isXOPPackage() {
// force attachment usage
return true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/XmlMimeTypeCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/XmlMimeTypeCases.java
index 5c4359e..66f7c55 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/XmlMimeTypeCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/XmlMimeTypeCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmimetype/eclipselink-oxm.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
@@ -72,6 +73,7 @@
}
+ @Override
protected Object getControlObject() {
AttTypes attTypes = new AttTypes();
String s = "THISISATEXTSTRINGFORTHISDATAHANDLER";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmixed/XmlMixedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmixed/XmlMixedTestCases.java
index 8eb9613..0acef0c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmixed/XmlMixedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmixed/XmlMixedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlmixed/eclipselink-oxm.xml");
@@ -62,6 +63,7 @@
return properties;
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.a = 1;
@@ -80,6 +82,7 @@
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
assertTrue(testObject instanceof Employee);
Employee emp = (Employee)testObject;
@@ -92,6 +95,7 @@
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
assertTrue(testObject instanceof Employee);
Employee emp = (Employee)testObject;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyDoubleTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyDoubleTransformer.java
index c9b9ac7..7ee7635 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyDoubleTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyDoubleTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,19 +18,23 @@
public class MyDoubleTransformer implements XMLNameTransformer{
+ @Override
public String transformTypeName(String name) {
String shortName = name.substring(name.lastIndexOf('.') + 1);
return shortName + shortName;
}
+ @Override
public String transformRootElementName(String name) {
return name + name;
}
+ @Override
public String transformElementName(String name) {
return name + name;
}
+ @Override
public String transformAttributeName(String name) {
return name + name;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyLowerTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyLowerTransformer.java
index ebfbc41..c707dd4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyLowerTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyLowerTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,18 +18,22 @@
public class MyLowerTransformer implements XMLNameTransformer{
+ @Override
public String transformTypeName(String name) {
return name.toLowerCase();
}
+ @Override
public String transformRootElementName(String name) {
return name.toLowerCase();
}
+ @Override
public String transformElementName(String name) {
return name.toLowerCase();
}
+ @Override
public String transformAttributeName(String name) {
return name.toLowerCase();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyUpperTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyUpperTransformer.java
index 5bff52f..e770cce 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyUpperTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/MyUpperTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,19 +18,23 @@
public class MyUpperTransformer implements XMLNameTransformer{
+ @Override
public String transformTypeName(String name) {
return name.toUpperCase() + "TYPE";
}
+ @Override
public String transformElementName(String name) {
return name.toUpperCase() + "ELEM";
}
+ @Override
public String transformAttributeName(String name) {
return name.toUpperCase() + "ATTR";
}
+ @Override
public String transformRootElementName(String name) {
name = name.substring(name.lastIndexOf('.') + 1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerExceptionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerExceptionTestCases.java
index 8aae6e7..d99e5d5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerExceptionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerExceptionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
try {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerSimpleTestCases.java
index cbb3261..11cf541 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerSimpleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -50,6 +51,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
Phone p = new Phone();
p.number = "1234567";
@@ -63,6 +65,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerTestCases.java
index e8f7acd..05b03b5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/NameTransformerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -70,6 +71,7 @@
types[1] = Address.class;
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -113,6 +115,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/TransformerWithException.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/TransformerWithException.java
index dd6d811..894e8f3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/TransformerWithException.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/TransformerWithException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,24 +18,28 @@
public class TransformerWithException implements XMLNameTransformer{
+ @Override
public String transformTypeName(String name) {
String s = null;
s.charAt(0);
return name;
}
+ @Override
public String transformRootElementName(String name) {
String s = null;
s.charAt(0);
return name;
}
+ @Override
public String transformElementName(String name) {
String s = null;
s.charAt(0);
return name;
}
+ @Override
public String transformAttributeName(String name) {
String s = null;
s.charAt(0);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingDefaultNameNameTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingDefaultNameNameTransformer.java
index a123382..afa265c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingDefaultNameNameTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnametransformer/XmlMappingDefaultNameNameTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,18 +18,22 @@
public class XmlMappingDefaultNameNameTransformer implements XMLNameTransformer {
+ @Override
public String transformTypeName(String name) {
return name + "_TYPE";
}
+ @Override
public String transformElementName(String name) {
return name + "_ELEMENT";
}
+ @Override
public String transformAttributeName(String name) {
return name + "_ATTRIBUTE";
}
+ @Override
public String transformRootElementName(String name) {
return name + "_ROOT";
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageLevelOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageLevelOverrideTestCases.java
index 1f479fc..96a7dd5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageLevelOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageLevelOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { PackageRootOverride.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageLevelTestCases.java
index fc478e2..47c80b0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageLevelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { Root.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageTypeOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageTypeOverrideTestCases.java
index 46d475a..52b1503 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageTypeOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyPackageTypeOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { PackageTypeOverride.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyTypeLevelOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyTypeLevelOverrideTestCases.java
index fb23467..9400391 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyTypeLevelOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyTypeLevelOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { TypeRootOverride.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyTypeLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyTypeLevelTestCases.java
index 2c6399e..5df4453 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyTypeLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlnullpolicy/XmlNullPolicyTypeLevelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[] { TypeRoot.class });
}
+ @Override
public Map getProperties() {
InputStream iStream = ClassLoader.getSystemResourceAsStream(BINDINGS_DOC);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryNonLocalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryNonLocalTestCases.java
index b6142d7..45640d7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryNonLocalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryNonLocalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,12 +39,14 @@
setClasses(new Class[] { FooBar.class, ObjectFactory2.class });
}
+ @Override
protected Object getControlObject() {
QName name = new QName("foos");
JAXBElement jaxbElement = new JAXBElement<Integer>(name, Integer.class, 5);
return jaxbElement;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/eclipselink-oxm-non-local.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryTestCases.java
index 7f8b603..b376ed8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/XmlRegistryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlregistry/eclipselink-oxm.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
@@ -76,6 +77,7 @@
}
+ @Override
public Object getControlObject() {
FooBar foobar = new FooBar();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlrootelement/XmlRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlrootelement/XmlRootElementTestCases.java
index 6e1cd67..0175a48 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlrootelement/XmlRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlrootelement/XmlRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlrootelement/eclipselink-oxm.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
@@ -73,6 +74,7 @@
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.firstName ="firstName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/XmlSchemaTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/XmlSchemaTestCases.java
index 861f7c5..da83f46 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/XmlSchemaTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/XmlSchemaTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,6 +64,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/eclipselink-oxm.xml");
HashMap<String, Source> metadataSourceMap = new HashMap<String, Source>();
@@ -105,6 +106,7 @@
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.firstName ="firstName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/NamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/NamespaceTestCases.java
index 3ec455e..4efa19c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/NamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/NamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -50,6 +51,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.city = "Ottawa";
@@ -64,6 +66,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/linked/PrefixedLinkedNamespacesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/linked/PrefixedLinkedNamespacesTestCases.java
index 1a02da9..9b0bf4d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/linked/PrefixedLinkedNamespacesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschema/namespace/linked/PrefixedLinkedNamespacesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
Book book = new Book();
book.name = "Nineteen Eighty-Four";
@@ -58,6 +59,7 @@
// do not test schema generation
}
+ @Override
protected Map getProperties() {
Map<String, Object> properties = new HashMap<String, Object>();
List<Object> metadataSources = new LinkedList<>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java
index 8f81444..6359568 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/XmlSchemaTypesTestCases.java
@@ -68,6 +68,7 @@
TimeZone.setDefault(currentTimeZone);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
@@ -82,6 +83,7 @@
return emp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlschematypes/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlseealso/XmlSeeAlsoTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlseealso/XmlSeeAlsoTestCases.java
index 0c73899..5d8f471 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlseealso/XmlSeeAlsoTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlseealso/XmlSeeAlsoTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlseealso/eclipselink-oxm.xml");
@@ -77,6 +78,7 @@
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.firstName ="firstName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientPropertyToTransientClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientPropertyToTransientClassTestCases.java
index ee2c584..9b5b542 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientPropertyToTransientClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientPropertyToTransientClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -46,12 +47,14 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
ContactInfo info = new ContactInfo();
info.phoneNumber = "1234567";
return info;
}
+ @Override
public Object getWriteControlObject() {
ContactInfo info = new ContactInfo();
info.phoneNumber = "1234567";
@@ -72,6 +75,7 @@
this.testSchemaGen(controlSchemas);
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientTestCases.java
index a31c6f1..77a8e85 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/XmlTransientTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/eclipselink-oxm.xml");
@@ -139,6 +140,7 @@
fail("The expected exception was not thrown.");
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.firstName = "firstName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/inheritance/XmlTransientInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/inheritance/XmlTransientInheritanceTestCases.java
index 34e4902..06a3785 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/inheritance/XmlTransientInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/inheritance/XmlTransientInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setClasses(new Class[] { Person.class, Employee.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/inheritance/eclipselink-oxm.xml");
@@ -58,6 +59,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.age = 25;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/classlevel/XmlTransientUnsetClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/classlevel/XmlTransientUnsetClassTestCases.java
index 3680663..0717013 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/classlevel/XmlTransientUnsetClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/classlevel/XmlTransientUnsetClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setClasses(new Class[] { Employee.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/classlevel/eclipselink-oxm.xml");
@@ -58,6 +59,7 @@
super.testSchemaGen(controlSchemas);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/prop/XmlTransientUnsetPropTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/prop/XmlTransientUnsetPropTestCases.java
index accca76..5a66bf5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/prop/XmlTransientUnsetPropTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/prop/XmlTransientUnsetPropTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(new Class[] { PhoneNumber.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltransient/unset/prop/eclipselink-oxm.xml");
@@ -47,6 +48,7 @@
return properties;
}
+ @Override
protected Object getControlObject() {
PhoneNumber num = new PhoneNumber();
num.setNumber("123-4567");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/EmployeeFactoryClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/EmployeeFactoryClassTestCases.java
index c8f9b40..b497f06 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/EmployeeFactoryClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/EmployeeFactoryClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
super(name);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/employee-factory-class-oxm.xml");
@@ -40,6 +41,7 @@
return properties;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception{
super.xmlToObjectTest(testObject);
assertNotNull("Unmarshalled object is null.", testObject);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/XmlTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/XmlTypeTestCases.java
index 2610ff2..d6ab2d4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/XmlTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/XmlTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
/**
* Create the control Employee.
*/
+ @Override
public Object getControlObject() {
Employee ctrlEmp = new Employee();
ctrlEmp.id = EMP_ID;
@@ -60,6 +61,7 @@
return ctrlEmp;
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/factory/FactoryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/factory/FactoryTestCases.java
index 6843da5..2e9d4ef 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/factory/FactoryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmltype/factory/FactoryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public String getName() {
return "JAXB Factory Instantiation: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceInheritanceTestCases.java
index 4785eb6..101fe73 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/eclipselink-oxm-cdnprice-inheritance.xml");
@@ -69,6 +70,7 @@
assertTrue("Schema validation failed unxepectedly: " + result, result == null);
}
+ @Override
protected Object getControlObject() {
CDNPriceInheritance price = new CDNPriceInheritance();
price.price = new BigDecimal("123.45678901234567890");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceTestCases.java
index 6bb69f9..c8ec348 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPriceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/eclipselink-oxm-cdnprice.xml");
@@ -64,6 +65,7 @@
assertTrue("Schema validation failed unxepectedly: " + result, result == null);
}
+ @Override
protected Object getControlObject() {
CDNPriceNoAnnotation price = new CDNPriceNoAnnotation();
price.price = new BigDecimal("123.45678901234567890");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPricesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPricesTestCases.java
index fd400f2..7da5bab 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPricesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueCdnPricesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/eclipselink-oxm-cdnprices.xml");
@@ -68,6 +69,7 @@
assertTrue("Schema validation failed unxepectedly: " + result, result == null);
}
+ @Override
protected Object getControlObject() {
CDNPricesNoAnnotation price = new CDNPricesNoAnnotation();
price.prices = new ArrayList();
@@ -84,7 +86,7 @@
DatabaseMapping mapping = xDesc.getMappingForAttributeName("prices");
assertNotNull("No mapping exists on CDNPricesNoAnnotation for attribute [prices].", mapping);
assertTrue("Expected an XMLCompositeDirectCollectionMapping for attribute [prices], but was [" + mapping.toString() +"].", mapping instanceof XMLCompositeDirectCollectionMapping);
- assertTrue("Expected container class [java.util.LinkedList] but was ["+((XMLCompositeDirectCollectionMapping) mapping).getContainerPolicy().getContainerClassName()+"]", ((XMLCompositeDirectCollectionMapping) mapping).getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
+ assertTrue("Expected container class [java.util.LinkedList] but was ["+ mapping.getContainerPolicy().getContainerClassName()+"]", mapping.getContainerPolicy().getContainerClassName().equals("java.util.LinkedList"));
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPriceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPriceTestCases.java
index c241172..946764c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPriceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPriceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/eclipselink-oxm-intprice.xml");
@@ -68,6 +69,7 @@
assertTrue("Schema validation failed unxepectedly: " + result, result == null);
}
+ @Override
protected Object getControlObject() {
InternationalPriceNoAnnotation price = new InternationalPriceNoAnnotation();
price.currency ="CDN";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPricesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPricesTestCases.java
index 1e70b05..aa2da48 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPricesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueInternationalPricesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/eclipselink-oxm-intprices.xml");
@@ -65,6 +66,7 @@
}
+ @Override
protected Object getControlObject() {
InternationalPricesNoAnnotation price = new InternationalPricesNoAnnotation();
price.currency ="CDN";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java
index 66e039c..41f66a4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/XmlValueTestCases.java
@@ -51,6 +51,7 @@
setClasses(new Class[] { MyValueClass.class });
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream(ADAPTER_OXM_DOC);
@@ -63,6 +64,7 @@
}
+ @Override
public Object getControlObject() {
MyValueClass mvc = new MyValueClass();
mvc.blah = Boolean.valueOf("true");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/adapter/MyValueAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/adapter/MyValueAdapter.java
index 0222a30..7cf80d2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/adapter/MyValueAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/externalizedmetadata/xmlvalue/adapter/MyValueAdapter.java
@@ -22,10 +22,12 @@
*/
public class MyValueAdapter extends XmlAdapter<String, Boolean> {
+ @Override
public Boolean unmarshal(String v) throws Exception {
return Boolean.valueOf(v.equals("T") ? "true" : "false");
}
+ @Override
public String marshal(Boolean v) throws Exception {
return (v ? "T" : "F");
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/helper/JAXBHelperTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/helper/JAXBHelperTestCases.java
index 19bb9ee..b0745bc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/helper/JAXBHelperTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/helper/JAXBHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
Class[] classes = new Class[1];
classes[0] = Customer.class;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/IDResolverTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/IDResolverTestCases.java
index 402c371..e2692a3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/IDResolverTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/IDResolverTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
assertTrue("ValidationEventHandler was not set.", idResolver.eventHandlerNotNull);
}
+ @Override
public Object getControlObject() {
Apple a1 = new Apple();
a1.id = "a1";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/MyIDResolver.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/MyIDResolver.java
index 4fe7bb2..7e61f5c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/MyIDResolver.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/MyIDResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,6 +66,7 @@
public Callable<Object> resolve(final Map<String, Object> idWrapper, final Class type) throws SAXException {
hitResolve = true;
return new Callable<Object>() {
+ @Override
public Object call() {
if (type == Apple.class) {
return apples.get(idWrapper);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/collection/IDResolverTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/collection/IDResolverTestCases.java
index 1841789..6a15b8b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/collection/IDResolverTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/collection/IDResolverTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
assertTrue("ValidationEventHandler was not set.", idResolver.eventHandlerNotNull);
}
+ @Override
public Object getControlObject() {
TestObject o = new TestObject();
o.name = "FOO"; o.id = 1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/collection/MyIDResolver.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/collection/MyIDResolver.java
index 4d02b6c..7e41dbc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/collection/MyIDResolver.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/idresolver/collection/MyIDResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
public Callable<Object> resolve(final Map<String, Object> idWrapper, final Class type) throws SAXException {
hitResolve = true;
return new Callable<Object>() {
+ @Override
public Object call() {
Object obj = objects.get(idWrapper);
((TestObject) obj).processed = true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/JAXBInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/JAXBInheritanceTestCases.java
index 8bf4a63..5ca6d80 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/JAXBInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/JAXBInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/inheritance/inheritance.json");
}
+ @Override
public Object getControlObject() {
// reads a document that also contains a value for "ddd" and makes sure
// we ignore it
@@ -52,6 +53,7 @@
return jaxbElement;
}
+ @Override
public Object getReadControlObject() {
// reads a document that also contains a value for "ddd" and makes sure
// we ignore it
@@ -96,7 +98,7 @@
log(testObject.toString());
JAXBElement controlObj = (JAXBElement)getControlObject();
- JAXBElement testObj = (JAXBElement)testObject;
+ JAXBElement testObj = testObject;
compareJAXBElementObjects(controlObj, testObj);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/dot/InheritanceDotTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/dot/InheritanceDotTestCases.java
index 78d7184..d2b1fdc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/dot/InheritanceDotTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/dot/InheritanceDotTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/inheritance/inheritanceDot.json");
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.name = "Bob Smith";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/AImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/AImpl.java
index a136cf9..5956413 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/AImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/AImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,10 +33,12 @@
@XmlElement(type = BImpl.class)
private B b;
+ @Override
public B getB() {
return b;
}
+ @Override
public void setB(B b) {
this.b = b;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/BImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/BImpl.java
index 63f7fff..4a3a0bf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/BImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/BImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,10 +32,12 @@
private A a;
+ @Override
public A getA() {
return a;
}
+ @Override
public void setA(A a) {
this.a = a;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/JAXBInheritanceIdTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/JAXBInheritanceIdTestCases.java
index faad9ed..dfeb695 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/JAXBInheritanceIdTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/id/JAXBInheritanceIdTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
}
+ @Override
public Object getControlObject() {
A a = new AImpl("a");
B b = new BImpl("b");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/interfaces/Customer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/interfaces/Customer.java
index 843ae4a..69ff429 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/interfaces/Customer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/interfaces/Customer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,18 +18,22 @@
String firstName;
String lastName;
+ @Override
public String getFirstName() {
return firstName;
}
+ @Override
public void setFirstName(String name) {
firstName = name;
}
+ @Override
public String getLastName() {
return lastName;
}
+ @Override
public void setLastName(String lName) {
lastName = lName;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSSeparatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSSeparatorTestCases.java
index 3e332f6..4e19e80 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSSeparatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSSeparatorTestCases.java
@@ -40,6 +40,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_SEPARATOR, '*');
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
JAXBMarshaller m = super.getJSONMarshaller();
m.setProperty(MarshallerProperties.JSON_NAMESPACE_SEPARATOR, '*');
@@ -58,7 +59,7 @@
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSTestCases.java
index 863c84a..7f11e35 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
Map<String, String> namespaces= new HashMap<String, String>();
namespaces.put("rootNamespace","ns0");
@@ -52,6 +53,7 @@
return jsonMarshaller;
}
+ @Override
public Object getControlObject() {
Root root = new Root();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeNoParentRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeNoParentRootTestCases.java
index f426304..68da7c2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeNoParentRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeNoParentRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
Map<String, String> namespaces= new HashMap<String, String>();
namespaces.put("rootNamespace","ns0");
@@ -50,6 +51,7 @@
return jsonMarshaller;
}
+ @Override
public Object getControlObject() {
SubTypeWithRootElementNoParentRoot subType = new SubTypeWithRootElementNoParentRoot();
return subType;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeParentRootOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeParentRootOnlyTestCases.java
index bfabfa7..b2f814b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeParentRootOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeParentRootOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
Map<String, String> namespaces= new HashMap<String, String>();
namespaces.put("rootNamespace","ns0");
@@ -53,6 +54,7 @@
return jsonMarshaller;
}
+ @Override
public Object getControlObject() {
SubTypeParentRootOnly subType = new SubTypeParentRootOnly();
return subType;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeTestCases.java
index e64af7b..5157bf2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/ns/JAXBInheritanceSubTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
Map<String, String> namespaces= new HashMap<String, String>();
namespaces.put("rootNamespace","ns0");
@@ -50,6 +51,7 @@
return jsonMarshaller;
}
+ @Override
public Object getControlObject() {
SubTypeWithRootElement subType = new SubTypeWithRootElement();
return subType;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/override/InheritanceOverrideTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/override/InheritanceOverrideTestCases.java
index e5cdd66..13e443a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/override/InheritanceOverrideTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/override/InheritanceOverrideTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/inheritance/override.json");
}
+ @Override
public Object getControlObject() {
Root r = new Root();
Subclass s = new Subclass();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/simple/XmlValueInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/simple/XmlValueInheritanceTestCases.java
index 986f270..96b5f73 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/simple/XmlValueInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/simple/XmlValueInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlJSON("org/eclipse/persistence/testing/jaxb/inheritance/simple/xmlvalue.json");
}
+ @Override
public Object getControlObject() {
Complex complex = new Complex();
complex.foo = "aaa";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/typeElem/InheritanceTypeElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/typeElem/InheritanceTypeElementTestCases.java
index 091003b..a8ae494 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/typeElem/InheritanceTypeElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/inheritance/typeElem/InheritanceTypeElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,14 +51,17 @@
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public Marshaller getJSONMarshaller() throws Exception{
return jsonMarshaller;
}
+ @Override
public Unmarshaller getJSONUnmarshaller() throws Exception{
return jsonUnmarshaller;
}
+ @Override
public Object getControlObject() {
Root r = new Root();
Child child = new Child();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/innerclasses/notincontext/TestObjectWrapper.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/innerclasses/notincontext/TestObjectWrapper.java
index 8a89e98..24c6b17 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/innerclasses/notincontext/TestObjectWrapper.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/innerclasses/notincontext/TestObjectWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,7 +24,7 @@
public boolean equals (Object compareObject){
if(compareObject instanceof TestObjectWrapper){
if(testObject == null){
- return ((TestObjectWrapper)compareObject) == null;
+ return compareObject == null;
}
return testObject.equals(((TestObjectWrapper)compareObject).testObject);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/ObjectFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/ObjectFactory.java
index 68ce30a..e3b3277 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/ObjectFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/ObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
private Map<String, Object> values = new HashMap<String, Object>();
+ @Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
String methodName = method.getName();
if(methodName.startsWith("get")) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/choice/MyObject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/choice/MyObject.java
index 814b75f..e10ab5f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/choice/MyObject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/choice/MyObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,10 +33,12 @@
private Properties props = new Properties();
private Properties anothernameproperties = new Properties();
+ @Override
public Properties getProperties() {
return props;
}
+ @Override
public void setProperties(Properties properties) {
this.props = properties;
}
@@ -51,18 +53,22 @@
this.test = test;
}
+ @Override
public Byte getTest2() {
return test2;
}
+ @Override
public void setTest2(Byte test2) {
this.test2 = test2;
}
+ @Override
public Properties getAnothernameproperties() {
return anothernameproperties;
}
+ @Override
public void setAnothernameproperties(Properties anothernameproperties) {
this.anothernameproperties = anothernameproperties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/choice/MyOtherObject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/choice/MyOtherObject.java
index aa01f73..6df0380 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/choice/MyOtherObject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/interfaces/choice/MyOtherObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,10 +28,12 @@
private Properties props = new Properties();
private Properties anothernameproperties = new Properties();
+ @Override
public Properties getProperties() {
return props;
}
+ @Override
public void setProperties(Properties properties) {
this.props = properties;
}
@@ -46,18 +48,22 @@
this.test = test;
}
+ @Override
public Byte getTest2() {
return test2;
}
+ @Override
public void setTest2(Byte test2) {
this.test2 = test2;
}
+ @Override
public Properties getAnothernameproperties() {
return anothernameproperties;
}
+ @Override
public void setAnothernameproperties(Properties anothernameproperties) {
this.anothernameproperties = anothernameproperties;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlaccessororder/XmlAccessorOrderTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlaccessororder/XmlAccessorOrderTest.java
index c2fc0f8..d96683f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlaccessororder/XmlAccessorOrderTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlaccessororder/XmlAccessorOrderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setId(101);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlaccessortype/XmlAccessorTypeTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlaccessortype/XmlAccessorTypeTest.java
index 0395b9f..c79bc4e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlaccessortype/XmlAccessorTypeTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlaccessortype/XmlAccessorTypeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.setID(101);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlanyattribute/XmlAnyAttributeTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlanyattribute/XmlAnyAttributeTest.java
index 16e8af2..337d02b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlanyattribute/XmlAnyAttributeTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlanyattribute/XmlAnyAttributeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public JAXBMarshaller getJSONMarshaller() throws Exception{
JAXBMarshaller jsonMarshaller = (JAXBMarshaller) jaxbContext.createMarshaller();
jsonMarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
@@ -54,6 +55,7 @@
return jsonMarshaller;
}
+ @Override
protected Object getControlObject() {
XmlAnyAttributeModel model = new XmlAnyAttributeModel();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlanyelement/XmlAnyElementCollectionModelTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlanyelement/XmlAnyElementCollectionModelTest.java
index 1238ab8..fe6b4a6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlanyelement/XmlAnyElementCollectionModelTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlanyelement/XmlAnyElementCollectionModelTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,12 +41,14 @@
setClasses(classes);
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
return props;
}
+ @Override
protected Object getControlObject() {
XmlAnyElementCollectionModel example = new XmlAnyElementCollectionModel();
example.a = 1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattachmentref/XmlAttachmentRefExampleTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattachmentref/XmlAttachmentRefExampleTest.java
index 7b5b225..c3d16c9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattachmentref/XmlAttachmentRefExampleTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattachmentref/XmlAttachmentRefExampleTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
RootObject example = new RootObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattribute/MapCollectionToXmlAttributeTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattribute/MapCollectionToXmlAttributeTest.java
index 6b33e0a..ddb8bb5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattribute/MapCollectionToXmlAttributeTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattribute/MapCollectionToXmlAttributeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MapCollectionToXmlAttribute ls = new MapCollectionToXmlAttribute();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattribute/MapPropertyToXmlAttributeTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattribute/MapPropertyToXmlAttributeTest.java
index 05794e9..9b4907e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattribute/MapPropertyToXmlAttributeTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlattribute/MapPropertyToXmlAttributeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
USPrice p = new USPrice();
p.setPrice(123.99);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNillableRequiredTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNillableRequiredTest.java
index 6c76b2b..dce1353 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNillableRequiredTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNillableRequiredTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
USPriceRequired p = new USPriceRequired();
p.setPrice(123.99);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNillableTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNillableTest.java
index 745852e..9987f0c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNillableTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNillableTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
USPriceNillable p = new USPriceNillable();
p.currency = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNonStaticTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNonStaticTest.java
index 89cc3d1..dfa9e11 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNonStaticTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelement/XmlElementNonStaticTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
USPrice p = new USPrice();
p.setPrice(123.99);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementdecl/XmlElementDeclExample1Test.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementdecl/XmlElementDeclExample1Test.java
index 530f001..6cdb47a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementdecl/XmlElementDeclExample1Test.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementdecl/XmlElementDeclExample1Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
ObjectFactory example = new ObjectFactory();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/JarTask.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/JarTask.java
index 4784427..3f291d7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/JarTask.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/JarTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,9 +25,11 @@
public String name;
+ @Override
public String getName(){
return name;
}
+ @Override
public void setName(String name){
this.name = name;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/JavacTask.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/JavacTask.java
index 5c17be1..dac4096 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/JavacTask.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/JavacTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,9 +25,11 @@
public String name;
+ @Override
public String getName(){
return name;
}
+ @Override
public void setName(String name){
this.name = name;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/XmlElementRefHierarchyTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/XmlElementRefHierarchyTest.java
index 734e966..ca4a8e4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/XmlElementRefHierarchyTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementref/XmlElementRefHierarchyTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Target target = new Target();
target.tasks = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementrefs/XmlElementRefsTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementrefs/XmlElementRefsTest.java
index 1bb6d3e..d300b3f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementrefs/XmlElementRefsTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementrefs/XmlElementRefsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
PurchaseOrder order = new PurchaseOrder();
ViaAir byAir = new ViaAir();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementTest.java
index bcc476a..3ebf6d1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementTest.java
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
XmlElementsListOfElement example = new XmlElementsListOfElement();
example.items = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementWrappedTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementWrappedTest.java
index 4132ef9..f575694 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementWrappedTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelements/XmlElementsListOfElementWrappedTest.java
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
XmlElementsListOfElementWrapped example = new XmlElementsListOfElementWrapped();
example.items = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementwrapper/XmlElementWrapperTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementwrapper/XmlElementWrapperTest.java
index ea4a317..818c2ff5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementwrapper/XmlElementWrapperTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlelementwrapper/XmlElementWrapperTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Hockey example = new Hockey();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlenumvalue/XmlEnumValueConstantNameTest3.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlenumvalue/XmlEnumValueConstantNameTest3.java
index f064d48..d7332ae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlenumvalue/XmlEnumValueConstantNameTest3.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlenumvalue/XmlEnumValueConstantNameTest3.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MyEnumModel example = new MyEnumModel();
example.setMyEnum(MyEnum.TWO);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlenumvalue/XmlEnumValueConstantNameValueTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlenumvalue/XmlEnumValueConstantNameValueTest.java
index 546ec7f..d566c88 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlenumvalue/XmlEnumValueConstantNameValueTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlenumvalue/XmlEnumValueConstantNameValueTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
XmlEnumValueConstantNameValue example = new XmlEnumValueConstantNameValue();
example.setCoin(Coin.QUARTER);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlid/XmlIdTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlid/XmlIdTest.java
index 05062c1..d785627 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlid/XmlIdTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlid/XmlIdTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Customer customer = new Customer();
customer.id = "123";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlidref/XmlIdRefContainmentTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlidref/XmlIdRefContainmentTest.java
index 634872a..c832953 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlidref/XmlIdRefContainmentTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlidref/XmlIdRefContainmentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
jaxbUnmarshaller.setProperty(MarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
protected Object getControlObject() {
CustomerData example = new CustomerData();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmllist/XmlListTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmllist/XmlListTest.java
index bfaf5b5..4b150fd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmllist/XmlListTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmllist/XmlListTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Hockey example = new Hockey();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlns/XmlNsCustomizePrefixAndUriTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlns/XmlNsCustomizePrefixAndUriTest.java
index 0d5a8dd..2a10dee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlns/XmlNsCustomizePrefixAndUriTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlns/XmlNsCustomizePrefixAndUriTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
USPrice p = new USPrice();
p.setPrice(123.99);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementBasicTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementBasicTest.java
index 863448e..29ee92c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementBasicTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementBasicTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Point2D point2d = new Point2D(10, 20);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementBasicTest2.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementBasicTest2.java
index 94da597..7508753 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementBasicTest2.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementBasicTest2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
USPrice p = new USPrice();
p.setPrice(123.99);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementNotInheritedByDerivedTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementNotInheritedByDerivedTest.java
index aa03c38..96e14f7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementNotInheritedByDerivedTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlrootelement/XmlRootElementNotInheritedByDerivedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Point3D point3d = new Point3D(10,20,5);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlschema/XmlSchemaElementFormUnqualifiedTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlschema/XmlSchemaElementFormUnqualifiedTest.java
index a43916b..7d31991 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlschema/XmlSchemaElementFormUnqualifiedTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlschema/XmlSchemaElementFormUnqualifiedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
USPrice p = new USPrice();
p.setPrice(123.99);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlschematype/XmlSchemaTypeGregorianCalendarTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlschematype/XmlSchemaTypeGregorianCalendarTest.java
index 4226c6f..d86462a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlschematype/XmlSchemaTypeGregorianCalendarTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlschematype/XmlSchemaTypeGregorianCalendarTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
USPrice p = new USPrice();
/* try{
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlseealso/XmlSeeAlsoTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlseealso/XmlSeeAlsoTest.java
index da59976..b54b060 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlseealso/XmlSeeAlsoTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlseealso/XmlSeeAlsoTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Cat exampleC = new Cat();
exampleC.owner = "JANE DOE";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlseealso/XmlSeeAlsoTest2.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlseealso/XmlSeeAlsoTest2.java
index 5800464..ade11c0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlseealso/XmlSeeAlsoTest2.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlseealso/XmlSeeAlsoTest2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Cat exampleC = new Cat();
exampleC.owner = "JANE DOE";
@@ -41,6 +42,7 @@
return new JAXBElement<Animal>(new QName("animal"), Animal.class, exampleC);
}
+ @Override
public Object getReadControlObject() {
Cat exampleC = new Cat();
exampleC.owner = "JANE DOE";
@@ -49,6 +51,7 @@
return exampleC;
}
+ @Override
public void testRoundTrip(){};
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltransient/XmlTransientTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltransient/XmlTransientTest.java
index f0f3250..6b06fc7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltransient/XmlTransientTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltransient/XmlTransientTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Address example = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeAnonymousLocalElementTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeAnonymousLocalElementTest.java
index 1e35b0d..a3bb0cd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeAnonymousLocalElementTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeAnonymousLocalElementTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Address4 addr4 = new Address4();
addr4.setName("JOE");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeAnonymousTypeTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeAnonymousTypeTest.java
index 1a73fef..bfcb4c4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeAnonymousTypeTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeAnonymousTypeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Address3 addr = new Address3();
addr.setName("JOE");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeCustomizedOrderingTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeCustomizedOrderingTest.java
index 47f8026..5d09a2e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeCustomizedOrderingTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeCustomizedOrderingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Address addr = new Address();
addr.setName("JOE");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeUnspecifiedOrderTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeUnspecifiedOrderTest.java
index 592f501..a908386 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeUnspecifiedOrderTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmltype/XmlTypeUnspecifiedOrderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Address2 addr = new Address2();
addr.setName("JOE");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlvalue/XmlValueSimpleContentTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlvalue/XmlValueSimpleContentTest.java
index ec81535..f4b0a19 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlvalue/XmlValueSimpleContentTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlvalue/XmlValueSimpleContentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_VALUE_WRAPPER, "valuewrapper");
}
+ @Override
protected Object getControlObject() {
InternationalPrice p = new InternationalPrice();
p.setPrice(123.99);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlvalue/XmlValueSimpleTypeTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlvalue/XmlValueSimpleTypeTest.java
index a650cc1..805c065 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlvalue/XmlValueSimpleTypeTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/javadoc/xmlvalue/XmlValueSimpleTypeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
USPrice p = new USPrice();
p.setPrice(123.99);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/GetByXPathTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/GetByXPathTests.java
index e891d33..3dee4dc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/GetByXPathTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/GetByXPathTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
private JAXBContext eCtx;
private TestBean controlObject;
+ @Override
public String getName() {
return "JAXB Context getByXPath Tests: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JAXBContextMediaTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JAXBContextMediaTypeTestCases.java
index 2a9988d..83c22df 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JAXBContextMediaTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JAXBContextMediaTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -90,10 +90,10 @@
JAXBContext ctx = JAXBContextFactory.createContext(classes, null);
JAXBMarshaller m = (JAXBMarshaller)ctx.createMarshaller();
assertEquals(MediaType.APPLICATION_XML, m.getProperty(MarshallerProperties.MEDIA_TYPE));
- assertEquals(MediaType.APPLICATION_XML,((JAXBMarshaller)m).getXMLMarshaller().getMediaType());
+ assertEquals(MediaType.APPLICATION_XML, m.getXMLMarshaller().getMediaType());
JAXBUnmarshaller u = (JAXBUnmarshaller)ctx.createUnmarshaller();
assertEquals(MediaType.APPLICATION_XML, u.getProperty(UnmarshallerProperties.MEDIA_TYPE));
- assertEquals(MediaType.APPLICATION_XML,((JAXBUnmarshaller)u).getXMLUnmarshaller().getMediaType());
+ assertEquals(MediaType.APPLICATION_XML, u.getXMLUnmarshaller().getMediaType());
}
public void testCreateContextWithNullMediaType() throws JAXBException {
@@ -106,10 +106,10 @@
JAXBMarshaller m = (JAXBMarshaller)ctx.createMarshaller();
assertEquals(MediaType.APPLICATION_XML, m.getProperty(MarshallerProperties.MEDIA_TYPE));
- assertEquals(MediaType.APPLICATION_XML,((JAXBMarshaller)m).getXMLMarshaller().getMediaType());
+ assertEquals(MediaType.APPLICATION_XML, m.getXMLMarshaller().getMediaType());
JAXBUnmarshaller u = (JAXBUnmarshaller)ctx.createUnmarshaller();
assertEquals(MediaType.APPLICATION_XML, u.getProperty(UnmarshallerProperties.MEDIA_TYPE));
- assertEquals(MediaType.APPLICATION_XML,((JAXBUnmarshaller)u).getXMLUnmarshaller().getMediaType());
+ assertEquals(MediaType.APPLICATION_XML, u.getXMLUnmarshaller().getMediaType());
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JaxbContextCreationTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JaxbContextCreationTests.java
index 6b9a8b0..7b1d527 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JaxbContextCreationTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/JaxbContextCreationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
public class JaxbContextCreationTests extends junit.framework.TestCase {
+ @Override
public String getName() {
return "JAXB Context Creation Tests: " + super.getName();
}
@@ -51,6 +52,7 @@
public void testCreateContextUnrelatedSessionsXml() throws Exception {
JAXBContext context = JAXBContextFactory.createContext("org.eclipse.persistence.testing.jaxb.jaxbcontext", new ClassLoader() {
+ @Override
public URL getResource(String resourceName) {
if(resourceName.equals("sessions.xml")) {
return getParent().getResource("org/eclipse/persistence/testing/jaxb/jaxbcontext/sessions.xml");
@@ -63,6 +65,7 @@
public void testCreateContextUnrelatedSessionsXmlInvalidPath() throws Exception {
try {
JAXBContext context = JAXBContextFactory.createContext("org.eclipse.persistence.testing.jaxb.jaxbcontext.fake", new ClassLoader() {
+ @Override
public URL getResource(String resourceName) {
if(resourceName.equals("sessions.xml")) {
return getParent().getResource("org/eclipse/persistence/testing/jaxb/jaxbcontext/sessions.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/SetByXPathTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/SetByXPathTests.java
index 1c3118a..8b287b4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/SetByXPathTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/SetByXPathTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
private final String CHANGED_VALUE = "CHANGED_VALUE";
+ @Override
public String getName() {
return "JAXB Context setByXPath Tests: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/notext/NoTextMappingErrorTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/notext/NoTextMappingErrorTests.java
index adb66af..7400be0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/notext/NoTextMappingErrorTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/notext/NoTextMappingErrorTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
private final static String ROOT_INHERITANCE = "org/eclipse/persistence/testing/jaxb/jaxbcontext/notext/root-inheritance.xml";
private final static String ROOT_INHERITANCE_NOTEXT = "org/eclipse/persistence/testing/jaxb/jaxbcontext/notext/root-inheritance-notext.xml";
+ @Override
public String getName() {
return "No Text Mapping Error Tests: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/sessioneventlistener/SessionEventListenerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/sessioneventlistener/SessionEventListenerTestCases.java
index 87b222a..d83d7c9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/sessioneventlistener/SessionEventListenerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/sessioneventlistener/SessionEventListenerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,7 +45,7 @@
public void testClassArrayMap() throws Exception {
Map<String, Object> properties = new HashMap<String, Object>(1);
properties.put(JAXBContextProperties.SESSION_EVENT_LISTENER, sessionEventListener);
- JAXBContext jc = (JAXBContext) JAXBContextFactory.createContext(new Class[] {Address.class}, properties);
+ JAXBContext jc = JAXBContextFactory.createContext(new Class[] {Address.class}, properties);
assertEquals(0, Address.INSTANTIATION_COUNTER);
unmarshalTest(jc);
}
@@ -53,7 +53,7 @@
public void testClassArrayMapClassLoader() throws Exception {
Map<String, Object> properties = new HashMap<String, Object>(1);
properties.put(JAXBContextProperties.SESSION_EVENT_LISTENER, sessionEventListener);
- JAXBContext jc = (JAXBContext) JAXBContextFactory.createContext(new Class[] {Address.class}, properties, Address.class.getClassLoader());
+ JAXBContext jc = JAXBContextFactory.createContext(new Class[] {Address.class}, properties, Address.class.getClassLoader());
assertEquals(0, Address.INSTANTIATION_COUNTER);
unmarshalTest(jc);
}
@@ -61,7 +61,7 @@
public void testContextPathClassLoaderMap() throws Exception {
Map<String, Object> properties = new HashMap<String, Object>(1);
properties.put(JAXBContextProperties.SESSION_EVENT_LISTENER, sessionEventListener);
- JAXBContext jc = (JAXBContext) JAXBContextFactory.createContext("org.eclipse.persistence.testing.jaxb.jaxbcontext.sessioneventlistener", Address.class.getClassLoader(), properties);
+ JAXBContext jc = JAXBContextFactory.createContext("org.eclipse.persistence.testing.jaxb.jaxbcontext.sessioneventlistener", Address.class.getClassLoader(), properties);
assertEquals(0, Address.INSTANTIATION_COUNTER);
unmarshalTest(jc);
}
@@ -69,7 +69,7 @@
public void testTypeArrayMapClassLoader() throws Exception {
Map<String, Object> properties = new HashMap<String, Object>(1);
properties.put(JAXBContextProperties.SESSION_EVENT_LISTENER, sessionEventListener);
- JAXBContext jc = (JAXBContext) JAXBContextFactory.createContext(new Type[] {Address.class}, properties, Address.class.getClassLoader());
+ JAXBContext jc = JAXBContextFactory.createContext(new Type[] {Address.class}, properties, Address.class.getClassLoader());
assertEquals(0, Address.INSTANTIATION_COUNTER);
unmarshalTest(jc);
}
@@ -81,7 +81,7 @@
TypeMappingInfo typeMappingInfo = new TypeMappingInfo();
typeMappingInfo.setType(Address.class);
typeMappingInfos[0] = typeMappingInfo;
- JAXBContext jc = (JAXBContext) JAXBContextFactory.createContext(typeMappingInfos, properties, Address.class.getClassLoader());
+ JAXBContext jc = JAXBContextFactory.createContext(typeMappingInfos, properties, Address.class.getClassLoader());
assertEquals(0, Address.INSTANTIATION_COUNTER);
unmarshalTest(jc);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithIndexTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithIndexTestCases.java
index dd66987..c425af4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithIndexTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithIndexTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -44,6 +45,7 @@
initXsiType();
}
+ @Override
protected Object getControlObject() {
ClassA classA = new ClassA();
classA.setTheValue("someValue");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefInBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefInBindingsTestCases.java
index 590b5b1..a62073f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefInBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefInBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -52,6 +53,7 @@
setTypes(classes);
}
+ @Override
protected Object getControlObject() {
ClassA classA = new ClassA();
@@ -67,6 +69,7 @@
this.testSchemaGen(controlSchemas);
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
String overridesString =
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefTestCases.java
index df908f1..bf7bf84 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByClassArrayWithRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -45,6 +46,7 @@
setTypes(classes);
}
+ @Override
protected Object getControlObject() {
ClassAWithElementRef classA = new ClassAWithElementRef();
JAXBElement<String> jbe = new JAXBElement<String>(new QName("a") ,String.class ,"someValue");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByPackageWithIndexTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByPackageWithIndexTestCases.java
index 53e8584..b2a3b9a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByPackageWithIndexTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbcontext/withjaxbindex/JAXBContextByPackageWithIndexTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -41,6 +42,7 @@
initXsiType();
}
+ @Override
protected Object getControlObject() {
ClassA classA = new ClassA();
classA.setTheValue("someValue");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/JAXBElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/JAXBElementTestCases.java
index facd999..6aca9c5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/JAXBElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/JAXBElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,10 +57,12 @@
/**
* Satisfy the abstract method declaration in JAXBTestCases
*/
+ @Override
protected Object getControlObject() {
return null;
}
+ @Override
protected void setControlDocument(String xmlResource) throws Exception {
super.setControlDocument(xmlResource);
resourceName = xmlResource;
@@ -70,6 +72,7 @@
target = targetCls;
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
InputSource inputSource = new InputSource(instream);
@@ -80,6 +83,7 @@
}
+ @Override
public void testRoundTrip() throws Exception{
if(isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -101,6 +105,7 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -127,6 +132,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -171,12 +177,14 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
Document testDocument = new SAXDocumentBuilder().getInitializedDocument();
getJAXBMarshaller().marshal(getWriteControlObject(), testDocument);
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
getJAXBMarshaller().marshal(getWriteControlObject(), builder);
@@ -194,6 +202,7 @@
// TODO: add support for StAX
public void testObjectToStreamWriter() throws Exception {}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
log("**testObjectToXMLDocument**");
log("Expected:");
@@ -205,8 +214,12 @@
}
// THESE TESTS DO NOT APPLY
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {}
+ @Override
public void testXMLToObjectFromURL() throws Exception {}
+ @Override
public void testObjectToXMLStringWriter() throws Exception {}
+ @Override
public void testUnmarshallerHandler() throws Exception { }
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/complex/JAXBElementComplexTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/complex/JAXBElementComplexTestCases.java
index 76d0449..a2bdf88 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/complex/JAXBElementComplexTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/complex/JAXBElementComplexTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
TestRunner.main(arguments);
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/jaxbelement/complex/employee-write.xml");
Document writeControlDocument = parser.parse(inputStream);
@@ -61,6 +62,7 @@
return writeControlDocument;
}
+ @Override
public Object getControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/DocumentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/DocumentTestCases.java
index c80b41e..9795bcf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/DocumentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/DocumentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
}
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementEmptyTestCases.java
index a2deb98..8e3712c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
}
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementFragmentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementFragmentTestCases.java
index a432de7..291d688 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementFragmentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementFragmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
}
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementNoNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementNoNamespaceTestCases.java
index a33f6ce..a3b68ea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementNoNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementNoNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
}
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementSameNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementSameNamespaceTestCases.java
index 53d12dc..4851ecb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementSameNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementSameNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
}
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementTestCases.java
index cc1ea8a..67bd732 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/dom/nofactory/ElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
}
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/enumeration/JAXBElementEnumTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/enumeration/JAXBElementEnumTestCases.java
index d58f90e..923b64d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/enumeration/JAXBElementEnumTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/enumeration/JAXBElementEnumTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setTargetClass(targetClass);
}
+ @Override
public Class getUnmarshalClass(){
return targetClass;
}
@@ -45,6 +46,7 @@
TestRunner.main(arguments);
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/jaxbelement/enum/coin.xml");
Document writeControlDocument = parser.parse(inputStream);
@@ -53,6 +55,7 @@
return writeControlDocument;
}
+ @Override
public Object getControlObject() {
Coin coin = Coin.NICKEL;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nested/JAXBElementNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nested/JAXBElementNestedTestCases.java
index 73b4381..25fafce 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nested/JAXBElementNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nested/JAXBElementNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getWriteControlObject() {
Root root = new Root();
@@ -60,6 +61,7 @@
return root;
}
+ @Override
public Object getControlObject() {
Root root = new Root();
@@ -85,6 +87,7 @@
return root;
}
+ @Override
public Object getJSONReadControlObject() {
//no namespace info
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nested/Root.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nested/Root.java
index 1c203d1..adeacb0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nested/Root.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nested/Root.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,7 +37,7 @@
}
public void setElem1(JAXBElement<Object> value) {
- this.elem1 = ((JAXBElement<Object> ) value);
+ this.elem1 = value;
}
public boolean equals(Object compareObject) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nil/JAXBElementNilTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nil/JAXBElementNilTestCases.java
index 176dcc3..0bd3885 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nil/JAXBElementNilTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/nil/JAXBElementNilTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setTargetClass(targetClass);
}
+ @Override
public Class getUnmarshalClass(){
return targetClass;
}
@@ -43,10 +44,12 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
return new JAXBElement(new QName(CONTROL_NAMESPACE_URI, CONTROL_ELEMENT_NAME), targetClass, null);
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/jaxbelement/nil/employee-write.xml");
Document writeControlDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementBase64TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementBase64TestCases.java
index 1454146..22bd9ff 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementBase64TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementBase64TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,16 +35,19 @@
setTargetClass(byte[].class);
}
+ @Override
public Class getUnmarshalClass(){
return byte[].class;
}
+ @Override
public Class[] getClasses(){
Class[] classes = new Class[1];
classes[0] = byte[].class;
return classes;
}
+ @Override
protected Object getControlObject() {
JAXBElement<byte[]> jbe = new JAXBElement<byte[]>(new QName("a", "b"),byte[].class, new byte[] { 0, 1, 2, 3});
return jbe;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementByteArrayAttachmentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementByteArrayAttachmentTestCases.java
index 779739f..952c718 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementByteArrayAttachmentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementByteArrayAttachmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,23 +33,27 @@
}
+ @Override
public Class getUnmarshalClass(){
return byte[].class;
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jaxbMarshaller.setAttachmentMarshaller(new MyJAXBAttachmentMarshaller(new byte[] {0, 1, 2, 3}));
jaxbUnmarshaller.setAttachmentUnmarshaller(new MyJAXBAttachmentUnmarshaller());
}
+ @Override
public Class[] getClasses(){
Class[] classes = new Class[1];
classes[0] = byte[].class;
return classes;
}
+ @Override
protected Object getControlObject() {
JAXBElement<byte[]> jbe = new JAXBElement<byte[]>(new QName("a", "b"),byte[].class, new byte[] { 0, 1, 2, 3});
return jbe;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementCharacterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementCharacterTestCases.java
index 8263767..ccfeb9b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementCharacterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementCharacterTestCases.java
@@ -33,16 +33,19 @@
setTargetClass(Character.class);
}
+ @Override
public Class[] getClasses(){
Class[] classes = new Class[1];
classes[0] = Character.class;
return classes;
}
+ @Override
public Class getUnmarshalClass(){
return Character.class;
}
+ @Override
protected Object getControlObject() {
Character character = Character.valueOf('s');
JAXBElement<Character> jbe = new JAXBElement<Character>(new QName("a", "b"),Character.class, character);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementDataHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementDataHandlerTestCases.java
index c5dad9f..d48d625 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementDataHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementDataHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,29 +39,34 @@
}
+ @Override
public Class getUnmarshalClass(){
return DataHandler.class;
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jaxbMarshaller.setAttachmentMarshaller(new MyJAXBAttachmentMarshaller(new DataHandler("THISISATEXTSTRINGFORTHISDATAHANDLER", "text")));
jaxbUnmarshaller.setAttachmentUnmarshaller(new MyJAXBAttachmentUnmarshaller());
}
+ @Override
public Class[] getClasses(){
Class[] classes = new Class[1];
classes[0] = DataHandler.class;
return classes;
}
+ @Override
protected Object getControlObject() {
DataHandler value = new DataHandler("THISISATEXTSTRINGFORTHISDATAHANDLER", "text");
JAXBElement<DataHandler> jbe = new JAXBElement<DataHandler>(new QName("a", "b"),DataHandler.class, value);
return jbe;
}
+ @Override
protected void compareValues(Object controlValue, Object testValue) {
DataHandler dhControl = (DataHandler)controlValue;
DataHandler dhTest = (DataHandler)testValue;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementLongTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementLongTestCases.java
index fcc6d44..b6eea91 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementLongTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementLongTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,12 +32,14 @@
setTargetClass(long.class);
}
+ @Override
public Class[] getClasses(){
Class[] classes = new Class[1];
classes[0] = Long.class;
return classes;
}
+ @Override
protected Object getControlObject() {
long longValue = 11;
JAXBElement<Long> jbe = new JAXBElement<Long>(new QName("a", "b"),Long.class, longValue);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementSimpleTestCases.java
index 45709d5..462c71c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/JAXBElementSimpleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
}
+ @Override
public Class getUnmarshalClass(){
return targetClass;
}
@@ -45,10 +46,12 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
return new JAXBElement(new QName(CONTROL_NAMESPACE_URI, CONTROL_ELEMENT_NAME), targetClass, CONTROL_PERSON_NAME);
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/jaxbelement/simple/employee-write.xml");
Document writeControlDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/MyJAXBAttachmentMarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/MyJAXBAttachmentMarshaller.java
index 431a0c5..a91a817 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/MyJAXBAttachmentMarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/MyJAXBAttachmentMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
}
+ @Override
public String addSwaRefAttachment(DataHandler data) {
if(returnNull) {
return null;
@@ -53,6 +54,7 @@
return id;
}
+ @Override
public String addMtomAttachment(byte[] bytes, int start, int offset, String mimeType, String elemtnName, String namespaceURI) {
if(returnNull) {
return null;
@@ -66,6 +68,7 @@
return id;
}
+ @Override
public String addMtomAttachment(DataHandler data, String namespaceURI, String elementName) {
if(returnNull) {
return null;
@@ -76,6 +79,7 @@
return id;
}
+ @Override
public boolean isXOPPackage() {
return true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/MyJAXBAttachmentUnmarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/MyJAXBAttachmentUnmarshaller.java
index 451c572..741cfef 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/MyJAXBAttachmentUnmarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/simple/MyJAXBAttachmentUnmarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,11 +34,13 @@
getAttachmentAsDataHandlerWasCalled = false;
}
+ @Override
public byte[] getAttachmentAsByteArray(String cid) {
Object obj = MyJAXBAttachmentMarshaller.attachments.get(ATTACHMENT_TEST_ID);
return (byte[])obj;
}
+ @Override
public DataHandler getAttachmentAsDataHandler(String cid) {
this.getAttachmentAsDataHandlerWasCalled = true;
HashMap map = MyJAXBAttachmentMarshaller.attachments;
@@ -49,6 +51,7 @@
return null;
}
+ @Override
public boolean isXOPPackage() {
// force attachment usage
return true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/subclass/Foo.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/subclass/Foo.java
index 4150963..c01d67e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/subclass/Foo.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbelement/subclass/Foo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,11 +24,11 @@
protected final static QName NAME = new QName("", "foo");
public Foo(Object value) {
- super(NAME, ((Class) Object.class), null, value);
+ super(NAME, Object.class, null, value);
}
public Foo() {
- super(NAME, ((Class) Object.class), null, null);
+ super(NAME, Object.class, null, null);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbfragment/JAXBFragmentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbfragment/JAXBFragmentTestCases.java
index bb6e8f4..a02f177 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbfragment/JAXBFragmentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbfragment/JAXBFragmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
jaxbMarshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
}
+ @Override
protected Object getControlObject() {
Address addr = new Address();
addr.setCity("Ottawa");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbintrospector/elementname/JAXBIntrospectorGetElementNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbintrospector/elementname/JAXBIntrospectorGetElementNameTestCases.java
index 4b01983..a765012 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbintrospector/elementname/JAXBIntrospectorGetElementNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/jaxbintrospector/elementname/JAXBIntrospectorGetElementNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
JAXBContext jaxbContext;
JAXBIntrospector jaxbIntrospector;
+ @Override
public void setUp() throws Exception {
Class[] classesToBeBound = new Class[] { TestObject.class,
ElementDeclObject.class, ObjectFactory.class };
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/JSONMarshalUnmarshalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/JSONMarshalUnmarshalTestCases.java
index 51debb1..aeb9e8f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/JSONMarshalUnmarshalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/JSONMarshalUnmarshalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
return null;
}
+ @Override
protected void compareStringToControlFile(String testName, String testString) {
String expectedString = loadFileToString(getWriteControlJSON());
compareStrings(testName, testString, expectedString, true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/JSONTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/JSONTestCases.java
index aac7cc9..c12da0e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/JSONTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/JSONTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception{
try {
super.setUp();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/adapter/JsonMapAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/adapter/JsonMapAdapterTestCases.java
index 007d442..117172b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/adapter/JsonMapAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/adapter/JsonMapAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setClasses(new Class[]{RootObject.class});
}
+ @Override
protected Object getControlObject() {
RootObject ro = new RootObject();
ro.setTitle("title");
@@ -39,6 +40,7 @@
return ro;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/any/EmptyAnyCollectionNoRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/any/EmptyAnyCollectionNoRootTestCases.java
index 04e0ef5..d822160 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/any/EmptyAnyCollectionNoRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/any/EmptyAnyCollectionNoRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
return properties;
}
+ @Override
public Class getUnmarshalClass() {
return Root.class;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/any/NullAnyCollectionNoRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/any/NullAnyCollectionNoRootTestCases.java
index a18f056..8eed0db 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/any/NullAnyCollectionNoRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/any/NullAnyCollectionNoRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
return properties;
}
+ @Override
public Class getUnmarshalClass() {
return Root.class;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/BooleanArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/BooleanArrayTestCases.java
index 0193bca..3d13a90 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/BooleanArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/BooleanArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,12 +38,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
protected Object getControlObject() {
Boolean[] booleanArray = {true, null, false, null};
return booleanArray;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/BooleanListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/BooleanListTestCases.java
index 0cf2e4f..4867ad7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/BooleanListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/BooleanListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,12 +38,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
protected Object getControlObject() {
List<Boolean> booleanList = new ArrayList<>();
booleanList.add(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/IntegerArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/IntegerArrayTestCases.java
index d2fe29f..e4d6184 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/IntegerArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/IntegerArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,12 +35,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
protected Object getControlObject() {
int[] integerArray = {-78, 0, 33, 600};
return integerArray;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/IntegerListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/IntegerListTestCases.java
index d89896b..e7c36b4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/IntegerListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/IntegerListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,12 +37,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
protected Object getControlObject() {
List<Integer> integerList = new ArrayList<>();
integerList.add(-78);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/Nested2dArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/Nested2dArrayTestCases.java
index f5b789c..fe14b31 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/Nested2dArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/Nested2dArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,12 +34,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_DISABLE_NESTED_ARRAY_NAME, true);
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
protected Object getControlObject() {
Root2DArray root2DArray = new Root2DArray();
String[][] string2DArray = {{"aa", "bb"}, {"cc", "dd"}};
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/Nested3dArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/Nested3dArrayTestCases.java
index 63093e7..39dc5bb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/Nested3dArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/Nested3dArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,12 +34,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_DISABLE_NESTED_ARRAY_NAME, true);
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
protected Object getControlObject() {
Root3DArray root3DArray = new Root3DArray();
Integer[][][] int3DArray = {{{1, 2}, {3, 4}, {5, 6}}, {{7, 8}, {9, 10}, {11,12}}};
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/StringArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/StringArrayTestCases.java
index c9974a4..5a75107 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/StringArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/StringArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,12 +35,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
protected Object getControlObject() {
String[] stringArray = {"aaa", "bbb", "ccc", null};
return stringArray;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/StringListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/StringListTestCases.java
index 6f4f6b1..30f7389 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/StringListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/array/StringListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,12 +38,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
protected Object getControlObject() {
List<String> stringList = new ArrayList<>();
stringList.add("aaa");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementInheritanceTestCases.java
index 951fcc7..263fc51 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,10 +31,12 @@
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
public Class getUnmarshalClass(){
return AddressNoRoot.class;
}
+ @Override
protected Object getControlObject() {
MailingAddressNoRoot add = new MailingAddressNoRoot();
add.setId(10);
@@ -44,6 +46,7 @@
return add;
}
+ @Override
public Object getReadControlObject() {
JAXBElement jbe = new JAXBElement<AddressNoRoot>(new QName(""), AddressNoRoot.class, (AddressNoRoot)getControlObject());
return jbe;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementJAXBElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementJAXBElementTestCases.java
index e8e02e1..4a404e9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementJAXBElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementJAXBElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,21 +33,25 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
public Class getUnmarshalClass(){
return AddressNoRoot.class;
}
+ @Override
public Object getReadControlObject() {
JAXBElement jbe = new JAXBElement<AddressNoRoot>(new QName("street"), AddressNoRoot.class, new AddressNoRoot());
return jbe;
}
+ @Override
protected Object getJSONReadControlObject() {
JAXBElement jbe = new JAXBElement<AddressNoRoot>(new QName(""), AddressNoRoot.class, getAddress());
return jbe;
}
+ @Override
protected Object getControlObject() {
JAXBElement jbe = new JAXBElement<AddressNoRoot>(new QName(""), AddressNoRoot.class, getAddress());
return jbe;
@@ -64,6 +68,8 @@
return add;
}
+ @Override
public void testRoundTrip() throws Exception {}
+ @Override
public void testUnmarshallerHandler() throws Exception {}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementTestCases.java
index a9b065d..3fc7b9f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeNoXmlRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,21 +35,25 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
public Class getUnmarshalClass(){
return AddressNoRoot.class;
}
+ @Override
public Object getReadControlObject() {
JAXBElement jbe = new JAXBElement<AddressNoRoot>(new QName("street"), AddressNoRoot.class, new AddressNoRoot());
return jbe;
}
+ @Override
protected Object getJSONReadControlObject() {
JAXBElement jbe = new JAXBElement<AddressNoRoot>(new QName(""), AddressNoRoot.class, (AddressNoRoot) getControlObject());
return jbe;
}
+ @Override
protected Object getControlObject() {
AddressNoRoot add = new AddressNoRoot();
add.setId(10);
@@ -61,6 +65,7 @@
+ @Override
public void testXMLToObjectFromURL() throws Exception {
if(isUnmarshalTest()) {
java.net.URL url = ClassLoader.getSystemResource(resourceName);
@@ -68,7 +73,7 @@
Object testObject = null;
if(getUnmarshalClass() != null){
- testObject = ((JAXBUnmarshaller)jaxbUnmarshaller).unmarshal(new StreamSource(url.openStream()), getUnmarshalClass());
+ testObject = jaxbUnmarshaller.unmarshal(new StreamSource(url.openStream()), getUnmarshalClass());
}else{
testObject = jaxbUnmarshaller.unmarshal(url);
}
@@ -76,6 +81,8 @@
}
}
+ @Override
public void testRoundTrip() throws Exception {}
+ @Override
public void testUnmarshallerHandler() throws Exception {}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeOrderAttributeFirstTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeOrderAttributeFirstTestCases.java
index c750f04..a0cf7b3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeOrderAttributeFirstTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeOrderAttributeFirstTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setClasses(new Class[]{AddressElementAttributeOrder.class});
}
+ @Override
protected Object getControlObject() {
AddressElementAttributeOrder add = new AddressElementAttributeOrder();
add.id = "10";
@@ -37,6 +38,7 @@
return add;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeOrderElementFirstTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeOrderElementFirstTestCases.java
index 31d8ebc..3df823d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeOrderElementFirstTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributeOrderElementFirstTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(new Class[]{AddressElementAttributeOrder.class});
}
+ @Override
protected Object getControlObject() {
AddressElementAttributeOrder add = new AddressElementAttributeOrder();
add.id = "10";
@@ -39,6 +40,7 @@
return add;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixEmptyStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixEmptyStringTestCases.java
index eb88439..4bf448e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixEmptyStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixEmptyStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setClasses(new Class[]{Address.class});
}
+ @Override
protected Object getControlObject() {
Address add = new Address();
add.setId(10);
@@ -38,6 +39,7 @@
return add;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixOnContextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixOnContextTestCases.java
index 11201c8..f5a628b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixOnContextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixOnContextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
}
+ @Override
protected Object getControlObject() {
Address add = new Address();
add.setId(10);
@@ -49,6 +50,7 @@
return add;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixOnMarshallerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixOnMarshallerTestCases.java
index 3cf9e0c..2c2d7c4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixOnMarshallerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/JSONAttributePrefixOnMarshallerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
//this should override the properties set on the context in getProperties (called during inherited c-tor setClasses call)
@@ -41,6 +42,7 @@
}
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "CONTEXT_PREFIX");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/SimpleBeanAttrNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/SimpleBeanAttrNullTestCases.java
index bdc3388..ff3d6bd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/SimpleBeanAttrNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/attribute/SimpleBeanAttrNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,22 +39,26 @@
jaxbMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
public Class getUnmarshalClass(){
return SimpleBean.class;
}
+ @Override
public Object getReadControlObject() {
JAXBElement jbe = new JAXBElement<SimpleBean>(new QName("simpleBean"), SimpleBean.class, new SimpleBean());
return jbe;
}
+ @Override
protected Object getJSONReadControlObject() {
JAXBElement jbe = new JAXBElement<SimpleBean>(new QName(""), SimpleBean.class, new SimpleBean());
return jbe;
}
+ @Override
protected Object getControlObject() {
SimpleBean sb = new SimpleBean();
sb.setAttr2("");
@@ -62,6 +66,7 @@
return sb;
}
+ @Override
public void testUnmarshallerHandler() throws Exception {}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/EscapeCharactersTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/EscapeCharactersTestCases.java
index 33ca547..70ce66d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/EscapeCharactersTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/EscapeCharactersTestCases.java
@@ -28,6 +28,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
EscapeCharacterHolder holder = new EscapeCharacterHolder();
@@ -61,6 +62,7 @@
return holder;
}
+ @Override
protected void compareStrings(String test, String testString, String expectedString, boolean removeWhitespace) {
log(test);
log("Expected (With All Whitespace Removed):");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/UsAsciiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/UsAsciiTestCases.java
index 8af262a..af7183a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/UsAsciiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/characters/UsAsciiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,10 +54,12 @@
return control;
}
+ @Override
public void testJSONMarshalToBuilderResult() throws Exception{
//Currently not supported
}
+ @Override
public void testJSONMarshalToGeneratorResult() throws Exception{
//Currently not supported
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/emptyroot/EmptyNullMarshalUnmarshalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/emptyroot/EmptyNullMarshalUnmarshalTestCases.java
index f325c6e..fc3cd27 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/emptyroot/EmptyNullMarshalUnmarshalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/emptyroot/EmptyNullMarshalUnmarshalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
Map<String, Object> props = new HashMap<String, Object>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/multiline/MultiLineStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/multiline/MultiLineStringTestCases.java
index b7595fe..a0f64eb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/multiline/MultiLineStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/multiline/MultiLineStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
setClasses(new Class[]{MultiBean.class});
}
+ @Override
protected Object getControlObject() {
MultiBean tb = new MultiBean();
tb.setName("abcrr\n" + "\n" + "d");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/DifferentNamespacesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/DifferentNamespacesTestCases.java
index ac0ad64..a9bab09 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/DifferentNamespacesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/DifferentNamespacesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[]{Person.class});
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.setId(10);
@@ -57,6 +58,7 @@
}
+ @Override
public void setUp() throws Exception{
super.setUp();
@@ -82,6 +84,7 @@
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceSeparatorContextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceSeparatorContextTestCases.java
index 176d0ee..9f3af0f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceSeparatorContextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceSeparatorContextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_NAMESPACE_SEPARATOR, '#');
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceSeparatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceSeparatorTestCases.java
index c353ced..3ea6210 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceSeparatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceSeparatorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_NAMESPACE_SEPARATOR, '#');
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceTestCases.java
index ee30bc7..6ccb330 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespaceInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,11 +40,13 @@
setClasses(new Class[]{Employee.class});
}
+ @Override
protected Object getControlObject() {
Employee emp = getEmployee();
return emp;
}
+ @Override
public Object getWriteControlObject() {
Employee emp = getEmployee();
@@ -73,6 +75,7 @@
return emp;
}
+ @Override
public void setUp() throws Exception{
super.setUp();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespacesOnContextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespacesOnContextTestCases.java
index 5037eb6..2c080ce 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespacesOnContextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespacesOnContextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setClasses(new Class[]{Person.class});
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.setId(10);
@@ -58,6 +59,7 @@
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespacesOnUnmarshalOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespacesOnUnmarshalOnlyTestCases.java
index 782540a..29a11eb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespacesOnUnmarshalOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/NamespacesOnUnmarshalOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(new Class[]{Person.class});
}
+ @Override
public void setUp() throws Exception{
super.setUp();
try {
@@ -53,6 +54,7 @@
}
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.setId(10);
@@ -73,6 +75,7 @@
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/SeparatorInNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/SeparatorInNameTestCases.java
index 2793c5f..3df23c5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/SeparatorInNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/namespaces/SeparatorInNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(new Class[]{Person.class});
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.setId(10);
@@ -58,6 +59,7 @@
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/nil/NilElementsUsageTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/nil/NilElementsUsageTestCases.java
index ef592e2..b8619ae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/nil/NilElementsUsageTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/nil/NilElementsUsageTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setClasses(new Class[]{MaskFormat.class, MaskFormatEntry.class});
}
+ @Override
protected Object getControlObject() {
MaskFormat maskFormat = new MaskFormat();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootFalseWithXMLRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootFalseWithXMLRootElementTestCases.java
index 3782698..5784f4b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootFalseWithXMLRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootFalseWithXMLRootElementTestCases.java
@@ -35,12 +35,14 @@
setClasses(new Class[]{AddressWithRootElement.class});
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
public Object getControlObject() {
AddressWithRootElement addr = new AddressWithRootElement();
addr.setId(10);
@@ -55,6 +57,7 @@
return AddressWithRootElement.class;
}
+ @Override
public Object getReadControlObject(){
QName name = new QName("");
JAXBElement jbe = new JAXBElement<AddressWithRootElement>(name, AddressWithRootElement.class, (AddressWithRootElement)getControlObject());
@@ -62,6 +65,7 @@
}
+ @Override
public void testJSONSchemaGeneration() throws Exception{
generateJSONSchema(getClass().getClassLoader().getResourceAsStream(JSON_SCHEMA));
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootTrueWithXMLRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootTrueWithXMLRootElementTestCases.java
index 3e3d3bd..f445859 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootTrueWithXMLRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/IncludeRootTrueWithXMLRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setClasses(new Class[]{AddressWithRootElement.class});
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, true);
@@ -40,12 +41,14 @@
return Address.class;
}
+ @Override
public Object getReadControlObject() {
QName name = new QName("addressWithRootElement");
JAXBElement jbe = new JAXBElement<AddressWithRootElement>(name, AddressWithRootElement.class, (AddressWithRootElement)getControlObject());
return jbe;
}
+ @Override
public void testJSONSchemaGeneration() throws Exception{
//not yet supported
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/InheritanceNoRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/InheritanceNoRootTestCases.java
index 97b7be2..2d69b1f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/InheritanceNoRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/InheritanceNoRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setControlDocument(XML_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jaxbMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
@@ -46,6 +47,7 @@
initXsiType();
}
+ @Override
protected Object getJSONReadControlObject() {
Customer c = new Customer();
@@ -57,6 +59,7 @@
return jbe;
}
+ @Override
protected Object getControlObject() {
Customer c = new Customer();
c.name = "theName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/NoRootElementNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/NoRootElementNSTestCases.java
index 05b5826..297b0dd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/NoRootElementNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/NoRootElementNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
}
+ @Override
public Object getControlObject() {
Address addr = new Address();
addr.setId(10);
@@ -47,12 +48,14 @@
return Address.class;
}
+ @Override
public Object getReadControlObject(){
QName name = new QName("");
JAXBElement jbe = new JAXBElement<Address>(name, Address.class, (Address)getControlObject());
return jbe;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/NoRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/NoRootElementTestCases.java
index 8f785e0..e19d132 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/NoRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/norootelement/NoRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(new Class[]{Address.class});
}
+ @Override
public Object getControlObject() {
Address addr = new Address();
addr.setId(10);
@@ -45,6 +46,7 @@
return Address.class;
}
+ @Override
public Object getReadControlObject(){
QName name = new QName("addressWithRootElement");
JAXBElement jbe = new JAXBElement<Address>(name, Address.class, (Address)getControlObject());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/numbers/NumberFormatTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/numbers/NumberFormatTestCases.java
index bce9d2e..0b998b4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/numbers/NumberFormatTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/numbers/NumberFormatTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setWriteControlDocument(XML_RESOURCE_WRITE);
}
+ @Override
protected Object getControlObject() {
NumberHolder nh = new NumberHolder();
nh.intTest = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JAXBElementJSONPaddingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JAXBElementJSONPaddingTestCases.java
index 4a7fbf8..4187e23 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JAXBElementJSONPaddingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JAXBElementJSONPaddingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,13 +44,16 @@
return test;
}
+ @Override
public boolean isUnmarshalTest (){
return false;
}
+ @Override
public void testJSONMarshalToBuilderResult() throws Exception{
}
+ @Override
public void testJSONMarshalToGeneratorResult() throws Exception{
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JAXBElementListJSONPaddingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JAXBElementListJSONPaddingTestCases.java
index a31407e..7e2d7ce 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JAXBElementListJSONPaddingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JAXBElementListJSONPaddingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,9 +60,11 @@
return false;
}
+ @Override
public void testJSONMarshalToBuilderResult() throws Exception{
}
+ @Override
public void testJSONMarshalToGeneratorResult() throws Exception{
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithNullNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithNullNameTestCases.java
index 12ef930..43b108b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithNullNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithNullNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,13 +41,16 @@
return test;
}
+ @Override
public boolean isUnmarshalTest (){
return false;
}
+ @Override
public void testJSONMarshalToBuilderResult() throws Exception{
}
+ @Override
public void testJSONMarshalToGeneratorResult() throws Exception{
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithNullObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithNullObjectTestCases.java
index 24155f3..6f8de7b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithNullObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithNullObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,13 +45,16 @@
return test;
}
+ @Override
public boolean isUnmarshalTest (){
return false;
}
+ @Override
public void testJSONMarshalToBuilderResult() throws Exception{
}
+ @Override
public void testJSONMarshalToGeneratorResult() throws Exception{
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithPaddingSimpleListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithPaddingSimpleListTestCases.java
index b8c0d99..864f273 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithPaddingSimpleListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithPaddingSimpleListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,9 +57,11 @@
return false;
}
+ @Override
public void testJSONMarshalToBuilderResult() throws Exception{
}
+ @Override
public void testJSONMarshalToGeneratorResult() throws Exception{
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithPaddingSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithPaddingSimpleTestCases.java
index 83a1336..549e300 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithPaddingSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithPaddingSimpleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,17 +43,21 @@
return test;
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
+ @Override
public boolean isUnmarshalTest (){
return false;
}
+ @Override
public void testJSONMarshalToBuilderResult() throws Exception{
}
+ @Override
public void testJSONMarshalToGeneratorResult() throws Exception{
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithUnsetNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithUnsetNameTestCases.java
index ed12386..915b750 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithUnsetNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/padding/JSONWithUnsetNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,13 +41,16 @@
return test;
}
+ @Override
public boolean isUnmarshalTest (){
return false;
}
+ @Override
public void testJSONMarshalToBuilderResult() throws Exception{
}
+ @Override
public void testJSONMarshalToGeneratorResult() throws Exception{
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithXmlRootElementJAXBElementNoRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithXmlRootElementJAXBElementNoRootTestCases.java
index 5706b7a..89693f8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithXmlRootElementJAXBElementNoRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithXmlRootElementJAXBElementNoRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
public Class getUnmarshalClass(){
return WithXmlRootElementRoot.class;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithXmlRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithXmlRootElementTestCases.java
index 1e87df6..2b23634 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithXmlRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithXmlRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,10 +55,12 @@
assertEquals(0, test.size());
}
+ @Override
protected boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
+ @Override
public String getWriteControlJSONFormatted(){
return CONTROL_JSON_FORMATTED;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithoutXmlRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithoutXmlRootElementTestCases.java
index c77cdb6..9456d7b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithoutXmlRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/rootlevellist/WithoutXmlRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -81,10 +81,12 @@
assertEquals(0, test.size());
}
+ @Override
protected boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
+ @Override
public String getWriteControlJSONFormatted(){
return CONTROL_JSON_FORMATTED;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypeNameValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypeNameValueTestCases.java
index 16395c2..2ad1104 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypeNameValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypeNameValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
@@ -58,7 +59,7 @@
try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(JSON_RESOURCE)) {
- Properties properties = (Properties) jsonUnmarshaller.unmarshal(new StreamSource(is), Properties.class).getValue();
+ Properties properties = jsonUnmarshaller.unmarshal(new StreamSource(is), Properties.class).getValue();
assertEquals(buildProperties(), properties);
}
@@ -72,6 +73,7 @@
return jbe;
}
+ @Override
protected Object getControlObject() {
return buildProperties();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePrefixTestCases.java
index 0bc896f..88ef1d9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
@@ -66,6 +67,7 @@
return jbe;
}
+ @Override
protected Object getControlObject() {
Customer c = new Customer();
c.name = "theName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyCustomNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyCustomNameTestCases.java
index 055dd3d..26e508a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyCustomNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyCustomNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
}
@@ -64,6 +65,7 @@
assertEquals("mytype", jsonUnmarshaller.getProperty(MarshallerProperties.JSON_TYPE_ATTRIBUTE_NAME));
}
+ @Override
protected Object getControlObject() {
Address a = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyInheritanceTestCases.java
index b93a782..1b044b1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
@@ -67,6 +68,7 @@
return jbe;
}
+ @Override
protected Object getControlObject() {
CustomerWithInheritance c = new CustomerWithInheritance();
c.name = "theName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyTestCases.java
index 5e85e16..4d9377d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/type/TypePropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jsonMarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false);
@@ -67,6 +68,7 @@
return jbe;
}
+ @Override
protected Object getControlObject() {
PersonWithType c = new PersonWithType();
c.name = "theName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameEmptyPresentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameEmptyPresentTestCases.java
index 4134139..8f6dd0f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameEmptyPresentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameEmptyPresentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setControlJSON(JSON);
}
+ @Override
public JAXBElement<Company> getControlObject() {
Company company = new Company();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameNullAbsentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameNullAbsentTestCases.java
index cd33b18..fb3f09f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameNullAbsentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameNullAbsentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setControlJSON(JSON);
}
+ @Override
public JAXBElement<Company> getControlObject() {
Company company = new Company();
company.strings = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameSingleItemTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameSingleItemTestCases.java
index be21688..a7927f8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameSingleItemTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameSingleItemTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setControlJSON(JSON);
}
+ @Override
public JAXBElement<Company> getControlObject() {
Company company = new Company();
company.strings.add("FOO");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameTestCases.java
index fca89f7..44191ee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setControlJSON(JSON);
}
+ @Override
public JAXBElement<Company> getControlObject() {
Company company = new Company();
company.strings.add("FOO");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNamespaceTestCases.java
index 610749c..cab95ab 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setControlJSON(JSON);
}
+ @Override
public JAXBElement<Company> getControlObject() {
Company company = new Company();
company.strings.add("FOO");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperXmlPathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperXmlPathTestCases.java
index 3582b82..eb0f98d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperXmlPathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/wrapper/WrapperXmlPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setControlJSON(JSON);
}
+ @Override
public JAXBElement<XmlPathCompany> getControlObject() {
XmlPathCompany company = new XmlPathCompany();
company.strings.add("FOO");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropDifferentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropDifferentTestCases.java
index 3b0ca23..e51cdaa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropDifferentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropDifferentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setWriteControlJSON(JSON_WRITE_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jaxbMarshaller.setProperty(MarshallerProperties.JSON_VALUE_WRAPPER, "marshalWrapper");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropTestCases.java
index f6cd0ae..da45466 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setControlDocument(XML_RESOURCE);
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_VALUE_WRAPPER, "valuewrapper");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropValueFirstInJSONTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropValueFirstInJSONTestCases.java
index 3d4948e..97f0fbc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropValueFirstInJSONTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/json/xmlvalue/XMLValuePropValueFirstInJSONTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setWriteControlJSON(JSON_WRITE_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jaxbMarshaller.setProperty(MarshallerProperties.JSON_VALUE_WRAPPER, "marshalWrapper");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/ClassWithInnerClass.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/ClassWithInnerClass.java
index 210dfcc..3954846 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/ClassWithInnerClass.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/ClassWithInnerClass.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,12 +31,13 @@
return true;
}
+ @Override
public int compareTo(MyInner o) {
if(o.innerName == null){
return 0;
}else{
int thisFirstChar = innerName.charAt(0);
- int firstChar = ((MyInner)o).innerName.charAt(0);
+ int firstChar = o.innerName.charAt(0);
if(firstChar == thisFirstChar){
return 0;
}else if(thisFirstChar < firstChar){
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/Employee.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/Employee.java
index 40b6986..8df7d84 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/Employee.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -102,6 +102,7 @@
this.id = id;
}
+ @Override
public int compareTo(Object o) {
if (this.id < ((Employee) o).getId()) {
return -1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBArrayOfInnerClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBArrayOfInnerClassTestCases.java
index 203231d..a272585 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBArrayOfInnerClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBArrayOfInnerClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
initXsiType();
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
return getClass().getField("myArray").getType();
}
@@ -59,6 +60,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
MyInner myInner1 = new MyInner();
myInner1.innerName = "aaa";
@@ -76,6 +78,7 @@
return jaxbElement;
}
+ @Override
public List<InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/innerClassArray.xsd");
List<InputStream> controlSchema = new ArrayList<InputStream>();
@@ -83,6 +86,7 @@
return controlSchema;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBArrayTestCases.java
index 860bc30..473ab10 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
BigInteger[] bigIntegers = new BigInteger[4];
bigIntegers[0] = new BigInteger("1");
@@ -73,6 +74,7 @@
return jaxbElement;
}
+ @Override
public List<InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/arrays.xsd");
List<InputStream> controlSchema = new ArrayList<InputStream>();
@@ -80,10 +82,12 @@
return controlSchema;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
return BigInteger[].class;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBBigDecimalStackTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBBigDecimalStackTestCases.java
index 6b00a46..65ed343 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBBigDecimalStackTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBBigDecimalStackTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
init();
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = getClass().getField("test");
return fld.getGenericType();
@@ -59,6 +60,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
Stack<BigDecimal> bigDecimals = new Stack<BigDecimal>();
bigDecimals.push(new BigDecimal("2"));
@@ -74,6 +76,7 @@
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/bigDecimalStack.xsd");
@@ -82,6 +85,7 @@
return controlSchema;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBBooleanArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBBooleanArrayTestCases.java
index 01c23ec..f675180 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBBooleanArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBBooleanArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/booleanArray.xsd");
@@ -61,10 +62,12 @@
return controlSchema;
}
+ @Override
protected Type getTypeToUnmarshalTo() {
return boolean[].class;
}
+ @Override
protected Object getControlObject() {
boolean[] booleans = new boolean[4];
booleans[0] = Boolean.FALSE.booleanValue();
@@ -89,6 +92,7 @@
}
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBByteArrayWithDataHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBByteArrayWithDataHandlerTestCases.java
index c7fb507..4aef840 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBByteArrayWithDataHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBByteArrayWithDataHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,14 +62,19 @@
return XML_RESOURCE;
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
}
+ @Override
public void testXMLToObjectFromStreamSource() throws Exception {
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBCharArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBCharArrayTestCases.java
index 60f6b98..6a2ec1e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBCharArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBCharArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
return namespaces;
}
+ @Override
public List<InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/charArray.xsd");
@@ -59,10 +60,12 @@
return controlSchema;
}
+ @Override
protected Type getTypeToUnmarshalTo() {
return char[].class;
}
+ @Override
protected Object getControlObject() {
char[] chars = new char[4];
chars[0] = 'a';
@@ -87,6 +90,7 @@
}
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeArrayListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeArrayListTestCases.java
index 2283bde..bf511ce 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeArrayListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeArrayListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
super(name);
}
+ @Override
public List<InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/arrayListEmployee.xsd");
@@ -41,6 +42,7 @@
}
+ @Override
public void init() throws Exception {
setControlDocument(XML_RESOURCE);
Type[] types = new Type[1];
@@ -48,11 +50,13 @@
setTypes(types);
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = ListofObjects.class.getField("empArrayList");
return fld.getGenericType();
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeArrayTestCases.java
index cde35e3..f8649d9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,6 +65,7 @@
return namespaces;
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/employeeArray.xsd");
@@ -73,6 +74,7 @@
return controlSchema;
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -114,10 +116,12 @@
return jaxbElement;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
return Employee[].class;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeListTestCases.java
index 92da59b..8d44c9e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
super(name);
}
+ @Override
public void init() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -54,11 +55,13 @@
return namespaces;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = ListofObjects.class.getField("empList");
return fld.getGenericType();
}
+ @Override
public List<InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/listEmployee.xsd");
@@ -69,6 +72,7 @@
return controlSchema;
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -110,6 +114,7 @@
return jaxbElement;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeTreeSetTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeTreeSetTestCases.java
index 5a8f1a6..b3d6ce2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeTreeSetTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeeTreeSetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
super(name);
}
+ @Override
public void init() throws Exception {
setControlDocument(XML_RESOURCE);
Field fld = ListofObjects.class.getField("empTreeSet");
@@ -52,12 +53,14 @@
return controlSchema;
}
*/
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = ListofObjects.class.getField("empTreeSet");
return fld.getGenericType();
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -100,6 +103,7 @@
return jaxbElement;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeesAndIntegersTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeesAndIntegersTestCases.java
index 2c0e49a..1547e48 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeesAndIntegersTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBEmployeesAndIntegersTestCases.java
@@ -64,6 +64,7 @@
return namespaces;
}
+ @Override
protected Type getTypeToUnmarshalTo() {
try{
@@ -75,6 +76,7 @@
return null;
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream3 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/employeesAndIntegers3.xsd");
InputStream instream1 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/employeesAndIntegers1.xsd");
@@ -89,6 +91,7 @@
}
+ @Override
protected Object getControlObject() {
List<Integer> integers = new ArrayList<Integer>();
integers.add(Integer.valueOf("10"));
@@ -103,6 +106,7 @@
return jaxbElement;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBInt2DArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBInt2DArrayTestCases.java
index 2749bb6..2be3b68 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBInt2DArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBInt2DArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
return namespaces;
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/int2DArray.xsd");
@@ -60,10 +61,12 @@
return controlSchema;
}
+ @Override
protected Type getTypeToUnmarshalTo() {
return int[][].class;
}
+ @Override
protected Object getControlObject() {
int[][] my2DArray = new int[2][];
my2DArray[0] = new int[] {1,2,3};
@@ -74,6 +77,7 @@
return jaxbElement;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntArrayTestCases.java
index b995cf0..6679da9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
return namespaces;
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/intArray.xsd");
@@ -62,10 +63,12 @@
return controlSchema;
}
+ @Override
protected Type getTypeToUnmarshalTo() {
return int[].class;
}
+ @Override
protected Object getControlObject() {
int[] ints = new int[4];
ints[0] = 10;
@@ -92,6 +95,7 @@
// fail("NEED TO COMPARE PRIMITIVE ARRAYS");
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntListTestCases.java
index 73b6284..2c1589c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,13 +30,17 @@
super(name);
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
if(typeToUnmarshalTo == null){
Type listOfInts = new ParameterizedType() {
Type[] typeArgs = {int.class};
+ @Override
public Type[] getActualTypeArguments() { return typeArgs;}
+ @Override
public Type getOwnerType() { return null; }
+ @Override
public Type getRawType() { return List.class; }
};
typeToUnmarshalTo = listOfInts;
@@ -44,6 +48,7 @@
return typeToUnmarshalTo;
}
+ @Override
protected Object getControlObject() {
ArrayList<Integer> integers = new ArrayList<Integer>();
integers.add(10);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBInteger3DArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBInteger3DArrayTestCases.java
index 6cac6a7..52a9516 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBInteger3DArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBInteger3DArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/integer3DArray.xsd");
@@ -61,10 +62,12 @@
return controlSchema;
}
+ @Override
protected Type getTypeToUnmarshalTo() {
return Integer[][][].class;
}
+ @Override
protected Object getControlObject() {
int level1Size = 2;
int level2Size = 3;
@@ -83,6 +86,7 @@
return jaxbElement;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerArrayTestCases.java
index d843d78..1de9157 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
init();
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
return Integer[].class;
}
@@ -56,6 +57,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
Integer[] integers = new Integer[4];
integers[0] = 10;
@@ -71,6 +73,7 @@
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/integerArray.xsd");
@@ -79,6 +82,7 @@
return controlSchema;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerLinkedListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerLinkedListTestCases.java
index 79a52ab..8dd9d2f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerLinkedListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerLinkedListTestCases.java
@@ -43,6 +43,7 @@
initXsiType();
}
+ @Override
public void init() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -52,11 +53,13 @@
setTypes(types);
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = ListofObjects.class.getField("integerLinkedList");
return fld.getGenericType();
}
+ @Override
protected Object getControlObject() {
LinkedList<Integer> integers = new LinkedList<Integer>();
integers.add(Integer.valueOf("10"));
@@ -71,6 +74,7 @@
return jaxbElement;
}
+ @Override
public List<InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/linkedListInteger.xsd");
@@ -81,6 +85,7 @@
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerListTestCases.java
index 62f5074..a294637 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerListTestCases.java
@@ -34,6 +34,7 @@
super(name);
}
+ @Override
public void init() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -51,11 +52,13 @@
return namespaces;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = ListofObjects.class.getField("integerList");
return fld.getGenericType();
}
+ @Override
protected Object getControlObject() {
ArrayList<Integer> integers = new ArrayList<Integer>();
integers.add(Integer.valueOf("10"));
@@ -70,6 +73,7 @@
return jaxbElement;
}
+ @Override
public List<InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/listInteger.xsd");
@@ -80,6 +84,7 @@
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerMyListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerMyListTestCases.java
index b77310c..89b55b8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerMyListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBIntegerMyListTestCases.java
@@ -37,6 +37,7 @@
super(name);
}
+ @Override
public void init() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -54,11 +55,13 @@
return namespaces;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = getClass().getField("integerMyList");
return fld.getGenericType();
}
+ @Override
protected Object getControlObject() {
MyList<Integer> integers = new MyList<Integer>();
integers.add(Integer.valueOf("10"));
@@ -73,6 +76,7 @@
return jaxbElement;
}
+ @Override
public List<InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/integerMyList.xsd");
@@ -83,6 +87,7 @@
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployee2TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployee2TestCases.java
index 8f2c4ec..dc4a724 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployee2TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployee2TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -108,6 +109,7 @@
return jaxbElement;
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream2 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/employeeCollision2.xsd");
InputStream instream1 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/employeeCollision1.xsd");
@@ -120,14 +122,17 @@
}
+ @Override
protected Type getTypeToUnmarshalTo() {
return org.eclipse.persistence.testing.jaxb.employee.Employee[].class;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
+ @Override
public Map getProperties() {
Map props = new HashMap();
props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "listOfObjectsNamespace");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployeeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployeeTestCases.java
index 8945ec2..6736be2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployeeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListNameCollisionEmployeeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -98,6 +99,7 @@
return jaxbElement;
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream2 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/employeeCollision2.xsd");
InputStream instream1 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/employeeCollision1.xsd");
@@ -109,15 +111,18 @@
return controlSchema;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = ListofObjects.class.getField("empList");
return fld.getGenericType();
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
+ @Override
public Map getProperties() {
Map props = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfInnerClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfInnerClassTestCases.java
index 69b6cb4..2939694 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfInnerClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfInnerClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
return namespaces;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
return getClass().getField("myList").getGenericType();
}
@@ -60,6 +61,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
MyInner myInner1 = new MyInner();
myInner1.innerName = "aaa";
@@ -77,6 +79,7 @@
return jaxbElement;
}
+ @Override
public List<InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/innerClassList.xsd");
List<InputStream> controlSchema = new ArrayList<InputStream>();
@@ -84,10 +87,12 @@
return controlSchema;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
+ @Override
public Map getProperties() {
Map props = new HashMap();
props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "listOfObjectsNamespace");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java
index 5b67121..141a1c6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNoJSONTestCases.java
@@ -51,15 +51,17 @@
super(name);
}
+ @Override
public void setClasses(Class[] newClasses) throws Exception {
classLoader = new JaxbClassLoader(Thread.currentThread()
.getContextClassLoader());
JAXBContextFactory factory = new JAXBContextFactory();
- jaxbContext = factory.createContext(newClasses, null, classLoader);
+ jaxbContext = JAXBContextFactory.createContext(newClasses, null, classLoader);
jaxbMarshaller = jaxbContext.createMarshaller();
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
}
+ @Override
public void setTypes(Type[] newTypes) throws Exception {
classLoader = new JaxbClassLoader(Thread.currentThread()
.getContextClassLoader());
@@ -78,15 +80,17 @@
}
types = newTypes;
- jaxbContext = factory.createContext(newTypes, props, classLoader);
+ jaxbContext = JAXBContextFactory.createContext(newTypes, props, classLoader);
jaxbMarshaller = jaxbContext.createMarshaller();
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
}
+ @Override
protected Object getControlObject() {
return null;
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -127,7 +131,7 @@
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
XMLStreamReader xmlStreamReader = XML_INPUT_FACTORY.createXMLStreamReader(instream);
- Object testObject = ((JAXBUnmarshaller)jaxbUnmarshaller).unmarshal(xmlStreamReader, getClassForDeclaredTypeOnUnmarshal());
+ Object testObject = jaxbUnmarshaller.unmarshal(xmlStreamReader, getClassForDeclaredTypeOnUnmarshal());
instream.close();
JAXBElement controlObj = (JAXBElement)getControlObject();
@@ -137,6 +141,7 @@
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -175,7 +180,7 @@
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLEventReader reader = XML_INPUT_FACTORY.createXMLEventReader(instream);
- Object obj = ((JAXBUnmarshaller)jaxbUnmarshaller).unmarshal(reader, getClassForDeclaredTypeOnUnmarshal());
+ Object obj = jaxbUnmarshaller.unmarshal(reader, getClassForDeclaredTypeOnUnmarshal());
JAXBElement controlObj = (JAXBElement)getControlObject();
JAXBElement newControlObj = new JAXBElement(controlObj.getName(), getClassForDeclaredTypeOnUnmarshal(), controlObj.getScope(), controlObj.getValue());
@@ -183,6 +188,7 @@
}
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
if(isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -198,7 +204,7 @@
if(isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
Node node = parser.parse(instream);
- Object obj = ((JAXBUnmarshaller)jaxbUnmarshaller).unmarshal(node, getClassForDeclaredTypeOnUnmarshal());
+ Object obj = jaxbUnmarshaller.unmarshal(node, getClassForDeclaredTypeOnUnmarshal());
JAXBElement controlObj = (JAXBElement)getControlObject();
JAXBElement newControlObj = new JAXBElement(controlObj.getName(), getClassForDeclaredTypeOnUnmarshal(), controlObj.getScope(), controlObj.getValue());
@@ -208,6 +214,7 @@
}
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
@@ -225,6 +232,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLStreamWriterRecord() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
@@ -243,6 +251,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLEventWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
@@ -310,6 +319,7 @@
//Override and don't compare namespaceresolver size
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
@@ -325,6 +335,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToOutputStream() throws Exception {
Object objectToWrite = getWriteControlObject();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -339,6 +350,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToOutputStreamASCIIEncoding() throws Exception {
Object objectToWrite = getWriteControlObject();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -357,12 +369,14 @@
}
+ @Override
public void testRoundTrip() throws Exception {
//This test is not applicable because to Marshal we need a specialized jaxbelement
}
//Override and don't compare namespaceresolver size
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
Object objectToWrite = getWriteControlObject();
@@ -382,6 +396,7 @@
}
//Override and don't compare namespaceresolver size
+ @Override
public void testObjectToXMLDocument() throws Exception {
Object objectToWrite = getWriteControlObject();
@@ -416,6 +431,7 @@
testSchemaGen(getControlSchemaFiles());
}
+ @Override
public Object getWriteControlObject(){
JAXBElement jaxbElement = (JAXBElement)getControlObject();
@@ -453,6 +469,7 @@
protected abstract String getNoXsiTypeControlResourceName();
+ @Override
public void xmlToObjectTest(Object testObject, Object controlObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNonRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNonRootTestCases.java
index 82842bd..9ae6366 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNonRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsNonRootTestCases.java
@@ -49,11 +49,13 @@
init();
}
+ @Override
public void setUp() throws Exception{
super.setUp();
getXMLComparer().setIgnoreOrder(true);
}
+ @Override
public void tearDown(){
super.tearDown();
getXMLComparer().setIgnoreOrder(false);
@@ -68,6 +70,7 @@
setClasses(classes);
}
+ @Override
public List<InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/listofobjects.xsd");
@@ -77,6 +80,7 @@
return controlSchema;
}
+ @Override
protected Object getControlObject() {
ListofObjects listofObjects = new ListofObjects();
@@ -169,6 +173,7 @@
return jaxbElement;
}
+ @Override
protected Type getTypeToUnmarshalTo() {
return ListofObjects.class;
}
@@ -210,6 +215,7 @@
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java
index be9f719..1d9a335 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsTestCases.java
@@ -53,16 +53,18 @@
super(name);
}
+ @Override
public void setClasses(Class[] newClasses) throws Exception {
classLoader = new JaxbClassLoader(Thread.currentThread()
.getContextClassLoader());
JAXBContextFactory factory = new JAXBContextFactory();
- jaxbContext = factory.createContext(newClasses, getProperties(), classLoader);
+ jaxbContext = JAXBContextFactory.createContext(newClasses, getProperties(), classLoader);
jaxbMarshaller = jaxbContext.createMarshaller();
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
this.classes = newClasses;
}
+ @Override
public void setTypes(Type[] newTypes) throws Exception {
classLoader = new JaxbClassLoader(Thread.currentThread()
.getContextClassLoader());
@@ -81,16 +83,18 @@
}
- jaxbContext = factory.createContext(newTypes, props, classLoader);
+ jaxbContext = JAXBContextFactory.createContext(newTypes, props, classLoader);
jaxbMarshaller = jaxbContext.createMarshaller();
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
types = newTypes;
}
+ @Override
protected Object getControlObject() {
return null;
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -131,7 +135,7 @@
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
XMLStreamReader xmlStreamReader = XML_INPUT_FACTORY.createXMLStreamReader(instream);
- Object testObject = ((JAXBUnmarshaller)jaxbUnmarshaller).unmarshal(xmlStreamReader, getClassForDeclaredTypeOnUnmarshal());
+ Object testObject = jaxbUnmarshaller.unmarshal(xmlStreamReader, getClassForDeclaredTypeOnUnmarshal());
instream.close();
JAXBElement controlObj = (JAXBElement)getControlObject();
@@ -141,6 +145,7 @@
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -179,7 +184,7 @@
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
javax.xml.stream.XMLEventReader reader = XML_INPUT_FACTORY.createXMLEventReader(instream);
- Object obj = ((JAXBUnmarshaller)jaxbUnmarshaller).unmarshal(reader, getClassForDeclaredTypeOnUnmarshal());
+ Object obj = jaxbUnmarshaller.unmarshal(reader, getClassForDeclaredTypeOnUnmarshal());
JAXBElement controlObj = (JAXBElement)getControlObject();
JAXBElement newControlObj = new JAXBElement(controlObj.getName(), getClassForDeclaredTypeOnUnmarshal(), controlObj.getScope(), controlObj.getValue());
@@ -187,6 +192,7 @@
}
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
if(isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -202,7 +208,7 @@
if(isUnmarshalTest()) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
Node node = parser.parse(instream);
- Object obj = ((JAXBUnmarshaller)jaxbUnmarshaller).unmarshal(node, getClassForDeclaredTypeOnUnmarshal());
+ Object obj = jaxbUnmarshaller.unmarshal(node, getClassForDeclaredTypeOnUnmarshal());
JAXBElement controlObj = (JAXBElement)getControlObject();
JAXBElement newControlObj = new JAXBElement(controlObj.getName(), getClassForDeclaredTypeOnUnmarshal(), controlObj.getScope(), controlObj.getValue());
@@ -212,6 +218,7 @@
}
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
@@ -229,6 +236,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLStreamWriterRecord() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
@@ -247,6 +255,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLEventWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
@@ -314,6 +323,7 @@
//Override and don't compare namespaceresolver size
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
StringWriter writer = new StringWriter();
Object objectToWrite = getWriteControlObject();
@@ -329,6 +339,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToOutputStream() throws Exception {
Object objectToWrite = getWriteControlObject();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -343,6 +354,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToOutputStreamASCIIEncoding() throws Exception {
Object objectToWrite = getWriteControlObject();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@@ -361,12 +373,14 @@
}
+ @Override
public void testRoundTrip() throws Exception {
//This test is not applicable because to Marshal we need a specialized jaxbelement
}
//Override and don't compare namespaceresolver size
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
Object objectToWrite = getWriteControlObject();
@@ -386,6 +400,7 @@
}
//Override and don't compare namespaceresolver size
+ @Override
public void testObjectToXMLDocument() throws Exception {
Object objectToWrite = getWriteControlObject();
@@ -420,6 +435,7 @@
testSchemaGen(getControlSchemaFiles());
}
+ @Override
public Object getWriteControlObject(){
JAXBElement jaxbElement = (JAXBElement)getControlObject();
@@ -457,6 +473,7 @@
protected abstract String getNoXsiTypeControlResourceName();
+ @Override
public void xmlToObjectTest(Object testObject, Object controlObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBMapOfInnerClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBMapOfInnerClassTestCases.java
index 0996628..4b4643c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBMapOfInnerClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBMapOfInnerClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
init();
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
return getClass().getField("myMap").getGenericType();
}
@@ -61,6 +62,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
MyInner myInner1 = new MyInner();
myInner1.innerName = "aaa";
@@ -78,6 +80,7 @@
return jaxbElement;
}
+ @Override
public List<InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/innerClassMap.xsd");
List<InputStream> controlSchema = new ArrayList<InputStream>();
@@ -85,10 +88,12 @@
return controlSchema;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
+ @Override
public Map getProperties() {
Map props = new HashMap();
props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "listOfObjectsNamespace");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBObjectCollectionsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBObjectCollectionsTestCases.java
index a3c36dc..eecc6f9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBObjectCollectionsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBObjectCollectionsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,6 +64,7 @@
setTypes(types);
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream1 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/objectCollections.xsd");
InputStream instream2 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/objectCollections2.xsd");
@@ -75,6 +76,7 @@
}
+ @Override
protected Object getControlObject() {
List<Object> myObjectList = new ArrayList<Object>();
@@ -107,10 +109,12 @@
return jaxbElement;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
return getClass().getField("objectArrayList").getType();
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringEmployeeHashtableTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringEmployeeHashtableTestCases.java
index 4586b2a..cc3f2c2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringEmployeeHashtableTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringEmployeeHashtableTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,16 +52,19 @@
setTypes(types);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
getXMLComparer().setIgnoreOrder(true);
}
+ @Override
public void tearDown(){
super.tearDown();
getXMLComparer().setIgnoreOrder(false);
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream1 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/stringEmployeeHashtable.xsd");
InputStream instream2 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/stringEmployeeHashtable2.xsd");
@@ -73,6 +76,7 @@
return controlSchema;
}
+@Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -114,12 +118,14 @@
return jaxbElement;
}
+@Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = ListofObjects.class.getField("stringEmployeeHashtable");
Type fieldType = fld.getGenericType();
return fieldType;
}
+@Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringEmployeeMapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringEmployeeMapTestCases.java
index a0bb34c..203b62f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringEmployeeMapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringEmployeeMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,16 +51,19 @@
setTypes(types);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
getXMLComparer().setIgnoreOrder(true);
}
+ @Override
public void tearDown(){
super.tearDown();
getXMLComparer().setIgnoreOrder(false);
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream1 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/stringEmployeeMap.xsd");
InputStream instream2 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/stringEmployeeMap2.xsd");
@@ -73,6 +76,7 @@
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -114,12 +118,14 @@
return jaxbElement;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = this.getClass().getField("stringEmployeeMap");
Type fieldType = fld.getGenericType();
return fieldType;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringIntegerHashMapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringIntegerHashMapTestCases.java
index cf3e23a..74324cd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringIntegerHashMapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/JAXBStringIntegerHashMapTestCases.java
@@ -44,22 +44,26 @@
setTypes(types);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
getXMLComparer().setIgnoreOrder(true);
}
+ @Override
public void tearDown(){
super.tearDown();
getXMLComparer().setIgnoreOrder(false);
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = getClass().getField("test");
return fld.getGenericType();
}
+ @Override
protected Object getControlObject() {
HashMap<String, Integer> theMap = new HashMap<String, Integer>();
theMap.put("thekey", Integer.valueOf(10));
@@ -73,6 +77,7 @@
return jaxbElement;
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/stringIntegerHashMap.xsd");
@@ -81,6 +86,7 @@
return controlSchema;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/MultiDimensionalArrayNonRootNonItemNamesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/MultiDimensionalArrayNonRootNonItemNamesTestCases.java
index cb4aa06..8d612ba 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/MultiDimensionalArrayNonRootNonItemNamesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/MultiDimensionalArrayNonRootNonItemNamesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(classes);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
jaxbMarshaller.setProperty(MarshallerProperties.JSON_DISABLE_NESTED_ARRAY_NAME, true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/MyList.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/MyList.java
index b87e66d..7d8d856 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/MyList.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/MyList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,95 +27,118 @@
internalList = new Stack();
}
+ @Override
public boolean add(Object e) {
return internalList.add(e);
}
+ @Override
public void add(int index, Object element) {
internalList.add(index, element);
}
+ @Override
public boolean addAll(Collection c) {
return internalList.addAll(c);
}
+ @Override
public boolean addAll(int index, Collection c) {
return internalList.addAll(index, c);
}
+ @Override
public void clear() {
internalList.clear();
}
+ @Override
public boolean contains(Object o) {
return internalList.contains(o);
}
+ @Override
public boolean containsAll(Collection c) {
return internalList.containsAll(c);
}
+ @Override
public T get(int index) {
return (T) internalList.get(index);
}
+ @Override
public int indexOf(Object o) {
return internalList.indexOf(o);
}
+ @Override
public boolean isEmpty() {
return internalList.isEmpty();
}
+ @Override
public Iterator iterator() {
return internalList.iterator();
}
+ @Override
public int lastIndexOf(Object o) {
return internalList.lastIndexOf(o);
}
+ @Override
public ListIterator listIterator() {
return internalList.listIterator();
}
+ @Override
public ListIterator listIterator(int index) {
return internalList.listIterator(index);
}
+ @Override
public boolean remove(Object o) {
return internalList.remove(o);
}
+ @Override
public T remove(int index) {
return (T) internalList.remove(index);
}
+ @Override
public boolean removeAll(Collection c) {
return internalList.removeAll(c);
}
+ @Override
public boolean retainAll(Collection c) {
return internalList.retainAll(c);
}
+ @Override
public Object set(int index, Object element) {
return internalList.set(index, element);
}
+ @Override
public int size() {
return internalList.size();
}
+ @Override
public List subList(int fromIndex, int toIndex) {
return internalList.subList(fromIndex, toIndex);
}
+ @Override
public Object[] toArray() {
return internalList.toArray();
}
+ @Override
public Object[] toArray(Object[] a) {
return internalList.toArray(a);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/NullIteratorList.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/NullIteratorList.java
index 302b655..d0a4a2e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/NullIteratorList.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/NullIteratorList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,92 +21,115 @@
public class NullIteratorList<T> implements List<T> {
+ @Override
public int size() {
return 0;
}
+ @Override
public boolean isEmpty() {
return true;
}
+ @Override
public boolean contains(Object o) {
return false;
}
+ @Override
public Iterator iterator() {
return null;
}
+ @Override
public Object[] toArray() {
return null;
}
+ @Override
public Object[] toArray(Object[] a) {
return null;
}
+ @Override
public boolean add(Object e) {
return false;
}
+ @Override
public boolean remove(Object o) {
return false;
}
+ @Override
public boolean containsAll(Collection c) {
return false;
}
+ @Override
public boolean addAll(Collection c) {
return false;
}
+ @Override
public boolean addAll(int index, Collection c) {
return false;
}
+ @Override
public boolean removeAll(Collection c) {
return false;
}
+ @Override
public boolean retainAll(Collection c) {
return false;
}
+ @Override
public void clear() {
}
+ @Override
public T get(int index) {
return null;
}
+ @Override
public Object set(int index, Object element) {
return null;
}
+ @Override
public void add(int index, Object element) {
}
+ @Override
public T remove(int index) {
return null;
}
+ @Override
public int indexOf(Object o) {
return 0;
}
+ @Override
public int lastIndexOf(Object o) {
return 0;
}
+ @Override
public ListIterator listIterator() {
return null;
}
+ @Override
public ListIterator listIterator(int index) {
return null;
}
+ @Override
public List subList(int fromIndex, int toIndex) {
return null;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/NullSetsMap.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/NullSetsMap.java
index 52bc873..7a73cad 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/NullSetsMap.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/NullSetsMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,48 +20,60 @@
public class NullSetsMap implements Map {
+ @Override
public int size() {
return 0;
}
+ @Override
public boolean isEmpty() {
return true;
}
+ @Override
public boolean containsKey(Object key) {
return false;
}
+ @Override
public boolean containsValue(Object value) {
return false;
}
+ @Override
public Object get(Object key) {
return null;
}
+ @Override
public Object put(Object key, Object value) {
return null;
}
+ @Override
public Object remove(Object key) {
return null;
}
+ @Override
public void putAll(Map m) {
}
+ @Override
public void clear() {
}
+ @Override
public Set keySet() {
return null;
}
+ @Override
public Collection values() {
return null;
}
+ @Override
public Set entrySet() {
return null;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java
index 50c424c..32362ec 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsNamespaceTestCases.java
@@ -53,32 +53,44 @@
Type mapType2 = new ParameterizedType() {
Type[] typeArgs = { Calendar.class, Float.class };
+ @Override
public Type[] getActualTypeArguments() { return typeArgs;}
+ @Override
public Type getOwnerType() { return null; }
+ @Override
public Type getRawType() { return Map.class; }
};
types[1] = mapType2;
Type mapType3 = new ParameterizedType() {
Type[] typeArgs = { Person.class, Job.class };
+ @Override
public Type[] getActualTypeArguments() { return typeArgs;}
+ @Override
public Type getOwnerType() { return null; }
+ @Override
public Type getRawType() { return Map.class; }
};
types[2] = mapType3;
Type listType = new ParameterizedType() {
Type[] typeArgs = { Person.class};
+ @Override
public Type[] getActualTypeArguments() { return typeArgs;}
+ @Override
public Type getOwnerType() { return null; }
+ @Override
public Type getRawType() { return List.class; }
};
types[3] = listType;
Type listType2 = new ParameterizedType() {
Type[] typeArgs = { String.class};
+ @Override
public Type[] getActualTypeArguments() { return typeArgs;}
+ @Override
public Type getOwnerType() { return null; }
+ @Override
public Type getRawType() { return List.class; }
};
types[4] = listType2;
@@ -87,17 +99,20 @@
setTypes(types);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
getXMLComparer().setIgnoreOrder(true);
init();
}
+ @Override
public void tearDown(){
super.tearDown();
getXMLComparer().setIgnoreOrder(false);
}
+ @Override
public List<InputStream> getControlSchemaFiles() {
InputStream instream1 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/multipleMapsNamespace.xsd");
InputStream instream2 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/multipleMapsNamespace2.xsd");
@@ -109,6 +124,7 @@
}
+ @Override
protected Object getControlObject() {
Map<String, Integer> theMap = new HashMap<String, Integer>();
@@ -121,16 +137,19 @@
return jaxbElement;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = getClass().getField("mapField1");
Type fieldType = fld.getGenericType();
return fieldType;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE;
}
+ @Override
protected Map getProperties() {
String pkg = "java.util";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsTestCases.java
index cb5be3d..fc2372c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBMultipleMapsTestCases.java
@@ -51,32 +51,44 @@
Type mapType2 = new ParameterizedType() {
Type[] typeArgs = { Calendar.class, Float.class };
+ @Override
public Type[] getActualTypeArguments() { return typeArgs;}
+ @Override
public Type getOwnerType() { return null; }
+ @Override
public Type getRawType() { return Map.class; }
};
types[1] = mapType2;
Type mapType3 = new ParameterizedType() {
Type[] typeArgs = { Person.class, Job.class };
+ @Override
public Type[] getActualTypeArguments() { return typeArgs;}
+ @Override
public Type getOwnerType() { return null; }
+ @Override
public Type getRawType() { return Map.class; }
};
types[2] = mapType3;
Type listType = new ParameterizedType() {
Type[] typeArgs = { Person.class};
+ @Override
public Type[] getActualTypeArguments() { return typeArgs;}
+ @Override
public Type getOwnerType() { return null; }
+ @Override
public Type getRawType() { return List.class; }
};
types[3] = listType;
Type listType2 = new ParameterizedType() {
Type[] typeArgs = { String.class};
+ @Override
public Type[] getActualTypeArguments() { return typeArgs;}
+ @Override
public Type getOwnerType() { return null; }
+ @Override
public Type getRawType() { return List.class; }
};
types[4] = listType2;
@@ -85,16 +97,19 @@
initXsiType();
}
+ @Override
public void setUp() throws Exception{
super.setUp();
getXMLComparer().setIgnoreOrder(true);
}
+ @Override
public void tearDown(){
super.tearDown();
getXMLComparer().setIgnoreOrder(false);
}
+ @Override
public List<InputStream> getControlSchemaFiles() {
InputStream instream1 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/multipleMaps.xsd");
InputStream instream2 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/multipleMaps2.xsd");
@@ -107,6 +122,7 @@
}
+ @Override
protected Object getControlObject() {
Map<String, Integer> theMap = new HashMap<String, Integer>();
@@ -119,12 +135,14 @@
return jaxbElement;
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
Field fld = getClass().getField("mapField1");
Type fieldType = fld.getGenericType();
return fieldType;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListNoXsiTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListNoXsiTypeTestCases.java
index b7a70b1..8bb53b3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListNoXsiTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListNoXsiTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
init();
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
return Company.class;
}
@@ -61,6 +62,7 @@
setClasses(classes);
}
+ @Override
protected Map getProperties() {
String pkg = "org.eclipse.persistence.testing.jaxb.listofobjects.externalizedmetadata";
HashMap<String, Source> overrides = new HashMap<String, Source>();
@@ -115,6 +117,7 @@
return null;
}
+ @Override
protected Object getControlObject() {
Company company = new Company();
List depts = new ArrayList();
@@ -131,6 +134,7 @@
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/typedlist.xsd");
@@ -139,6 +143,7 @@
return controlSchema;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_NO_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListTestCases.java
index d26150d..c0eba6d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/JAXBTypedListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
init();
}
+ @Override
protected Type getTypeToUnmarshalTo() throws Exception {
return Company.class;
}
@@ -67,6 +68,7 @@
return namespaces;
}
+ @Override
protected Map getProperties() {
String pkg = "org.eclipse.persistence.testing.jaxb.listofobjects.externalizedmetadata";
HashMap<String, Source> overrides = new HashMap<String, Source>();
@@ -121,6 +123,7 @@
return null;
}
+ @Override
protected Object getControlObject() {
Company company = new Company();
List depts = new ArrayList();
@@ -137,6 +140,7 @@
}
+ @Override
public List< InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/listofobjects/externalizedmetadata/typedlist.xsd");
@@ -145,6 +149,7 @@
return controlSchema;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE_XSI_TYPE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/ns/MapNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/ns/MapNamespaceTestCases.java
index a505f38..860f4e4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/ns/MapNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/listofobjects/ns/MapNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -86,6 +86,7 @@
private class DummyCharacterEscapeHandler implements CharacterEscapeHandler {
+ @Override
public void escape(char[] buf, int start, int len, boolean isAttValue, Writer out) throws IOException {
if (len == 1 && buf[start] == '\n') {
return;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/map/MapElementWrapperExternalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/map/MapElementWrapperExternalTestCases.java
index 335557e..66640ad 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/map/MapElementWrapperExternalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/map/MapElementWrapperExternalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/map/eclipselink-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/multiplepackage/MultiplePackageInfoTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/multiplepackage/MultiplePackageInfoTestCases.java
index 14ad9bd..df091f2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/multiplepackage/MultiplePackageInfoTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/multiplepackage/MultiplePackageInfoTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
}
+ @Override
protected Object getControlObject() {
Root myRoot = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/multiplepackage/MultiplePackageTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/multiplepackage/MultiplePackageTestCases.java
index 82637b9..a36bd6b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/multiplepackage/MultiplePackageTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/multiplepackage/MultiplePackageTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
}
+ @Override
protected Object getControlObject() {
Department dept = new Department();
EmployeeNamespace employee = new EmployeeNamespace();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootChoiceOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootChoiceOnlyTestCases.java
index aa392eb..d8f0b8f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootChoiceOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootChoiceOnlyTestCases.java
@@ -48,6 +48,7 @@
jaxbMarshaller.setProperty(MarshallerProperties.NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected Object getControlObject() {
RootChoiceOnly root = new RootChoiceOnly();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyNSTestCases.java
index dd890eb..54b2c95 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyNSTestCases.java
@@ -49,6 +49,7 @@
jaxbMarshaller.setProperty(MarshallerProperties.JSON_USE_XSD_TYPES_WITH_PREFIX, true);
}
+ @Override
protected Object getControlObject() {
RootCompositeCollectionObjectOnly root = new RootCompositeCollectionObjectOnly();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyTestCases.java
index 6f08eff..f2c25ff 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyTestCases.java
@@ -46,6 +46,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
RootCompositeCollectionObjectOnly root = new RootCompositeCollectionObjectOnly();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyXMLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyXMLTestCases.java
index 48f173f..54b289e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyXMLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionObjectOnlyXMLTestCases.java
@@ -29,6 +29,7 @@
setClasses(new Class[] {RootCompositeCollectionObjectOnly.class, BaseType.class});
}
+ @Override
protected Object getControlObject() {
RootCompositeCollectionObjectOnly root = new RootCompositeCollectionObjectOnly();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionOnlyTestCases.java
index 8ea463e..95bb293 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceRootCompositeCollectionOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected JAXBMarshaller getJSONMarshaller() throws Exception{
JAXBMarshaller jsonMarshaller = (JAXBMarshaller) jaxbContext.createMarshaller();
jsonMarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
@@ -69,6 +70,7 @@
return jsonMarshaller;
}
+ @Override
protected Object getControlObject() {
RootCompositeCollectionOnly root = new RootCompositeCollectionOnly();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesBackwardCompatibilityTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesBackwardCompatibilityTestCases.java
index 842a22d..d7cc78c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesBackwardCompatibilityTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesBackwardCompatibilityTestCases.java
@@ -40,6 +40,7 @@
jaxbUnmarshaller.setProperty(JAXBContextProperties.JSON_TYPE_COMPATIBILITY, true);
}
+ @Override
protected Object getControlObject() {
RootComplex root = new RootComplex();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesNSTestCases.java
index cbb12f6..bd86903 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesNSTestCases.java
@@ -52,6 +52,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_USE_XSD_TYPES_WITH_PREFIX, true);
}
+ @Override
protected Object getControlObject() {
RootComplex root = new RootComplex();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesTestCases.java
index 234ed02..e4abe9e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesTestCases.java
@@ -46,6 +46,7 @@
return namespaces;
}
+ @Override
protected Object getControlObject() {
RootComplex root = new RootComplex();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesXMLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesXMLTestCases.java
index 0e61b74..8cfb76c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesXMLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/inheritance/InheritanceWithMultiplePackagesXMLTestCases.java
@@ -29,6 +29,7 @@
setClasses(new Class[] {RootComplex.class});
}
+ @Override
protected Object getControlObject() {
RootComplex root = new RootComplex();
SubType subType = new SubType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/xml/XMLNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/xml/XMLNamespaceTestCases.java
index 4aa6d07..2c042b0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/xml/XMLNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/xml/XMLNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected JAXBMarshaller getJSONMarshaller() throws Exception {
JAXBMarshaller jsonMarshaller = (JAXBMarshaller) jaxbContext.createMarshaller();
jsonMarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/xml/XMLNamespaceXmlPathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/xml/XMLNamespaceXmlPathTestCases.java
index bdc7fb9..e883f85 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/xml/XMLNamespaceXmlPathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/namespaceuri/xml/XMLNamespaceXmlPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected JAXBMarshaller getJSONMarshaller() throws Exception {
JAXBMarshaller jsonMarshaller = (JAXBMarshaller) jaxbContext.createMarshaller();
jsonMarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/nomappings/NoMappingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/nomappings/NoMappingsTestCases.java
index 14c12cf..d638a70 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/nomappings/NoMappingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/nomappings/NoMappingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,6 +60,7 @@
return SomeClass.class;
}
+ @Override
public void testUnmarshallerHandler(){};
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/objectgraph/ObjectGraphBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/objectgraph/ObjectGraphBindingsTestCases.java
index 4e34e23..82e9f1d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/objectgraph/ObjectGraphBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/objectgraph/ObjectGraphBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -82,6 +82,7 @@
return cust;
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/prefixmapper/PrefixMapperContextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/prefixmapper/PrefixMapperContextTestCases.java
index 54a0c2e..2a6af37 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/prefixmapper/PrefixMapperContextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/prefixmapper/PrefixMapperContextTestCases.java
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public String getName() {
return "JAXB set/getProperty Tests: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/properties/PropertyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/properties/PropertyTestCases.java
index ffa95b4..2d4bccf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/properties/PropertyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/properties/PropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
u = ctx.createUnmarshaller();
}
+ @Override
public String getName() {
return "JAXB set/getProperty Tests: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/ArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/ArrayTestCases.java
index 3c7a816..ec7a1e1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/ArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/ArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -141,7 +141,7 @@
public void testWriteComplexArrayWithoutRoot() throws Exception {
Field complexArrayField = ArrayTestCases.class.getField("COMPLEX_ARRAY_WITH_XML_ROOT_ELEMENT");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- moxyJsonProvider.writeTo(COMPLEX_ARRAY_WITH_XML_ROOT_ELEMENT, (Class<Object>) complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(COMPLEX_ARRAY_WITH_XML_ROOT_ELEMENT, complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
assertEquals(COMPLEX_JSON_ARRAY_WITHOUT_ROOT, new String(outputStream.toByteArray()));
}
@@ -149,7 +149,7 @@
moxyJsonProvider.setIncludeRoot(true);
Field complexArrayField = ArrayTestCases.class.getField("COMPLEX_ARRAY_WITH_XML_ROOT_ELEMENT");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- moxyJsonProvider.writeTo(COMPLEX_ARRAY_WITH_XML_ROOT_ELEMENT, (Class<Object>) complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(COMPLEX_ARRAY_WITH_XML_ROOT_ELEMENT, complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
assertEquals(COMPLEX_JSON_ARRAY_WITH_ROOT, new String(outputStream.toByteArray()));
}
@@ -161,7 +161,7 @@
jaxbElementArray[1] = new JAXBElement(new QName(""), ComplexWithXmlElementDecl.class, new ComplexWithXmlElementDecl(1));
jaxbElementArray[2] = new JAXBElement(new QName(""), ComplexWithXmlElementDecl.class, new ComplexWithXmlElementDecl(2));
- moxyJsonProvider.writeTo(jaxbElementArray, (Class<Object>) complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(jaxbElementArray, complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
assertEquals(COMPLEX_JSON_ARRAY_WITHOUT_ROOT, new String(outputStream.toByteArray()));
}
@@ -174,7 +174,7 @@
jaxbElementArray[1] = new JAXBElement(new QName("complex"), ComplexWithXmlElementDecl.class, new ComplexWithXmlElementDecl(1));
jaxbElementArray[2] = new JAXBElement(new QName("complex"), ComplexWithXmlElementDecl.class, new ComplexWithXmlElementDecl(2));
- moxyJsonProvider.writeTo(jaxbElementArray, (Class<Object>) complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(jaxbElementArray, complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
assertEquals(COMPLEX_JSON_ARRAY_WITH_ROOT, new String(outputStream.toByteArray()));
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/GenericListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/GenericListTestCases.java
index 1bdccd0..03abcf5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/GenericListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/GenericListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,7 +59,7 @@
public void testWriteGenericList() throws Exception {
Field field = GenericListTestCases.class.getField("list");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- moxyJsonProvider.writeTo(list, (Class<Object>) field.getType(), field.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(list, field.getType(), field.getGenericType(), null, null, null, outputStream);
try (InputStream entityStream = jsonResource.openStream();
Scanner scanner = new Scanner(entityStream, "UTF-8")) {
@@ -70,13 +70,13 @@
public void testReadableGenericList() throws Exception {
Field field = GenericListTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isReadable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isReadable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
public void testWriteableGenericList() throws Exception {
Field field = GenericListTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isWriteable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isWriteable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/JAXBElementsGenericListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/JAXBElementsGenericListTestCases.java
index 073ffd0..14b991f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/JAXBElementsGenericListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/JAXBElementsGenericListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -119,7 +119,7 @@
public void testWriteGenericList() throws Exception {
Field field = JAXBElementsGenericListTestCases.class.getField("list");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- moxyJsonProvider.writeTo(list, (Class<Object>) field.getType(), field.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(list, field.getType(), field.getGenericType(), null, null, null, outputStream);
try (InputStream entityStream = jsonResource.openStream();
Scanner scanner = new Scanner(entityStream, "UTF-8")) {
@@ -130,13 +130,13 @@
public void testReadableGenericList() throws Exception {
Field field = JAXBElementsGenericListTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isReadable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isReadable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
public void testWriteableGenericList() throws Exception {
Field field = JAXBElementsGenericListTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isWriteable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isWriteable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/LinkedListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/LinkedListTestCases.java
index 3af6c31..2f28590 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/LinkedListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/LinkedListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -147,7 +147,7 @@
public void testWriteComplexLinkedListWithoutRoot() throws Exception {
Field complexLinkedListField = LinkedListTestCases.class.getField("COMPLEX_LINKED_LIST_WITH_XML_ROOT_ELEMENT");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- moxyJsonProvider.writeTo(COMPLEX_LINKED_LIST_WITH_XML_ROOT_ELEMENT, (Class<Object>) complexLinkedListField.getType(), complexLinkedListField.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(COMPLEX_LINKED_LIST_WITH_XML_ROOT_ELEMENT, complexLinkedListField.getType(), complexLinkedListField.getGenericType(), null, null, null, outputStream);
assertEquals(COMPLEX_JSON_ARRAY_WITHOUT_ROOT, new String(outputStream.toByteArray()));
}
@@ -155,7 +155,7 @@
moxyJsonProvider.setIncludeRoot(true);
Field complexArrayField = LinkedListTestCases.class.getField("COMPLEX_LINKED_LIST_WITH_XML_ROOT_ELEMENT");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- moxyJsonProvider.writeTo(COMPLEX_LINKED_LIST_WITH_XML_ROOT_ELEMENT, (Class<Object>) complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(COMPLEX_LINKED_LIST_WITH_XML_ROOT_ELEMENT, complexArrayField.getType(), complexArrayField.getGenericType(), null, null, null, outputStream);
assertEquals(COMPLEX_JSON_ARRAY_WITH_ROOT, new String(outputStream.toByteArray()));
}
@@ -167,7 +167,7 @@
jaxbElementLinkedList.add(new JAXBElement(new QName(""), ComplexWithXmlElementDecl.class, new ComplexWithXmlElementDecl(1)));
jaxbElementLinkedList.add(new JAXBElement(new QName(""), ComplexWithXmlElementDecl.class, new ComplexWithXmlElementDecl(2)));
- moxyJsonProvider.writeTo(jaxbElementLinkedList, (Class<Object>) complexLinkedListField.getType(), complexLinkedListField.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(jaxbElementLinkedList, complexLinkedListField.getType(), complexLinkedListField.getGenericType(), null, null, null, outputStream);
assertEquals(COMPLEX_JSON_ARRAY_WITHOUT_ROOT, new String(outputStream.toByteArray()));
}
@@ -180,7 +180,7 @@
jaxbElementLinkedList.add(new JAXBElement(new QName("complex"), ComplexWithXmlElementDecl.class, new ComplexWithXmlElementDecl(1)));
jaxbElementLinkedList.add(new JAXBElement(new QName("complex"), ComplexWithXmlElementDecl.class, new ComplexWithXmlElementDecl(2)));
- moxyJsonProvider.writeTo(jaxbElementLinkedList, (Class<Object>) complexLinkedListField.getType(), complexLinkedListField.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(jaxbElementLinkedList, complexLinkedListField.getType(), complexLinkedListField.getGenericType(), null, null, null, outputStream);
assertEquals(COMPLEX_JSON_ARRAY_WITH_ROOT, new String(outputStream.toByteArray()));
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/ListAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/ListAdapterTestCases.java
index c6b754a..446e869 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/ListAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/ListAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,7 +64,7 @@
public void testWrite() throws Exception {
Field field = ListAdapterTestCases.class.getField("list");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- moxyJsonProvider.writeTo(list, (Class<Object>) field.getType(), field.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(list, field.getType(), field.getGenericType(), null, null, null, outputStream);
try (InputStream entityStream = jsonResource.openStream();
Scanner scanner = new Scanner(entityStream, "UTF-8")) {
@@ -75,13 +75,13 @@
public void testReadable() throws Exception {
Field field = ListAdapterTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isReadable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isReadable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
public void testWriteable() throws Exception {
Field field = ListAdapterTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isWriteable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isWriteable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/MapAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/MapAdapterTestCases.java
index d326ea8..343ac8e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/MapAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/MapAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,7 +68,7 @@
public void testWrite() throws Exception {
Field field = MapAdapterTestCases.class.getField("list");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- moxyJsonProvider.writeTo(list, (Class<Object>) field.getType(), field.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(list, field.getType(), field.getGenericType(), null, null, null, outputStream);
try (InputStream entityStream = jsonResource.openStream();
Scanner scanner = new Scanner(entityStream, "UTF-8")) {
@@ -79,13 +79,13 @@
public void testReadable() throws Exception {
Field field = MapAdapterTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isReadable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isReadable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
public void testWriteable() throws Exception {
Field field = MapAdapterTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isWriteable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isWriteable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/MyArrayListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/MyArrayListTestCases.java
index d447364..d8be617 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/MyArrayListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/MyArrayListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -76,7 +76,7 @@
public void testWriteMyArrayList() throws Exception {
Field field = MyArrayListTestCases.class.getField("list");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- moxyJsonProvider.writeTo(list, (Class<Object>) field.getType(), field.getGenericType(), null, null, null, outputStream);
+ moxyJsonProvider.writeTo(list, field.getType(), field.getGenericType(), null, null, null, outputStream);
try (InputStream entityStream = jsonResource.openStream();
Scanner scanner = new Scanner(entityStream, "UTF-8")) {
@@ -87,13 +87,13 @@
public void testReadableGenericList() throws Exception {
Field field = MyArrayListTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isReadable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isReadable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
public void testWriteableGenericList() throws Exception {
Field field = MyArrayListTestCases.class.getField("list");
- boolean test = moxyJsonProvider.isWriteable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isWriteable(field.getType(), field.getGenericType(), null, null);
assertTrue(test);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/SimpleListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/SimpleListTestCases.java
index a94aa2f..c84000d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/SimpleListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/rs/SimpleListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -126,7 +126,7 @@
public void testReadArrayOfInt() throws Exception {
Field field = SimpleListTestCases.class.getField("arrayOfInt");
- boolean test = moxyJsonProvider.isReadable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isReadable(field.getType(), field.getGenericType(), null, null);
assertFalse(test);
}
@@ -136,13 +136,13 @@
public void testReadArrayOfInt3D() throws Exception {
Field field = SimpleListTestCases.class.getField("arrayOfInt3D");
- boolean test = moxyJsonProvider.isReadable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isReadable(field.getType(), field.getGenericType(), null, null);
assertFalse(test);
}
public void testWriteArrayOfInt3D() throws Exception {
Field field = SimpleListTestCases.class.getField("arrayOfInt3D");
- boolean test = moxyJsonProvider.isWriteable((Class<Object>) field.getType(), field.getGenericType(), null, null);
+ boolean test = moxyJsonProvider.isWriteable(field.getType(), field.getGenericType(), null, null);
assertFalse(test);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/SchemaGenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/SchemaGenTestCases.java
index a3bfe00..4b41643 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/SchemaGenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/SchemaGenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -153,6 +153,7 @@
schemaFiles = new ArrayList<File>();
}
+ @Override
public Result createOutput(String namespaceURI, String suggestedFileName) throws IOException {
//return new StreamResult(System.out);
File schemaFile = new File(tmpdir, suggestedFileName);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/customizedmapping/xmlelementref/SchemaGenXmlElementRefByteArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/customizedmapping/xmlelementref/SchemaGenXmlElementRefByteArrayTestCases.java
index 5779155..500f17a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/customizedmapping/xmlelementref/SchemaGenXmlElementRefByteArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/customizedmapping/xmlelementref/SchemaGenXmlElementRefByteArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -94,6 +94,7 @@
schemaFiles = new ArrayList<File>();
}
+ @Override
public Result createOutput(String namespaceURI, String suggestedFileName) throws IOException {
File schemaFile = new File(tmpdir, suggestedFileName);
schemaFiles.add(schemaFile);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/customizedmapping/xmlelementref/WrappedByteArray.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/customizedmapping/xmlelementref/WrappedByteArray.java
index 2dd1189..0b41eb2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/customizedmapping/xmlelementref/WrappedByteArray.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/customizedmapping/xmlelementref/WrappedByteArray.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,7 +52,7 @@
*
*/
public void setInByteArray(JAXBElement<byte[]> value) {
- this.inByteArray = ((JAXBElement<byte[]> ) value);
+ this.inByteArray = value;
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/SchemaGenImportTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/SchemaGenImportTestCases.java
index b7a6e24..8bd9df0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/SchemaGenImportTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/SchemaGenImportTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -120,6 +120,7 @@
outputDir = dir;
}
+ @Override
public Result createOutput(String namespaceURI, String suggestedFileName) throws IOException {
File schemaFile = null;
Result res = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/inheritance/InheritanceImportsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/inheritance/InheritanceImportsTestCases.java
index 004e665..f5171a4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/inheritance/InheritanceImportsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/inheritance/InheritanceImportsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected JAXBMarshaller getJSONMarshaller() throws Exception {
JAXBMarshaller jsonMarshaller = (JAXBMarshaller) jaxbContext.createMarshaller();
jsonMarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, "application/json");
@@ -52,6 +53,7 @@
}
+ @Override
protected Object getControlObject() {
Child c = new Child();
c.childThing = "childValue";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/url/SchemaGenImportURLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/url/SchemaGenImportURLTestCases.java
index 399ba37..ff4c979 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/url/SchemaGenImportURLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/imports/url/SchemaGenImportURLTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
super(name);
}
+ @Override
public String getName() {
return "JAXB SchemaGen: Import URL: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/InheritanceWithTransientTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/InheritanceWithTransientTestCases.java
index 7cd0840..63d7bee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/InheritanceWithTransientTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/InheritanceWithTransientTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
super(name);
}
+ @Override
public String getName() {
return "JAXB SchemaGen: Inheritance: With Transient" + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/InheritanceWithXMLValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/InheritanceWithXMLValueTestCases.java
index fb2b34b..9f96f82 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/InheritanceWithXMLValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/InheritanceWithXMLValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
super(name);
}
+ @Override
public String getName() {
return "JAXB SchemaGen: Inheritance: With XMLValue" + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/Mazda.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/Mazda.java
index 16ce344..cdc81ea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/Mazda.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/Mazda.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
public String duplicate;
+ @Override
public String getMake() {
return make;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/SchemaGenInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/SchemaGenInheritanceTestCases.java
index 960989e..429aab6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/SchemaGenInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/SchemaGenInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
super(name);
}
+ @Override
public String getName() {
return "JAXB SchemaGen: Inheritance: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/Toyota.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/Toyota.java
index 66edf42..735aeba 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/Toyota.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/inheritance/Toyota.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
public String duplicate;
+ @Override
public String getMake() {
return make;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/scope/SchemaGenScopeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/scope/SchemaGenScopeTestCases.java
index cb88c86..7fabce1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/scope/SchemaGenScopeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/scope/SchemaGenScopeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
testSchemaGen(getControlSchemaFiles());
}
+ @Override
protected Object getControlObject() {
ClassA classA = new ClassA();
classA.setSomeValue("value");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/xmlpath/SchemaGenXmlPathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/xmlpath/SchemaGenXmlPathTestCases.java
index c653ba2..02bc1f9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/xmlpath/SchemaGenXmlPathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/schemagen/xmlpath/SchemaGenXmlPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
testSchemaGen(getControlSchemaFiles());
}
+ @Override
protected Object getControlObject() {
MyClass obj = new MyClass();
obj.name = "Bob Jones";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/security/xss/SecurityXSSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/security/xss/SecurityXSSTestCases.java
index 9c36a5b..722d5ef 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/security/xss/SecurityXSSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/security/xss/SecurityXSSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
unmarshallDocument(XML_DOCUMENT_NESTED_ENTITIES);
}
+ @Override
public void setUp() throws Exception {
final HashMap<String, Object> contextProperties = new HashMap<>();
jaxbContext = JAXBContext.newInstance(DOMAIN_CLASSES, contextProperties);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentByteArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentByteArrayTestCases.java
index f9780cf..85962fb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentByteArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentByteArrayTestCases.java
@@ -37,6 +37,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
JAXBElement value = new ByteArrayObjectFactory().createBase64Root();
value.setValue(new Byte[]{Byte.valueOf((byte)1), Byte.valueOf((byte)2), Byte.valueOf((byte)3), Byte.valueOf((byte)4), Byte.valueOf((byte)5), Byte.valueOf((byte)6), Byte.valueOf((byte)7)});
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentDateTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentDateTestCases.java
index e0c97fe..9d5e2bc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentDateTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentDateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
return "{\"dateroot\":\"2013-02-20T00:00:00"+TIMEZONE_OFFSET+"\"}";
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
@@ -63,6 +64,7 @@
return doc;
}
+ @Override
protected Object getControlObject() {
JAXBElement value = new DateObjectFactory().createDateRoot();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentIntegerTestCases.java
index 1bc8a70..d42cdb4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentIntegerTestCases.java
@@ -40,12 +40,14 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
JAXBElement value = new IntegerObjectFactory().createIntegerRoot();
value.setValue(Integer.valueOf(27));
return value;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentStringTestCases.java
index c052c78..4fef127 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,12 +40,14 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
JAXBElement value = new StringObjectFactory().createStringRoot();
value.setValue("StringValue");
return value;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentWhitespaceNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentWhitespaceNullTestCases.java
index 34cee73..a05fdc9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentWhitespaceNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/SimpleDocumentWhitespaceNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Root controlRoot = new Root();
switch (state) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/StringEmptyElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/StringEmptyElementTestCases.java
index 150da6b..7e7f511 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/StringEmptyElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/StringEmptyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
JAXBElement value = new StringObjectFactory().createStringRoot();
value.setValue("");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/StringNilTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/StringNilTestCases.java
index 9981c66..8c2ea74 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/StringNilTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/simpledocument/StringNilTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
JAXBElement value = new StringObjectFactory().createStringRoot();
value.setValue(null);
@@ -43,6 +44,7 @@
return value;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectIntegerNoXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectIntegerNoXsiTestCases.java
index 03e6054..d9bf2e9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectIntegerNoXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectIntegerNoXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
@@ -82,6 +83,7 @@
return null;
}
+ @Override
protected Object getControlObject() {
Integer testInteger = 25;
QName qname = new QName("rootNamespace", "root");
@@ -97,9 +99,11 @@
return XML_RESOURCE;
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectIntegerXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectIntegerXsiTestCases.java
index 0e8b8a4..45f1113 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectIntegerXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectIntegerXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,10 +67,12 @@
//not applicable for this test since we override testSchemaGen
return null;
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
+ @Override
protected Object getControlObject() {
Integer testInteger = 25;
QName qname = new QName("rootNamespace", "root");
@@ -78,6 +80,7 @@
return jaxbElement;
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -88,6 +91,7 @@
}
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(resourceName);
Object testObject = jaxbUnmarshaller.unmarshal(url);
@@ -95,6 +99,7 @@
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setNamespaceAware(true);
@@ -112,6 +117,7 @@
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
Object testObject = jaxbUnmarshaller.unmarshal(instream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectObjectNoXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectObjectNoXsiTestCases.java
index 9cf837f..1938424 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectObjectNoXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectObjectNoXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,6 +64,7 @@
return null;
}
+ @Override
protected Object getControlObject() {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setNamespaceAware(true);
@@ -85,6 +86,7 @@
return jaxbElement;
}
+ @Override
protected Object getJSONReadControlObject() {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
Document doc = null;
@@ -107,10 +109,12 @@
protected Type getTypeToUnmarshalTo() throws Exception {
return Object.class;
}
+ @Override
public Class getUnmarshalClass(){
return Object.class;
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
@@ -119,6 +123,7 @@
return XML_RESOURCE;
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -130,6 +135,7 @@
}
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
InputSource inputSource = new InputSource(instream);
@@ -139,6 +145,7 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromXMLStreamReaderEx() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -154,6 +161,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -163,12 +171,15 @@
xmlToObjectTest(testObject);
}
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
+ @Override
public void testRoundTrip() throws Exception{
if(isUnmarshalTest()) {
InputStream instream = null;
@@ -185,12 +196,14 @@
}
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
Object testObject = jaxbUnmarshaller.unmarshal(new StreamSource(instream), Object.class);
instream.close();
xmlToObjectTest(testObject);
}
+ @Override
public void compareJAXBElementObjects(JAXBElement controlObj, JAXBElement testObj) {
assertEquals(controlObj.getName().getLocalPart(), testObj.getName().getLocalPart());
assertEquals(controlObj.getName().getNamespaceURI(), testObj.getName().getNamespaceURI());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectObjectXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectObjectXsiTestCases.java
index 222da6f..0049eb8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectObjectXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectObjectXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,10 +62,12 @@
return null;
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
+ @Override
protected Object getControlObject() {
Integer testInteger = 25;
QName qname = new QName("rootNamespace", "root");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectStringNoXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectStringNoXsiTestCases.java
index 39e066c..002ba78 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectStringNoXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectStringNoXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,10 +65,12 @@
return null;
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
+ @Override
protected Object getControlObject() {
String testString = "25";
QName qname = new QName("rootNamespace", "root");
@@ -76,6 +78,7 @@
return jaxbElement;
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
@@ -91,9 +94,11 @@
return XML_RESOURCE;
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
+ @Override
public void testRoundTrip() throws Exception{
if(isUnmarshalTest()) {
InputStream instream = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectStringXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectStringXsiTestCases.java
index 2b7fe27..216c954 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectStringXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/singleobject/JAXBSingleObjectStringXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,9 +80,11 @@
return null;
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
+ @Override
protected Object getControlObject() {
String testString = "25";
QName qname = new QName("rootNamespace", "root");
@@ -166,38 +168,47 @@
this.rdr = rdr;
}
+ @Override
public void setFeature(String name, boolean value)
throws SAXNotRecognizedException, SAXNotSupportedException {
}
+ @Override
public boolean getFeature(String name) throws SAXNotRecognizedException,
SAXNotSupportedException {
return false;
}
+ @Override
public Object getProperty(String name) throws SAXNotRecognizedException,
SAXNotSupportedException {
return null;
}
+ @Override
public void setProperty(String name, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException {
}
+ @Override
public void setEntityResolver(EntityResolver resolver) {
}
+ @Override
public EntityResolver getEntityResolver() {
return null;
}
+ @Override
public void setDTDHandler(DTDHandler handler) {
}
+ @Override
public DTDHandler getDTDHandler() {
return null;
}
+ @Override
public void setContentHandler(ContentHandler handler) {
try {
this.contentHandler = handler;
@@ -210,21 +221,26 @@
}
}
+ @Override
public ContentHandler getContentHandler() {
return contentHandler;
}
+ @Override
public void setErrorHandler(ErrorHandler handler) {
}
+ @Override
public ErrorHandler getErrorHandler() {
return null;
}
+ @Override
public void parse(InputSource input) throws IOException, SAXException {
doParse();
}
+ @Override
public void parse(String systemId) throws IOException, SAXException {
doParse();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/stax/XMLStreamWriterDefaultNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/stax/XMLStreamWriterDefaultNamespaceTestCases.java
index 080a8e5..e55305e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/stax/XMLStreamWriterDefaultNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/stax/XMLStreamWriterDefaultNamespaceTestCases.java
@@ -74,7 +74,7 @@
XMLOutputFactory factory = XMLOutputFactory.newInstance();
// Set IS_REPAIRING_NAMESPACES to true.
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(true));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(true));
XMLStreamWriter streamWriter = factory.createXMLStreamWriter(writer);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/Person.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/Person.java
index 8d148de..1c96a82 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/Person.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/Person.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -78,7 +78,7 @@
*
*/
public void setName(JAXBElement<String> value) {
- this.name = ((JAXBElement<String> ) value);
+ this.name = value;
}
public boolean equals(Object arg0) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/Person2.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/Person2.java
index d348887..3c8043d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/Person2.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/Person2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,7 +25,7 @@
}
public void setName(JAXBElement<String> value) {
- this.name = ((JAXBElement<String> ) value);
+ this.name = value;
}
public boolean equals(Object arg0) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionEnglishTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionEnglishTestCases.java
index e97ea1b..e39071b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionEnglishTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionEnglishTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
Person personneObj = new Person();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionFrenchTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionFrenchTestCases.java
index 9623700..af73820 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionFrenchTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionFrenchTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
Person personneObj = new Person();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionTestCases.java
index 13c3deb..0f6cc99 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/substitution/SubstitutionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject() {
Person personneObj = new Person();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/AbstractNonELCharacterEscapeHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/AbstractNonELCharacterEscapeHandler.java
index 7fa9b17..29ca385 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/AbstractNonELCharacterEscapeHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/AbstractNonELCharacterEscapeHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
public abstract class AbstractNonELCharacterEscapeHandler implements org.glassfish.jaxb.core.marshaller.CharacterEscapeHandler {
+ @Override
public void escape(char[] buf, int start, int len, boolean isAttValue, Writer out) throws IOException {
return;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/NonELCharacterEscapeHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/NonELCharacterEscapeHandler.java
index a484314..867865f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/NonELCharacterEscapeHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/NonELCharacterEscapeHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
// This handler doesn't actually escape any of the important characters.
// For testing purposes only!
+ @Override
public void escape(char[] buf, int start, int len, boolean isAttValue, Writer out) throws IOException {
for (int i = start; i < start + len; i++) {
char ch = buf[i];
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/NonELCharacterEscapeHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/NonELCharacterEscapeHandlerTestCases.java
index 2eb8c9f..1b76790 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/NonELCharacterEscapeHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/charescape/NonELCharacterEscapeHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
jaxbMarshaller.setProperty("org.glassfish.jaxb.marshaller.CharacterEscapeHandler", new NonELCharacterEscapeHandler());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/NonELIDResolver.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/NonELIDResolver.java
index a97d8f4..380ac81 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/NonELIDResolver.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/NonELIDResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,16 +31,19 @@
public boolean hitResolve = false;
public boolean eventHandlerNotNull = false;
+ @Override
public void startDocument(ValidationEventHandler eventHandler) throws SAXException {
melons.clear();
hitStartDocument = true;
eventHandlerNotNull = (eventHandler != null);
}
+ @Override
public void endDocument() throws SAXException {
hitEndDocument = true;
}
+ @Override
public void bind(String id, Object obj) throws SAXException {
hitBind = true;
if (obj instanceof Melon) {
@@ -49,9 +52,11 @@
}
}
+ @Override
public Callable<?> resolve(final String id, final Class type) throws SAXException {
hitResolve = true;
return new Callable<Object>() {
+ @Override
public Object call() {
if (type == Melon.class) {
return melons.get(id);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/NonELIDResolverTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/NonELIDResolverTestCases.java
index c8a4001..b9e5fd5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/NonELIDResolverTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/NonELIDResolverTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
assertTrue("ValidationEventHandler was not set.", idResolver.eventHandlerNotNull);
}
+ @Override
public Object getControlObject() {
Melon m1 = new Melon();
m1.id = "M1";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/collection/NonELIDResolver.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/collection/NonELIDResolver.java
index de7e162..53d8550 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/collection/NonELIDResolver.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/collection/NonELIDResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
public Callable<?> resolve(final String id, Class type) throws SAXException {
hitResolve = true;
return new Callable<Object>() {
+ @Override
public Object call() {
Object obj = objects.get(id);
((TestObject) obj).processed = true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/collection/NonELIDResolverTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/collection/NonELIDResolverTestCases.java
index da3eb01..9d364df 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/collection/NonELIDResolverTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/idresolver/collection/NonELIDResolverTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
assertTrue("ValidationEventHandler was not set.", idResolver.eventHandlerNotNull);
}
+ @Override
public Object getControlObject() {
TestObject o = new TestObject();
o.name = "FOO"; o.id = 1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/xmllocation/XmlLocationNonTransientTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/xmllocation/XmlLocationNonTransientTestCases.java
index ba5549b..9b649c1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/xmllocation/XmlLocationNonTransientTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/xmllocation/XmlLocationNonTransientTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -88,10 +88,12 @@
this.alternateColumn = alt;
}
+ @Override
public String getPublicId() {
return null;
}
+ @Override
public String getSystemId() {
if (!includeSysId) {
return null;
@@ -100,10 +102,12 @@
}
}
+ @Override
public int getLineNumber() {
return line;
}
+ @Override
public int getColumnNumber() {
return column;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/xmllocation/XmlLocationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/xmllocation/XmlLocationTestCases.java
index b64b673..98763c8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/xmllocation/XmlLocationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/sun/xmllocation/XmlLocationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -85,10 +85,12 @@
this.alternateColumn = alt;
}
+ @Override
public String getPublicId() {
return null;
}
+ @Override
public String getSystemId() {
if (!includeSysId) {
return null;
@@ -97,10 +99,12 @@
}
}
+ @Override
public int getLineNumber() {
return line;
}
+ @Override
public int getColumnNumber() {
return column;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ByteArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ByteArrayTestCases.java
index b051c54..2f239e2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ByteArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ByteArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("http://jaxb.dev.java.net/array", "testTagName");
@@ -66,6 +67,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/BigByteArray.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ConflictingQNamesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ConflictingQNamesTestCases.java
index 162006f..042c38d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ConflictingQNamesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ConflictingQNamesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -69,14 +69,17 @@
return typeMappingInfos;
}
+ @Override
public TypeMappingInfo getTypeMappingInfo(){
return typeMappingInfos[1];
}
+ @Override
protected Object getControlObject() {
return 10f;
}
+ @Override
public Object getReadControlObject() {
QName qname = new QName("", "root");
JAXBElement jbe = new JAXBElement(qname, Float.class, null);
@@ -84,6 +87,7 @@
return jbe;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/conflictingQNames.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DatahandlerWithAnnotationsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DatahandlerWithAnnotationsTestCases.java
index af7e53e..aa97d95 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DatahandlerWithAnnotationsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DatahandlerWithAnnotationsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -78,6 +78,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
DataHandler data = new DataHandler("THISISATEXTSTRINGFORTHISDATAHANDLER", "text");
@@ -89,6 +90,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/dataHandlerAttachmentRefAndMimeType.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DatahandlerWithXMLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DatahandlerWithXMLTestCases.java
index 6703cff..8de4c51 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DatahandlerWithXMLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DatahandlerWithXMLTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
//useLogging = true;
}
+ @Override
protected TypeMappingInfo[] getTypeMappingInfos()throws Exception {
if(typeMappingInfos == null) {
typeMappingInfos = new TypeMappingInfo[1];
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflict2TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflict2TestCases.java
index 0f467e1..ac97947 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflict2TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflict2TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,16 +37,19 @@
init();
}
+ @Override
public void init() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
setTypeMappingInfos(getTypeMappingInfos());
}
+ @Override
public TypeMappingInfo getTypeMappingInfo(){
return getTypeMappingInfos()[1];
}
+ @Override
protected TypeMappingInfo[] getTypeMappingInfos() {
if(typeMappingInfos == null) {
typeMappingInfos = new TypeMappingInfo[2];
@@ -62,6 +65,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
Thing thing = new Thing();
thing.something = 10;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflictTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflictTestCases.java
index 7f633b0..f065172 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflictTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceConflictTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
setTypeMappingInfos(getTypeMappingInfos());
}
+ @Override
public TypeMappingInfo getTypeMappingInfo(){
return getTypeMappingInfos()[0];
}
@@ -69,6 +70,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
OtherThing otherThing = new OtherThing();
otherThing.someProperty = 10;
@@ -94,6 +96,7 @@
}
+ @Override
protected Map getProperties() {
HashMap props = new HashMap();
props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "namespace1");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceTestCases.java
index cebcd43..9993fec 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DefaultTargetNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
Customer cust = new Customer();
cust.firstName = "John";
@@ -64,6 +65,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/customer_dtn.xsd");
@@ -75,6 +77,7 @@
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE;
}
+ @Override
protected Map getProperties() {
HashMap props = new HashMap();
props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "overridden/namespace");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DuplicateListOfStringsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DuplicateListOfStringsTestCases.java
index df7fb2d..6ef7260 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DuplicateListOfStringsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DuplicateListOfStringsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -93,6 +93,7 @@
+ @Override
protected Object getControlObject() {
QName qname = new QName("examplenamespace", "root");
@@ -105,6 +106,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
@@ -117,7 +119,9 @@
}
//Not supported in JSON as there are xsi:type attributes written
+ @Override
public void testObjectToResultWithTypeMappingInfoJSON() throws Exception {}
+ @Override
public void testXMLToObjectFromSourceWithTypeMappingInfoJSON() throws Exception {}
@Override
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DuplicateListOfStringsTestCasesWithXML.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DuplicateListOfStringsTestCasesWithXML.java
index 39da250..70e9a6e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DuplicateListOfStringsTestCasesWithXML.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/DuplicateListOfStringsTestCasesWithXML.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
}
// override this method such that XML metadata can be used instead of annotations
+ @Override
protected TypeMappingInfo[] getTypeMappingInfos()throws Exception {
if (typeMappingInfos == null){
typeMappingInfos = new TypeMappingInfo[4];
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeAdapterTestCases.java
index d9d3d44..6867605 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
setTypeMappingInfos(getTypeMappingInfos());
@@ -69,6 +70,7 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -81,6 +83,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/employeeAdapter.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeNillableTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeNillableTestCases.java
index d3c282b..700febe 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeNillableTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeNillableTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,12 +27,14 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someUri", "testTagName");
JAXBElement jaxbElement = new JAXBElement(qname, Employee.class, null);
return jaxbElement;
}
+ @Override
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeTestCases.java
index 3012d3d..597db80 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/EmployeeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
setTypeMappingInfos(getTypeMappingInfos());
@@ -59,6 +60,7 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -72,6 +74,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/employee.xsd");
@@ -86,6 +89,7 @@
+ @Override
protected Map getProperties() {
String pkg = "someUri";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/GenericArrayTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/GenericArrayTypeTestCases.java
index e8ab76d..efbbce0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/GenericArrayTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/GenericArrayTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,6 +70,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
byte[] bytes3 = new byte[]{0,1,2,3};
@@ -87,6 +88,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/genericArrayType.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ImageTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ImageTestCases.java
index 24c4824..569859c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ImageTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ImageTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,6 +65,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
Image myImage = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR);
@@ -76,6 +77,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/image.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/IntegerArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/IntegerArrayTestCases.java
index 3ce0903..2a4b2e0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/IntegerArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/IntegerArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("http://jaxb.dev.java.net/array", "testTagName");
@@ -67,6 +68,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/integerArray.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterListToStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterListToStringTestCases.java
index 21acb6a..33566e0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterListToStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterListToStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,6 +62,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
List<String> list = new ArrayList<String>();
list.add("String1");
@@ -73,6 +74,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/listtostring.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterMapToEmpTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterMapToEmpTestCases.java
index 7048b53..e1b21ce 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterMapToEmpTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterMapToEmpTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,6 +60,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
Map map = new HashMap();
map.put("firstName", "John");
@@ -71,6 +72,7 @@
return jaxbElement;
}
+ @Override
public Object getWriteControlObject() {
Map map = new HashMap();
map.put("firstName", "John");
@@ -81,6 +83,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/maptoemployee.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterMapTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterMapTypeTestCases.java
index 522aa50..3375747 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterMapTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterMapTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,6 +62,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
Map<String, String> map = new HashMap<String, String>();
map.put("one", "two");
@@ -73,6 +74,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/maptypeoverride.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterStringToListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterStringToListTestCases.java
index 69215dc..d4c82dc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterStringToListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/JavaTypeAdapterStringToListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("", "testTagName");
JAXBElement jaxbElement = new JAXBElement(qname, String.class, null);
@@ -69,6 +70,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/stringtolist.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfByteArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfByteArrayTestCases.java
index 848ce76..5251b30 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfByteArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfByteArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
byte[] bytes3 = new byte[]{0,1,2,3};
@@ -73,6 +74,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/listOfByteArray.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfByteObjectArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfByteObjectArrayTestCases.java
index 31edfcb..9599cd5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfByteObjectArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfByteObjectArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
Byte[] bytes3 = new Byte[]{0,1,2,3};
@@ -71,6 +72,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/listOfByteObjectArray.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfDataHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfDataHandlerTestCases.java
index 558dc8f..b771a3d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfDataHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/ListOfDataHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,6 +80,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
DataHandler data = new DataHandler("THISISATEXTSTRINGFORTHISDATAHANDLER", "text");
@@ -99,6 +100,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapStringIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapStringIntegerTestCases.java
index 1bdb3e4..295abaf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapStringIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapStringIntegerTestCases.java
@@ -57,6 +57,7 @@
return typeMappingInfos;
}
+ @Override
public Object getReadControlObject() {
QName qname = new QName("", "root");
JAXBElement jbe = new JAXBElement(qname, Object.class, null);
@@ -64,6 +65,7 @@
return jbe;
}
+ @Override
protected Object getControlObject() {
HashMap<String, Integer> theMap = new HashMap<String, Integer>();
theMap.put("thekey", Integer.valueOf(10));
@@ -72,6 +74,7 @@
return theMap;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/stringIntegerHashMap.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapToEmployeeAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapToEmployeeAdapter.java
index 42342e1..15667d9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapToEmployeeAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MapToEmployeeAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public class MapToEmployeeAdapter extends XmlAdapter<Employee, Map>{
+ @Override
public Employee marshal(Map v) throws Exception {
Employee emp = new Employee();
emp.firstName = "John";
@@ -28,6 +29,7 @@
return emp;
}
+ @Override
public Map unmarshal(Employee v) throws Exception {
Map map = new HashMap();
map.put("firstName", "John");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapTestCases.java
index a6fc829..197a2c1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapTestCases.java
@@ -38,6 +38,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
setTypeMappingInfos(getTypeMappingInfos());
@@ -77,6 +78,7 @@
return tmi;
}
+ @Override
protected Object getControlObject() {
HashMap<String, Integer> theMap = new HashMap<String, Integer>();
theMap.put("thekey", Integer.valueOf(10));
@@ -84,6 +86,7 @@
return theMap;
}
+ @Override
public Object getReadControlObject() {
QName qname = new QName("", "root1");
JAXBElement jbe = new JAXBElement(qname, Object.class, null);
@@ -91,6 +94,7 @@
return jbe;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/multipleMaps.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapWithBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapWithBindingsTestCases.java
index 9a78226..6b8bb81 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapWithBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MultipleMapWithBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
super(name);
}
+ @Override
protected Map getProperties() {
String pkg = "";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MyAttachmentMarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MyAttachmentMarshaller.java
index a3e4ed6..572d6ab 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MyAttachmentMarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MyAttachmentMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
public boolean returnNull = false;
public String localName = null;
+ @Override
public String addSwaRefAttachment(DataHandler data) {
if(returnNull) {
return null;
@@ -45,6 +46,7 @@
return id;
}
+ @Override
public String addMtomAttachment(byte[] bytes, int start, int offset, String mimeType, String elemtnName, String namespaceURI) {
if(returnNull) {
return null;
@@ -57,6 +59,7 @@
return id;
}
+ @Override
public String addMtomAttachment(DataHandler data, String namespaceURI, String elementName) {
if(returnNull) {
return null;
@@ -69,6 +72,7 @@
return id;
}
+ @Override
public boolean isXOPPackage() {
return true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MyAttachmentUnmarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MyAttachmentUnmarshaller.java
index 07807f7..d5245ee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MyAttachmentUnmarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/MyAttachmentUnmarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
getAttachmentAsDataHandlerWasCalled = false;
}
+ @Override
public byte[] getAttachmentAsByteArray(String cid) {
Object obj = MyAttachmentMarshaller.attachments.get(cid);
if(obj instanceof byte[]){
@@ -45,6 +46,7 @@
}
}
+ @Override
public DataHandler getAttachmentAsDataHandler(String cid) {
this.getAttachmentAsDataHandlerWasCalled = true;
Object obj = MyAttachmentMarshaller.attachments.get(cid);
@@ -54,6 +56,7 @@
return null;
}
+ @Override
public boolean isXOPPackage() {
// force attachment usage
return true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/NodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/NodeTestCases.java
index 4dd5828..54d2699 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/NodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/NodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,12 +64,14 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName(TNS, "root");
JAXBElement jaxbElement = new JAXBElement(qname, Element.class, responseWrapper());
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream(XSD_RESOURCE);
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/NullStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/NullStringTestCases.java
index 8dea26a..641be3f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/NullStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/NullStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("", "testTagname");
JAXBElement jaxbElement = new JAXBElement(qname, String.class, null);
@@ -60,6 +61,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/nullstring.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/PrimitiveByteArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/PrimitiveByteArrayTestCases.java
index e025018..a704152 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/PrimitiveByteArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/PrimitiveByteArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("http://jaxb.dev.java.net/array", "testTagName");
JAXBElement jaxbElement = new JAXBElement(qname, byte[].class, null);
@@ -65,6 +66,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/PrimitiveByteArray.xsd");
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/PrimitiveIntTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/PrimitiveIntTestCases.java
index 4c9de0a..af82490 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/PrimitiveIntTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/PrimitiveIntTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("", "testTagname");
JAXBElement jaxbElement = new JAXBElement(qname, int.class, null);
@@ -59,6 +60,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/int.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayEmptyContentAttachmentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayEmptyContentAttachmentTestCases.java
index 6780cb6..f7ca708 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayEmptyContentAttachmentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayEmptyContentAttachmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,6 +66,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -78,6 +79,7 @@
return XML_RESOURCE;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/byteArray.xsd");
@@ -85,6 +87,7 @@
controlSchema.put("someUri", instream);
return controlSchema;
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertNotNull(this.attachmentMarshaller.getLocalName());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayEmptyContentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayEmptyContentTestCases.java
index 77a6724..16b5d6c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayEmptyContentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayEmptyContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -72,6 +73,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/byteArray.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayNullContentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayNullContentTestCases.java
index 0b87fbc..709959e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayNullContentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayNullContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,6 +65,7 @@
MyAttachmentMarshaller.attachments.put(MyAttachmentUnmarshaller.ATTACHMENT_TEST_ID, bytes);
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -76,6 +77,7 @@
protected String getNoXsiTypeControlResourceName() {
return XML_RESOURCE;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/byteArray.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayTestCases.java
index 7917939..8815eee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/RootLevelByteArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,6 +63,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
byte[] data = new byte[] {1, 2, 3, 4, 5, 6};
@@ -74,6 +75,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/byteArray.xsd");
@@ -86,6 +88,7 @@
return XML_RESOURCE;
}
+ @Override
protected void comparePrimitiveArrays(Object controlValue, Object testValue){
byte[] bytes1;
byte[] bytes2;
@@ -106,6 +109,7 @@
}
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertNotNull(this.attachmentMarshaller.getLocalName());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/StringStringToIntegerIntegerMapAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/StringStringToIntegerIntegerMapAdapter.java
index 3544f64..06f0690 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/StringStringToIntegerIntegerMapAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/StringStringToIntegerIntegerMapAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,11 +22,12 @@
public class StringStringToIntegerIntegerMapAdapter extends XmlAdapter<Map<Integer, Integer>, Map<String, String>>{
+ @Override
public Map<Integer, Integer> marshal(Map<String, String> v) throws Exception {
Map<Integer, Integer> theMap = new HashMap<Integer, Integer>();
Iterator<Map.Entry<String, String>> iter = v.entrySet().iterator();
while(iter.hasNext()){
- Map.Entry<String, String> entry = (Map.Entry<String, String>) iter.next();
+ Map.Entry<String, String> entry = iter.next();
String key = entry.getKey();
String value = entry.getValue();
@@ -38,11 +39,12 @@
return theMap;
}
+ @Override
public Map<String, String>unmarshal(Map<Integer, Integer> v) throws Exception {
Map<String, String> theMap = new HashMap<String, String>();
Iterator<Map.Entry<Integer, Integer>> iter = v.entrySet().iterator();
while(iter.hasNext()){
- Map.Entry<Integer, Integer> entry = (Map.Entry<Integer, Integer>) iter.next();
+ Map.Entry<Integer, Integer> entry = iter.next();
Integer key = entry.getKey();
Integer value = entry.getValue();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/StringToListAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/StringToListAdapter.java
index d86e704..3b2a7ed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/StringToListAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/StringToListAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public class StringToListAdapter extends XmlAdapter<List<String>, String> {
+ @Override
public List<String> marshal(String v) throws Exception {
ArrayList<String> list = new ArrayList<String>();
list.add("string1");
@@ -28,6 +29,7 @@
return list;
}
+ @Override
public String unmarshal(List<String> v) throws Exception {
return "unmarshalled string";
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
index 87a9fbd..9992183 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoTestCases.java
@@ -85,6 +85,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setupParser();
setupControlDocs();
@@ -99,6 +100,7 @@
bindingsFileXSDSource = new StreamSource(bindingsFileXSDInputStream);
}
+ @Override
public void tearDown() throws Exception{
super.tearDown();
jaxbContext = null;
@@ -122,7 +124,7 @@
}
}
- jaxbContext = new org.eclipse.persistence.jaxb.JAXBContextFactory().createContext(newTypes, props, Thread.currentThread().getContextClassLoader());
+ jaxbContext = org.eclipse.persistence.jaxb.JAXBContextFactory.createContext(newTypes, props, Thread.currentThread().getContextClassLoader());
jaxbMarshaller = jaxbContext.createMarshaller();
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
}
@@ -200,7 +202,7 @@
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -233,7 +235,7 @@
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLEventWriter eventWriter= factory.createXMLEventWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -278,6 +280,7 @@
testSchemaGen(getControlSchemaFiles());
}
+ @Override
protected void compareValues(Object controlValue, Object testValue){
if(controlValue instanceof Node && testValue instanceof Node) {
assertXMLIdentical(((Node)controlValue).getOwnerDocument(), ((Node)testValue).getOwnerDocument());
@@ -407,6 +410,7 @@
assertXMLIdentical(getWriteControlDocument(), testDocument);
}
+ @Override
public void compareJAXBElementObjects(JAXBElement controlObj, JAXBElement testObj) {
assertEquals(controlObj.getName().getLocalPart(), testObj.getName().getLocalPart());
assertEquals(controlObj.getName().getNamespaceURI(), testObj.getName().getNamespaceURI());
@@ -585,6 +589,7 @@
schemaFiles = new HashMap<String, Writer>();
}
+ @Override
public Result createOutput(String namespaceURI, String suggestedFileName) throws IOException {
//return new StreamResult(System.out);
if (namespaceURI == null) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoWithJSONTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoWithJSONTestCases.java
index 49a15bc..fe8e80a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoWithJSONTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/TypeMappingInfoWithJSONTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,6 +66,7 @@
+ @Override
public void testSchemaGen() throws Exception {
testSchemaGen(getControlSchemaFiles());
}
@@ -112,6 +113,7 @@
assertEquals(expectedString, testString);
}
+ @Override
public void compareJAXBElementObjects(JAXBElement controlObj, JAXBElement testObj) {
assertEquals(controlObj.getName().getLocalPart(), testObj.getName().getLocalPart());
Object mapper = null;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/UrlTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/UrlTestCases.java
index 5ed7d95..abe39cf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/UrlTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/UrlTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,12 +58,14 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("", "testTagname");
JAXBElement jaxbElement = new JAXBElement(qname, URL.class, CONTROL_URL);
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream(XSD_RESOURCE);
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/XmlListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/XmlListTestCases.java
index 8a267ff..8bf1798 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/XmlListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/XmlListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
public void _testArray(Object controlArray) throws Exception{
XmlList xmlList = new XmlList() {
+ @Override
public Class<? extends Annotation> annotationType() {
return XmlList.class;
}
@@ -96,6 +97,7 @@
public void _testJSONArray(Object controlArray, String controlString, String mediaType) throws Exception{
XmlList xmlList = new XmlList() {
+ @Override
public Class<? extends Annotation> annotationType() {
return XmlList.class;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/arraywithannotations/ArrayWithAnnotationsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/arraywithannotations/ArrayWithAnnotationsTestCases.java
index dad3465..94e0abc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/arraywithannotations/ArrayWithAnnotationsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/arraywithannotations/ArrayWithAnnotationsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,10 +61,12 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
return new JAXBElement<Float[]>(XML_TAG_NAME, Float[].class, f);
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream(XSD_RESOURCE);
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/classloader/ClassLoaderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/classloader/ClassLoaderTestCases.java
index 2f7afcf..2b6b655 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/classloader/ClassLoaderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/classloader/ClassLoaderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,16 +59,18 @@
return typeMappingInfos;
}
+ @Override
public void setTypeMappingInfos(TypeMappingInfo[] newTypes) throws Exception {
URL[] urls = new URL[0];
URLClassLoader emptyClassLoader = new URLClassLoader(urls, null);
typeMappingInfos = newTypes;
- jaxbContext = new org.eclipse.persistence.jaxb.JAXBContextFactory().createContext(newTypes, getProperties(), emptyClassLoader);
+ jaxbContext = org.eclipse.persistence.jaxb.JAXBContextFactory.createContext(newTypes, getProperties(), emptyClassLoader);
jaxbMarshaller = jaxbContext.createMarshaller();
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("examplenamespace", "root");
@@ -96,6 +98,7 @@
return jaxbElement;
}
+ @Override
public Object getWriteControlObject() {
QName qname = new QName("examplenamespace", "root");
@@ -123,6 +126,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
InputStream instream2 = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/classloader/classloader.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingByteArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingByteArrayTestCases.java
index d3efd38..ccabe03 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingByteArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingByteArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -69,6 +69,7 @@
}
+ @Override
protected Object getControlObject() {
String testString = "theString";
@@ -81,6 +82,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingByteArrayClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassAndAdapterClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassAndAdapterClassTestCases.java
index 38d49bc..b27d8f1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassAndAdapterClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassAndAdapterClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -115,6 +115,7 @@
}
+ @Override
protected Object getControlObject() {
List<String> list = new ArrayList<String>();
@@ -127,6 +128,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingClassAndAdapterClass.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassAndTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassAndTypeTestCases.java
index 9507cc9..4650c3a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassAndTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassAndTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,6 +63,7 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -76,6 +77,7 @@
return jaxbElement;
}
+ @Override
public Object getWriteControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -90,6 +92,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassesTestCases.java
index 5cb6223..ea9bb58 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingClassesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,6 +66,7 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -79,6 +80,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingCollectionTestCases.java
index 530c043..a36aaf6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -103,6 +103,7 @@
}
+ @Override
protected Object getControlObject() {
Collection<Object> objects = new ArrayList<Object>();
@@ -118,6 +119,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingCollections.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListClassAndTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListClassAndTypeTestCases.java
index ab0a0f6..4d94b63 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListClassAndTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListClassAndTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -72,6 +72,7 @@
}
+ @Override
protected Object getControlObject() {
List<Employee> emps = new ArrayList<Employee>();
@@ -89,6 +90,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingListObjectsClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListClassesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListClassesTestCases.java
index ae99309..f251b05 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListClassesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListClassesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,6 +68,7 @@
}
+ @Override
protected Object getControlObject() {
List<Employee> emps = new ArrayList<Employee>();
@@ -85,6 +86,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingListObjectsClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListObjectsTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListObjectsTypeTestCases.java
index 7e210af..1af72b8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListObjectsTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListObjectsTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,6 +71,7 @@
}
+ @Override
protected Object getControlObject() {
List<Employee> emps = new ArrayList<Employee>();
@@ -88,6 +89,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingListObjectsClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListTypeTestCases.java
index e251c04..f4b8f59 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingListTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -105,6 +105,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
List<Employee> emps = new ArrayList<Employee>();
@@ -122,6 +123,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingListTypes.xsd");
@@ -142,6 +144,7 @@
assertEquals(4, descriptors.size());
}
+ @Override
public Map getProperties() {
Map props = new HashMap();
props.put(JAXBContextFactory.DEFAULT_TARGET_NAMESPACE_KEY, "someUri");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingMapsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingMapsTestCases.java
index e971e65..1dd50ed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingMapsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingMapsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -97,6 +97,7 @@
}
+ @Override
protected Object getControlObject() {
Map<Object, Object> theMap = new HashMap<Object, Object>();
@@ -109,6 +110,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingMaps.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringArrayClassesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringArrayClassesTestCases.java
index 7d4e0dd..b51d286 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringArrayClassesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringArrayClassesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,6 +70,7 @@
}
+ @Override
protected Object getControlObject() {
String[] testStrings = new String[]{"theString", "theString2", "theString3"};
@@ -82,6 +83,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingStringArrayClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringClassAndTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringClassAndTypeTestCases.java
index 253469b..9af709a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringClassAndTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringClassAndTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
}
+ @Override
protected Object getControlObject() {
String testString = "theString";
@@ -73,6 +74,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingStringClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringClassTestCases.java
index d6c4d00..17afe4c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,6 +62,7 @@
}
+ @Override
protected Object getControlObject() {
String testString = "theString";
@@ -74,6 +75,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingStringClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringTypeTestCases.java
index 744abbd..8266665 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingStringTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
}
+ @Override
protected Object getControlObject() {
String testString = "theString";
@@ -73,6 +74,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingStringClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingTypesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingTypesTestCases.java
index 7b074d5..1d1a03b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingTypesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/ConflictingTypesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,6 +64,7 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -77,6 +78,7 @@
return jaxbElement;
}
+ @Override
public Object getWriteControlObject() {
QName qname = new QName("someUri", "testTagName");
@@ -89,6 +91,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/conflictingClasses.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/NonConflictingListClassAndTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/NonConflictingListClassAndTypeTestCases.java
index 06100c4..5356cef 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/NonConflictingListClassAndTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/NonConflictingListClassAndTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,6 +67,7 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("", "testTagName");
JAXBElement jaxbElement = new JAXBElement(qname, Object.class, null);
@@ -78,6 +79,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/nonConflictingLists.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/StringAndListOfStringConflictTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/StringAndListOfStringConflictTestCases.java
index 5e6c2db..aefb7b7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/StringAndListOfStringConflictTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/collisions/StringAndListOfStringConflictTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -89,6 +89,7 @@
return controlSchema;
}
+ @Override
public void testSchemaGen() {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/TypeMappingInfoObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/TypeMappingInfoObjectTestCases.java
index a7d528a..03a6b9a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/TypeMappingInfoObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/TypeMappingInfoObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someuri","response");
@@ -71,6 +72,7 @@
return elem;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/object/employee.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/prefixes/TypeMappingInfoObjectNewPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/prefixes/TypeMappingInfoObjectNewPrefixTestCases.java
index 0173e01..f014fe4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/prefixes/TypeMappingInfoObjectNewPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/prefixes/TypeMappingInfoObjectNewPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,6 +70,7 @@
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("differentURI","response");
@@ -82,6 +83,7 @@
return elem;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/object/employeeNewPrefixes.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/prefixes/TypeMappingInfoObjectPrefixTestsCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/prefixes/TypeMappingInfoObjectPrefixTestsCases.java
index f49277f..b8d5bfb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/prefixes/TypeMappingInfoObjectPrefixTestsCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/object/prefixes/TypeMappingInfoObjectPrefixTestsCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,6 +68,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("someuri","response");
@@ -80,6 +81,7 @@
return elem;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/object/employeePrefixes.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/PrimitiveIntArrayTestsCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/PrimitiveIntArrayTestsCases.java
index 777a838..9bd7056 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/PrimitiveIntArrayTestsCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/PrimitiveIntArrayTestsCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("http://jaxb.dev.java.net/array", "testTagName");
@@ -68,6 +69,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/int.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArrayNilTestsCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArrayNilTestsCases.java
index 507cd08..63d1a7b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArrayNilTestsCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArrayNilTestsCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("http://jaxb.dev.java.net/array", "testTagName");
@@ -68,6 +69,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/string.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArraySingleNodeTestsCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArraySingleNodeTestsCases.java
index 84a62fe..34014e4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArraySingleNodeTestsCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArraySingleNodeTestsCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("http://jaxb.dev.java.net/array", "testTagName");
@@ -71,6 +72,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/string-singlenode.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArrayTestsCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArrayTestsCases.java
index 14b5e75..46ea189 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArrayTestsCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/StringArrayTestsCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
QName qname = new QName("http://jaxb.dev.java.net/array", "testTagName");
@@ -68,6 +69,7 @@
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles() {
InputStream instream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/typemappinginfo/parray/string.xsd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/simple/EmptyClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/simple/EmptyClassTestCases.java
index 1fc15e1..3cf2834 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/simple/EmptyClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/simple/EmptyClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
return typeMappingInfos;
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
@@ -64,6 +65,7 @@
return jaxbElement;
}
+ @Override
public Object getWriteControlObject(){
Person person = new Person();
@@ -74,6 +76,7 @@
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/simple/TypeMappingInfoNullTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/simple/TypeMappingInfoNullTypeTestCases.java
index d33ecb3..ca3ea14 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/simple/TypeMappingInfoNullTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/simple/TypeMappingInfoNullTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,7 +35,7 @@
tmis[0] = tmi;
try{
- JAXBContext ctx = new org.eclipse.persistence.jaxb.JAXBContextFactory().createContext(tmis, null, Thread.currentThread().getContextClassLoader());
+ JAXBContext ctx = org.eclipse.persistence.jaxb.JAXBContextFactory.createContext(tmis, null, Thread.currentThread().getContextClassLoader());
}catch(JAXBException ex){
assertEquals(JAXBException.NULL_TYPE_ON_TYPEMAPPINGINFO, ex.getErrorCode());
return;
@@ -55,7 +55,7 @@
tmis[0] = tmi;
try{
- JAXBContext ctx = new org.eclipse.persistence.jaxb.JAXBContextFactory().createContext(tmis, null, Thread.currentThread().getContextClassLoader());
+ JAXBContext ctx = org.eclipse.persistence.jaxb.JAXBContextFactory.createContext(tmis, null, Thread.currentThread().getContextClassLoader());
}catch(JAXBException ex){
assertEquals(JAXBException.NULL_TYPE_ON_TYPEMAPPINGINFO, ex.getErrorCode());
return;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/ListOfCustomerNoXmlXsiTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/ListOfCustomerNoXmlXsiTypeTestCases.java
index 8824ab9..c864a31 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/ListOfCustomerNoXmlXsiTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/ListOfCustomerNoXmlXsiTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
return typeMappingInfos;
}
+ @Override
public Object getWriteControlObject() {
List<Customer> theList = new ArrayList<Customer>();
@@ -81,12 +82,14 @@
return theList;
}
+ @Override
public Object getControlObject(){
QName qname = new QName("someUri", "testListOfCustomer");
JAXBElement jaxbElement = new JAXBElement(qname, Object.class, getWriteControlObject());
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/ListOfCustomerXsiTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/ListOfCustomerXsiTypeTestCases.java
index 36eb816..33a57ed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/ListOfCustomerXsiTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/ListOfCustomerXsiTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,6 +70,7 @@
return typeMappingInfos;
}
+ @Override
public Object getWriteControlObject() {
List<Customer> theList = new ArrayList<Customer>();
@@ -90,12 +91,14 @@
return theList;
}
+ @Override
public Object getControlObject(){
QName qname = new QName("someUri", "testListOfCustomer");
JAXBElement jaxbElement = new JAXBElement(qname, List.class, getWriteControlObject());
return jaxbElement;
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/self/SingleEmployeeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/self/SingleEmployeeTestCases.java
index 9f32d4d..b529247 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/self/SingleEmployeeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/typemappinginfo/xsitype/self/SingleEmployeeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,6 +64,7 @@
return typeMappingInfos;
}
+ @Override
public Object getWriteControlObject() {
Employee emp = new Employee();
emp.id = "123";
@@ -72,11 +73,13 @@
return emp;
}
+ @Override
public Object getControlObject(){
return new JAXBElement<Object>(new QName("someuri", "response"), Object.class, getWriteControlObject());
}
+ @Override
public Map<String, InputStream> getControlSchemaFiles(){
Map<String, InputStream> controlSchema = new HashMap<String, InputStream>();
@@ -86,6 +89,7 @@
return controlSchema;
}
+ @Override
public TypeMappingInfo getTypeMappingInfo(){
return typeMappingInfos[1];
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmapped/UnmappedElementsWarningTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmapped/UnmappedElementsWarningTestCases.java
index 0508e3e..0e82711 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmapped/UnmappedElementsWarningTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmapped/UnmappedElementsWarningTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
TestRunner.run(UnmappedElementsWarningTestCases.class);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
Class[] classes = new Class[1];
@@ -98,7 +99,7 @@
// default is not to warn on unmapped element with all defaults
try {
inputStream = ClassLoader.getSystemResourceAsStream(XML_RESOURCE);
- XMLUnmarshaller xmlUnmarshaller = (XMLUnmarshaller) unm.getXMLUnmarshaller();
+ XMLUnmarshaller xmlUnmarshaller = unm.getXMLUnmarshaller();
boolean shouldWarnOnUnmapped = xmlUnmarshaller.shouldWarnOnUnmappedElement();
BulkUnmapped unmarshalledObject = (BulkUnmapped) unm.unmarshal(inputStream);
@@ -113,7 +114,7 @@
// 2 Unmarshal with validation (same unmarshaller)
try {
inputStream = ClassLoader.getSystemResourceAsStream(XML_RESOURCE);
- XMLUnmarshaller xmlUnmarshaller = (XMLUnmarshaller) unm.getXMLUnmarshaller();
+ XMLUnmarshaller xmlUnmarshaller = unm.getXMLUnmarshaller();
CustomValidationEventHandler handler = new CustomValidationEventHandler();
unm.setEventHandler(handler);
boolean shouldWarnOnUnmapped = xmlUnmarshaller.shouldWarnOnUnmappedElement();
@@ -132,7 +133,7 @@
try {
inputStream = ClassLoader.getSystemResourceAsStream(XML_RESOURCE);
unm.setEventHandler(null);
- XMLUnmarshaller xmlUnmarshaller = (XMLUnmarshaller) unm.getXMLUnmarshaller();
+ XMLUnmarshaller xmlUnmarshaller = unm.getXMLUnmarshaller();
boolean shouldWarnOnUnmapped = xmlUnmarshaller.shouldWarnOnUnmappedElement();
BulkUnmapped unmarshalledObject = (BulkUnmapped) unm.unmarshal(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/RepeatedUnmarshalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/RepeatedUnmarshalTestCases.java
index cab2360..85bd4aa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/RepeatedUnmarshalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/RepeatedUnmarshalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
controlObject = new TestObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectFailsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectFailsTestCases.java
index 3564f37..81c720c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectFailsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectFailsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,10 +30,12 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_JSON);
}
+ @Override
public MediaType getXMLUnmarshalMediaType(){
return MediaType.APPLICATION_XML;
}
+ @Override
public MediaType getJSONUnmarshalMediaType(){
return MediaType.APPLICATION_JSON;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectMediaTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectMediaTypeTestCases.java
index ab6bcea..276e630 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectMediaTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectMediaTypeTestCases.java
@@ -49,6 +49,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.AUTO_DETECT_MEDIA_TYPE, true);
}
+ @Override
protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
ArrayList choices = new ArrayList();
@@ -64,6 +65,7 @@
}
+ @Override
protected Object getJSONReadControlObject(){
//same as getReadControl Except order is different
EmployeeCollection employee = new EmployeeCollection();
@@ -80,10 +82,12 @@
return employee;
}
+ @Override
public MediaType getXMLUnmarshalMediaType(){
return MediaType.APPLICATION_JSON;
}
+ @Override
public MediaType getJSONUnmarshalMediaType(){
return MediaType.APPLICATION_XML;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectSmallDocTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectSmallDocTestCases.java
index 1f048a6..1af7714 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectSmallDocTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/unmarshaller/autodetect/AutoDetectSmallDocTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,10 +42,12 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.AUTO_DETECT_MEDIA_TYPE, true);
}
+ @Override
public MediaType getXMLUnmarshalMediaType(){
return MediaType.APPLICATION_XML;
}
+ @Override
public MediaType getJSONUnmarshalMediaType(){
return MediaType.APPLICATION_JSON;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/uri/ChildURITestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/uri/ChildURITestCases.java
index 30abe07..73e9026 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/uri/ChildURITestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/uri/ChildURITestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Object getControlObject(){
try{
TestObject testObject = new TestObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/uri/URITestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/uri/URITestCases.java
index 489898d..2454ec0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/uri/URITestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/uri/URITestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
//setWriteControlDocument(XML_WRITE_RESOURCE);
}
+ @Override
public Object getControlObject(){
JAXBElement<URI> jbe = null;
@@ -49,6 +50,7 @@
return jbe;
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/choice/AdapterWithElementsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/choice/AdapterWithElementsTestCases.java
index f5a3037..31d88dd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/choice/AdapterWithElementsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/choice/AdapterWithElementsTestCases.java
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Foo foo = new Foo();
foo.singleChoice = new BarA();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassAtoClassBAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassAtoClassBAdapter.java
index 7e8e628..f290e5a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassAtoClassBAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassAtoClassBAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
public class ClassAtoClassBAdapter extends XmlAdapter<ClassA, ClassB> {
+ @Override
public ClassA marshal(ClassB classBObject) throws Exception {
String s = classBObject.getSomeValue();
ClassA classA = new ClassA();
@@ -25,6 +26,7 @@
return classA;
}
+ @Override
public ClassB unmarshal(ClassA classAObject) throws Exception {
String s = classAObject.getTheValue();
ClassB classB = new ClassB();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassCtoClassBAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassCtoClassBAdapter.java
index 3130bc1..80392fd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassCtoClassBAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassCtoClassBAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
public class ClassCtoClassBAdapter extends XmlAdapter<ClassC, ClassB> {
+ @Override
public ClassC marshal(ClassB classBObject) throws Exception {
String s = classBObject.getSomeValue();
ClassC classC= new ClassC();
@@ -25,6 +26,7 @@
return classC;
}
+ @Override
public ClassB unmarshal(ClassC classCObject) throws Exception {
String s = classCObject.getClassCValue();
ClassB classB = new ClassB();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassLevelAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassLevelAdapterTestCases.java
index f2cb359..6793f9e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassLevelAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/classlevel/ClassLevelAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
TestObject tester = new TestObject();
ClassB classB = new ClassB();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/composite/MyHashMapAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/composite/MyHashMapAdapter.java
index c9c4fe8..d411f68 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/composite/MyHashMapAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/composite/MyHashMapAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public final class MyHashMapAdapter extends XmlAdapter<MyHashMapType, LinkedHashMap> {
+ @Override
public MyHashMapType marshal(LinkedHashMap arg0) throws Exception {
MyHashMapType myHashMapType = new MyHashMapType();
myHashMapType.entry = new ArrayList<MyHashMapEntryType>();
@@ -35,6 +36,7 @@
return myHashMapType;
}
+ @Override
public LinkedHashMap unmarshal(MyHashMapType arg0) throws Exception {
LinkedHashMap map = new LinkedHashMap<Integer, String>();
for (Iterator typeIt = arg0.entry.iterator(); typeIt.hasNext(); ) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/composite/XmlAdapterCompositeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/composite/XmlAdapterCompositeTestCases.java
index fcd1449..1854ac6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/composite/XmlAdapterCompositeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/composite/XmlAdapterCompositeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MyMap myMap = new MyMap();
myMap.hashMap = new java.util.LinkedHashMap();
@@ -45,6 +46,7 @@
return myMap;
}
+ @Override
protected Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_VALUE_WRAPPER, "val");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositecollection/MyDateAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositecollection/MyDateAdapter.java
index 8c5de40..7d57fe3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositecollection/MyDateAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositecollection/MyDateAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public final class MyDateAdapter extends XmlAdapter<MyDateType, Date> {
+ @Override
public MyDateType marshal(Date arg0) throws Exception {
MyDateType dType = new MyDateType();
dType.day = arg0.getDate();
@@ -26,6 +27,7 @@
return dType;
}
+ @Override
public Date unmarshal(MyDateType arg0) throws Exception {
return new Date(arg0.year, arg0.month, arg0.day);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositecollection/XmlAdapterCompositeCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositecollection/XmlAdapterCompositeCollectionTestCases.java
index 762c917..5d62514 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositecollection/XmlAdapterCompositeCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositecollection/XmlAdapterCompositeCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MyDates myDates = new MyDates();
Date date1 = new Date(YEAR_1, MONTH_1, DAY_1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/CollapsedStringListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/CollapsedStringListTestCases.java
index 7a22f7c..2e8cda2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/CollapsedStringListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/CollapsedStringListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setClasses(new Class[] {CollapsedStringListRoot.class});
}
+ @Override
public boolean shouldRemoveEmptyTextNodesFromControlDoc() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/XmlAdapterCompositeDirectCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/XmlAdapterCompositeDirectCollectionTestCases.java
index 22b7949..42cad36 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/XmlAdapterCompositeDirectCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/XmlAdapterCompositeDirectCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MyCalendarType mcType = new MyCalendarType();
mcType.day = DAY_1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/XmlAdapterDirectCollectionArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/XmlAdapterDirectCollectionArrayTestCases.java
index df78aa4..676ec22 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/XmlAdapterDirectCollectionArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/compositedirectcollection/XmlAdapterDirectCollectionArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MyCalendarType mcType = new MyCalendarType();
mcType.day = DAY_1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/ListToStringAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/ListToStringAdapter.java
index 9c4818b..965b7eb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/ListToStringAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/ListToStringAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class ListToStringAdapter extends XmlAdapter<java.lang.String, List<String>> {
+ @Override
public String marshal(List<String> value) {
String string = "";
for(int i = 0; i < value.size(); i++) {
@@ -33,6 +34,7 @@
return string;
}
+ @Override
public List<String> unmarshal(String value) {
StringTokenizer tokenizer = new StringTokenizer(value, ",");
ArrayList<String> list = new ArrayList(tokenizer.countTokens());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/ListToStringAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/ListToStringAdapterTestCases.java
index 3e6de14..b484588 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/ListToStringAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/ListToStringAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.name = "John Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/MyCalendarAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/MyCalendarAdapter.java
index 91cc3c1..785a87b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/MyCalendarAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/MyCalendarAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public final class MyCalendarAdapter extends XmlAdapter<Calendar, MyCalendarType> {
+ @Override
public MyCalendarType unmarshal(Calendar arg0) throws Exception {
MyCalendarType cType = new MyCalendarType();
cType.day = arg0.get(Calendar.DATE);
@@ -27,6 +28,7 @@
return cType;
}
+ @Override
public Calendar marshal(MyCalendarType arg0) throws Exception {
return new GregorianCalendar(arg0.year, arg0.month, arg0.day);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/MyCalendarExceptionAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/MyCalendarExceptionAdapter.java
index b9149fb..8899553 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/MyCalendarExceptionAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/MyCalendarExceptionAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,11 +21,13 @@
public static boolean unmarshalHit;
public static boolean marshalHit;
+ @Override
public MyCalendarType unmarshal(Calendar arg0) throws Exception {
unmarshalHit = true;
throw new NullPointerException();
}
+ @Override
public Calendar marshal(MyCalendarType arg0) throws Exception {
marshalHit = true;
throw new NullPointerException();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/StringAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/StringAdapter.java
index 91d2c23..5b1bc84 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/StringAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/StringAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,10 +21,12 @@
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class StringAdapter extends XmlAdapter<Integer, String> {
+ @Override
public Integer marshal(String value) {
return Integer.parseInt(value);
}
+ @Override
public String unmarshal(Integer value) {
return value.toString();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/StringStringAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/StringStringAdapter.java
index ba3b812..2b34f85 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/StringStringAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/StringStringAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,10 +21,12 @@
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class StringStringAdapter extends XmlAdapter<String, String> {
+ @Override
public String marshal(String value) {
return value;
}
+ @Override
public String unmarshal(String value) {
return value;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectExceptionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectExceptionTestCases.java
index c801fa7..8ef76a2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectExceptionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectExceptionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MyCalendarException myCal = new MyCalendarException();
MyCalendarType myCalType = new MyCalendarType();
@@ -44,27 +45,32 @@
return myCal;
}
+ @Override
public void setUp() throws Exception{
super.setUp();
MyCalendarExceptionAdapter.marshalHit = false;
MyCalendarExceptionAdapter.unmarshalHit = false;
}
+ @Override
public Object getReadControlObject() {
MyCalendarException myCal = new MyCalendarException();
return myCal;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception{
super.xmlToObjectTest(testObject);
assertTrue(MyCalendarExceptionAdapter.unmarshalHit);
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception{
super.jsonToObjectTest(testObject);
assertTrue(MyCalendarExceptionAdapter.unmarshalHit);
}
+ @Override
public void objectToXMLStringWriter(Object objectToWrite) throws Exception{
super.objectToXMLStringWriter(objectToWrite);
assertTrue(MyCalendarExceptionAdapter.marshalHit);
@@ -76,6 +82,7 @@
// assertTrue("Nested exception should be a ConversionException but was " + nestedException.getClass().getName(), nestedException instanceof ConversionException);
// }
+ @Override
public void testRoundTrip(){
//no need to perform this test
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectNullTestCases.java
index 3e87bba..d709ad6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,12 +30,14 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MyCalendar myCal = new MyCalendar();
return myCal;
}
+ @Override
public void testRoundTrip(){
//no need to perform this test
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectTestCases.java
index 3b271a9..9c712f3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterDirectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MyCalendar myCal = new MyCalendar();
MyCalendarType mcType = new MyCalendarType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterSchemaTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterSchemaTypeTestCases.java
index cfc36f4..532d02e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterSchemaTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/direct/XmlAdapterSchemaTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Root r = new Root();
r.myString1 = "100";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/elementref/XmlAdapterElementRefListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/elementref/XmlAdapterElementRefListTestCases.java
index 001ed99..2ce008f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/elementref/XmlAdapterElementRefListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/elementref/XmlAdapterElementRefListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
TransactionsAdd ta = new TransactionsAdd();
List<String> txns = new ArrayList<String>(3);
@@ -43,6 +44,7 @@
}
+ @Override
protected Object getJSONReadControlObject() {
TransactionsAdd ta = new TransactionsAdd();
List<String> txns = new ArrayList<String>(3);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/elementref/XmlAdapterElementRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/elementref/XmlAdapterElementRefTestCases.java
index ca26314..05a1907 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/elementref/XmlAdapterElementRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/elementref/XmlAdapterElementRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
TransactionAdd ta = new TransactionAdd();
ta.txnType = TXN_TYPE;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/AdapterEnumMoreGenericTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/AdapterEnumMoreGenericTestCases.java
index bd13f27..948ebed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/AdapterEnumMoreGenericTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/AdapterEnumMoreGenericTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MoreGenericEnumRoot emp = new MoreGenericEnumRoot();
emp.multi = new ArrayList<Byte>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/AdapterEnumTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/AdapterEnumTestCases.java
index 76c83ae..5f2ba52 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/AdapterEnumTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/AdapterEnumTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EnumRoot emp = new EnumRoot();
emp.multi = new ArrayList<Byte>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/ByteToExampleEnumAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/ByteToExampleEnumAdapter.java
index e9f7574..0769922 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/ByteToExampleEnumAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/enumeration/ByteToExampleEnumAdapter.java
@@ -19,6 +19,7 @@
public class ByteToExampleEnumAdapter extends XmlAdapter<ExampleEnum, Byte> {
public ByteToExampleEnumAdapter(){}
+ @Override
public ExampleEnum marshal(Byte v) throws Exception {
ExampleEnum[] exArray = ExampleEnum.values();
for(ExampleEnum ex : exArray) {
@@ -29,6 +30,7 @@
return null;
}
+ @Override
public Byte unmarshal(ExampleEnum v) throws Exception {
return Byte.valueOf((byte)v.getValue());
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/generics/AdapterWithGenericsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/generics/AdapterWithGenericsTestCases.java
index afaf68a..505c3cb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/generics/AdapterWithGenericsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/generics/AdapterWithGenericsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
A<B> a = new A<B>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/hexbinary/XmlAdapterHexBinaryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/hexbinary/XmlAdapterHexBinaryTestCases.java
index 6db4635..52d2b31 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/hexbinary/XmlAdapterHexBinaryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/hexbinary/XmlAdapterHexBinaryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
byte[] bytes = new byte[] {30,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4,1,2,3,4};
Customer customer = new Customer();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/AdapterWithInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/AdapterWithInheritanceTestCases.java
index d944b7c..186fae3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/AdapterWithInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/AdapterWithInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,11 +32,13 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
return root;
}
+ @Override
public Object getReadControlObject() {
Root root = new Root();
root.foo = new Foo();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/Address.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/Address.java
index 19f5a61..ed2e14d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/Address.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/Address.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
private String street;
private String city;
+ @Override
@XmlAttribute
public String getHref() {
return href;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/GenericAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/GenericAdapterTestCases.java
index 38d9c1f..bbe69a8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/GenericAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/GenericAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
getControlObject();
}
+ @Override
protected Object getControlObject() {
Customer c = new Customer();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/PhoneNumber.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/PhoneNumber.java
index 04ee407..a5a6bff 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/PhoneNumber.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/inheritance/generics/PhoneNumber.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
private String href;
private String number;
+ @Override
@XmlAttribute
public String getHref() {
return href;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/FooWithBarNestedAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/FooWithBarNestedAdapter.java
index 78736fd..dea7d57 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/FooWithBarNestedAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/FooWithBarNestedAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
public static String SPACE = " ";
+ @Override
public List<String> unmarshal(Object arg0) throws Exception {
List<String> list = new ArrayList<String>();
if (arg0 instanceof Bar) {
@@ -61,6 +62,7 @@
return list;
}
+ @Override
public Object marshal(List<String> arg0) throws Exception {
Bar bar = new Bar();
String id = EMPTY_STR;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/MyAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/MyAdapter.java
index fa1e911..97b9927 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/MyAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/MyAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
public MyAdapter() {}
+ @Override
public String unmarshal(Object arg0) throws Exception {
String id = EMPTY_STR;
if (arg0 instanceof Bar) {
@@ -32,6 +33,7 @@
return id;
}
+ @Override
public Object marshal(String arg0) throws Exception {
Bar bar = new Bar();
bar.id = arg0;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/MyListAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/MyListAdapter.java
index 107df9e..357305a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/MyListAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/MyListAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
public MyListAdapter() {}
+ @Override
public List<String> unmarshal(Object arg0) throws Exception {
List<String> list = new ArrayList<String>();
if (arg0 instanceof Bar) {
@@ -41,6 +42,7 @@
return list;
}
+ @Override
public Object marshal(List<String> arg0) throws Exception {
Bar bar = new Bar();
String id = EMPTY_STR;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterListMultipleBarTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterListMultipleBarTestCases.java
index d0f863b..f8b059c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterListMultipleBarTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterListMultipleBarTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
public Object getControlObject() {
FooWithBars foo = new FooWithBars();
List<String> itemlist = new ArrayList<String>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterListSingleBarTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterListSingleBarTestCases.java
index 7a15b55..78cbfdc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterListSingleBarTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterListSingleBarTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
public Object getControlObject() {
FooWithBar fooWithBar = new FooWithBar();
List<String> itemlist = new ArrayList<String>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterNestedListSingleBarTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterNestedListSingleBarTestCases.java
index a117a0a..b7335f4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterNestedListSingleBarTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/list/XmlAdapterNestedListSingleBarTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
public Object getControlObject() {
FooWithBarNestedAdapter fooWithBar = new FooWithBarNestedAdapter();
List<String> itemlist = new ArrayList<String>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/map/JAXBMapWithAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/map/JAXBMapWithAdapterTestCases.java
index d29a75c..08e32ea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/map/JAXBMapWithAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/map/JAXBMapWithAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/map/MyObjectAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/map/MyObjectAdapter.java
index f0c3dff..0091875 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/map/MyObjectAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/map/MyObjectAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
public class MyObjectAdapter extends XmlAdapter<MyObject, HashMap<Integer, String>> {
+ @Override
public MyObject marshal(HashMap<Integer, String> arg0) throws Exception {
MyObject myObject = new MyObject();
@@ -38,6 +39,7 @@
return myObject;
}
+ @Override
public HashMap<Integer, String> unmarshal(MyObject arg0) throws Exception {
HashMap theMap = new HashMap<Integer, String>();
List<String> keys = arg0.getKeys();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/noarg/NoArgCtorAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/noarg/NoArgCtorAdapterTestCases.java
index fef02c9..a6aa971 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/noarg/NoArgCtorAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/noarg/NoArgCtorAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.name = "Bob";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/ClassAtoClassBAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/ClassAtoClassBAdapter.java
index 4c89ce6..c23a3a1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/ClassAtoClassBAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/ClassAtoClassBAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
public class ClassAtoClassBAdapter extends XmlAdapter<ClassA, ClassB> {
+ @Override
public ClassA marshal(ClassB classBObject) throws Exception {
String s = classBObject.getSomeValue();
ClassA classA = new ClassA();
@@ -25,6 +26,7 @@
return classA;
}
+ @Override
public ClassB unmarshal(ClassA classAObject) throws Exception {
String s = classAObject.getTheValue();
ClassB classB = new ClassB();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/PackageLevelAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/PackageLevelAdapterTestCases.java
index 7f823e3..e68ad96 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/PackageLevelAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/PackageLevelAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
}
+ @Override
protected Object getControlObject() {
TestObject tester = new TestObject();
ClassB classB = new ClassB();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/adapters/ClassAtoClassBAdapter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/adapters/ClassAtoClassBAdapter.java
index ef8fe57..8742fbb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/adapters/ClassAtoClassBAdapter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/adapters/ClassAtoClassBAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
public class ClassAtoClassBAdapter extends XmlAdapter<ClassA, ClassB> {
+ @Override
public ClassA marshal(ClassB classBObject) throws Exception {
String s = classBObject.getSomeValue();
ClassA classA = new ClassA();
@@ -25,6 +26,7 @@
return classA;
}
+ @Override
public ClassB unmarshal(ClassA classAObject) throws Exception {
String s = classAObject.getTheValue();
ClassB classB = new ClassB();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/adapters/PackageLevelAdaptersTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/adapters/PackageLevelAdaptersTestCases.java
index c47686e..8cacbdb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/adapters/PackageLevelAdaptersTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmladapter/packagelevel/adapters/PackageLevelAdaptersTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
jaxbUnmarshaller = jaxbContext.createUnmarshaller();
}
+ @Override
protected Object getControlObject() {
TestObject tester = new TestObject();
ClassB classB = new ClassB();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementArrayTestCases.java
index bcd11d3..cdc6efa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
protected Object getControlObject() {
EmployeeArray employee = new EmployeeArray();
employee.name = "John Doe";
@@ -87,6 +88,7 @@
}
+ @Override
protected Object getJSONReadControlObject() {
EmployeeArray employee = new EmployeeArray();
employee.name = "John Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxCDATATestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxCDATATestCases.java
index dfe446d..ad80dbc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxCDATATestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxCDATATestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeLaxCDATA employee = new EmployeeLaxCDATA();
employee.name = "John Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxMixedEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxMixedEmptyTestCases.java
index d3023cd..a32f048 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxMixedEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxMixedEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
jaxbMarshaller.setProperty(MarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
protected Object getControlObject() {
EmployeeLaxMixed employee = new EmployeeLaxMixed();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxMixedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxMixedTestCases.java
index b0fccd0..29bac0c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxMixedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxMixedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
jaxbMarshaller.setProperty(MarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
protected Object getControlObject() {
EmployeeLaxMixed employee = new EmployeeLaxMixed();
@@ -87,6 +88,7 @@
return employee;
}
+ @Override
public Object getReadControlObject() {
EmployeeLaxMixed employee = new EmployeeLaxMixed();
@@ -142,6 +144,7 @@
return employee;
}
+ @Override
public Object getJSONReadControlObject() {
EmployeeLaxMixed employee = new EmployeeLaxMixed();
@@ -199,9 +202,11 @@
return employee;
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
}
+ @Override
public void testRoundTrip() throws Exception{}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxSingleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxSingleTestCases.java
index c40210d..600875c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxSingleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxSingleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
protected Object getControlObject() {
EmployeeSingle employee = new EmployeeSingle();
employee.name = "John Doe";
@@ -61,6 +62,7 @@
return employee;
}
+ @Override
public Object getReadControlObject() {
EmployeeSingle employee = new EmployeeSingle();
employee.name = "John Doe";
@@ -80,6 +82,7 @@
}
+ @Override
public Object getJSONReadControlObject() {
EmployeeSingle employee = new EmployeeSingle();
employee.name = "John Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxTestCases.java
index 3b46b4c..c01d3c1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementLaxTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
protected Object getJSONReadControlObject() {
EmployeeLax emp = (EmployeeLax)getControlObject();
Object objectRemoved = ((ArrayList)emp.elements).remove(emp.elements.size()-1);
@@ -54,6 +55,7 @@
return emp;
}
+ @Override
protected Object getControlObject() {
EmployeeLax employee = new EmployeeLax();
employee.name = "John Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementNSTestCases.java
index 538de6f..8e7c373 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected Object getJSONReadControlObject() {
Employee emp = (Employee)getControlObject();
Object objectRemoved = ((ArrayList)emp.elements).remove(emp.elements.size()-1);
@@ -67,6 +68,7 @@
return emp;
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "John Doe";
@@ -97,8 +99,10 @@
return employee;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
}
public void testXMLToObjectFromSAXSource() throws Exception {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementNoDomTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementNoDomTestCases.java
index 3306469..182f787 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementNoDomTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementNoDomTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
public Object getReadControlObject() {
EmployeeLax employee = new EmployeeLax();
employee.name = "John Doe";
@@ -88,6 +89,7 @@
return employee;
}
+ @Override
public Object getJSONReadControlObject() {
EmployeeLax employee = new EmployeeLax();
employee.name = "John Doe";
@@ -132,6 +134,7 @@
return employee;
}
+ @Override
public Object getControlObject() {
EmployeeLax employee = new EmployeeLax();
employee.name = "John Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementTestCases.java
index a6d3033..7b1ca69 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
protected Object getJSONReadControlObject() {
Employee emp = (Employee)getControlObject();
Object objectRemoved = ((ArrayList)emp.elements).remove(emp.elements.size()-1);
@@ -60,6 +61,7 @@
return emp;
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "John Doe";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyJAXBElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyJAXBElementTestCases.java
index 252e743..c776410 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyJAXBElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/XmlAnyJAXBElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -95,6 +95,7 @@
return r;
}
+ @Override
public void testRoundTrip(){
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/domhandler/DOMHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/domhandler/DOMHandlerTestCases.java
index 59a59bc..d274914 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/domhandler/DOMHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/domhandler/DOMHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
this.setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/domhandler/ParameterHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/domhandler/ParameterHandler.java
index 191c88f..5b2a93d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/domhandler/ParameterHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/domhandler/ParameterHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,10 +35,12 @@
private static final String PARAMETERS_END_TAG = "</parameters>";
private StringWriter xmlWriter = new StringWriter();
+ @Override
public StreamResult createUnmarshaller(ValidationEventHandler errorHandler) {
return new StreamResult(xmlWriter);
}
+ @Override
public String getElement(StreamResult rt) {
String xml = rt.getWriter().toString();
int beginIndex = xml.indexOf(PARAMETERS_START_TAG) + PARAMETERS_START_TAG.length();
@@ -46,6 +48,7 @@
return xml.substring(beginIndex, endIndex);
}
+ @Override
public Source marshal(String n, ValidationEventHandler errorHandler) {
try {
String xml = PARAMETERS_START_TAG + n.trim() + PARAMETERS_END_TAG;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/DefaultNamespaceCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/DefaultNamespaceCollectionTestCases.java
index 07f49bf..1f93f3e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/DefaultNamespaceCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/DefaultNamespaceCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected JAXBMarshaller getJSONMarshaller() throws Exception{
Map<String, String> namespaces = new HashMap<String, String>();
namespaces.put("urn:test","ns1");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/DefaultNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/DefaultNamespaceTestCases.java
index 534c6a5..7d5fb97 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/DefaultNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/DefaultNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected JAXBMarshaller getJSONMarshaller() throws Exception{
Map<String, String> namespaces = new HashMap<String, String>();
namespaces.put("urn:test","ns1");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/qualified/XMLAnyElementNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/qualified/XMLAnyElementNamespaceTestCases.java
index 6f7733b..ab06ffd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/qualified/XMLAnyElementNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns/qualified/XMLAnyElementNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected JAXBMarshaller getJSONMarshaller() throws Exception {
Map<String, String> namespaces = new HashMap<String, String>();
namespaces.put("namespace", "ns1");
@@ -64,6 +65,7 @@
return jsonMarshaller;
}
+ @Override
protected Object getControlObject() {
Customer cust = new Customer();
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns2/DefaultNamespace2TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns2/DefaultNamespace2TestCases.java
index 77c8fc1..de1e5b8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns2/DefaultNamespace2TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlanyelement/ns2/DefaultNamespace2TestCases.java
@@ -60,6 +60,7 @@
return root;
}
+ @Override
public Root getReadControlObject() {
Root root = new Root();
@@ -88,7 +89,7 @@
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(true));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(true));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -128,7 +129,7 @@
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(true));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(true));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/EmployeeNoNamespace.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/EmployeeNoNamespace.java
index 1c1e1fd..0196ab1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/EmployeeNoNamespace.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/EmployeeNoNamespace.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,7 +35,7 @@
if(emp.id != this.id){
return false;
}
- if(!emp.country.equals(this.country)){
+ if(!country.equals(country)){
return false;
}
return true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeCollectionTestCases.java
index fb8c327..a63900c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
ArrayList ids = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeNamespaceTestCases.java
index 1a389c9..b3f1d4b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeNamespace employee = new EmployeeNamespace();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeNoNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeNoNamespaceTestCases.java
index 663137a..4912dd4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeNoNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/XmlAttributeNoNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeNoNamespace employee = new EmployeeNoNamespace();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/emptynamespace/XmlAttributeEmptyNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/emptynamespace/XmlAttributeEmptyNamespaceTestCases.java
index f6a27bd..44885e0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/emptynamespace/XmlAttributeEmptyNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/emptynamespace/XmlAttributeEmptyNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(new Class[]{EmptyNamespaceTestObject.class});
}
+ @Override
protected Object getControlObject() {
EmptyNamespaceTestObject obj = new EmptyNamespaceTestObject();
obj.theTestString = "abc123\"&<";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/imports/XmlAttributeImportsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/imports/XmlAttributeImportsTestCases.java
index 23e709a..71e4654 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/imports/XmlAttributeImportsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/imports/XmlAttributeImportsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(new Class[]{Person.class});
}
+ @Override
protected Object getControlObject() {
Person obj = new Person();
obj.name = "theName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/unqualified/AttributeFormUnqualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/unqualified/AttributeFormUnqualifiedTestCases.java
index 9fb2b2c..0025bc6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/unqualified/AttributeFormUnqualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlattribute/unqualified/AttributeFormUnqualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(new Class[]{TestObject.class});
}
+ @Override
protected Object getControlObject() {
TestObject obj = new TestObject();
obj.theTestString = "abc123";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsPopulatedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsPopulatedTestCases.java
index 0437380..40e4d5f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsPopulatedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsPopulatedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,6 +66,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
public Class getUnmarshalClass(){
return XmlBindings.class;
}
@@ -226,6 +227,7 @@
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -251,6 +253,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -283,6 +286,7 @@
}
+ @Override
public boolean shouldRemoveEmptyTextNodesFromControlDoc() {
return true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsTestCases.java
index 20e62f2..f1dc774 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
XmlBindings xmlBindings = new XmlBindings();
xmlBindings.setPackageName("myPackage");
@@ -60,6 +61,7 @@
return xmlBindings;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -91,6 +93,7 @@
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsWithExternalMetadataTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsWithExternalMetadataTestCases.java
index 63e35eb..f38c05c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsWithExternalMetadataTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlbindings/XMLBindingsWithExternalMetadataTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
super(name);
}
+ @Override
protected Map getProperties() {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/jaxb/xmlbindings/bindings-oxm.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/SameElementAttributeNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/SameElementAttributeNameTestCases.java
index 6c347b6..a2ec46e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/SameElementAttributeNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/SameElementAttributeNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
protected Object getControlObject() {
EmployeeSameElementAttributeName.EmployeeName employeeName = new EmployeeSameElementAttributeName.EmployeeName();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementCollectionTestCases.java
index bbb9028..03f267f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
initXsiType();
}
+ @Override
protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
ArrayList ids = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementConstantsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementConstantsTestCases.java
index e6370b4..e1cc84c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementConstantsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementConstantsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeWithConstants ewc = new EmployeeWithConstants();
ewc.id = "123";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementDefaultValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementDefaultValueTestCases.java
index 4355224..472c2f1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementDefaultValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementDefaultValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeDefaultValue employee = new EmployeeDefaultValue();
employee.name = EmployeeDefaultValue.DEFAULT_NAME;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementNamespaceTestCases.java
index eef1a86..11a102d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeNamespace employee = new EmployeeNamespace();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementNoNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementNoNamespaceTestCases.java
index 062d3d2..2190e76 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementNoNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/XmlElementNoNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
}
+ @Override
protected Object getControlObject() {
EmployeeNoNamespace employee = new EmployeeNoNamespace();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/EmptyCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/EmptyCollectionTestCases.java
index 983ccfc..e378317 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/EmptyCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/EmptyCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject(){
Order o = new Order();
o.setId(1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCases.java
index d33f7f6..d16bd94 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject(){
Order o = new Order();
String[] comments = new String[]{"comment1","comment2","comment3", ""};
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCasesNS.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCasesNS.java
index 826de39..5eb05b6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCasesNS.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/FullTestCasesNS.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
public Map getProperties(){
Map overrides = new HashMap();
String overridesString =
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/SpecialCharacterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/SpecialCharacterTestCases.java
index 1364acb..43e5641 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/SpecialCharacterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/model/SpecialCharacterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject(){
Order o = new Order();
String[] comments = new String[]{"com<ment1","com&ment2","com\"ment3"};
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/nulls/NullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/nulls/NullTestCases.java
index a039948..6e81766 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/nulls/NullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/nulls/NullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -178,6 +178,7 @@
}
//Test for a bug 561757
+ @Override
public void testRoundTrip() throws Exception {
jaxbUnmarshaller.setProperty(UnmarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_JSON);
File file = new File(ClassLoader.getSystemResource(JSON_RESOURCE).getFile());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/order/ElementOrderingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/order/ElementOrderingTestCases.java
index 2c44f67..39c6f5d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/order/ElementOrderingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/order/ElementOrderingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,15 +37,18 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
}
+ @Override
public Class getUnmarshalClass(){
return AlbumInfo.class;
}
+ @Override
protected Object getJSONReadControlObject() {
JAXBElement elem = new JAXBElement<AlbumInfo>(new QName(""), AlbumInfo.class, (AlbumInfo) getWriteControlObject());
return elem;
}
+ @Override
protected Object getControlObject() {
JAXBElement elem = new JAXBElement<AlbumInfo>(new QName("albumInfo"), AlbumInfo.class, (AlbumInfo) getWriteControlObject());
return elem;
@@ -71,5 +74,6 @@
}
//
+ @Override
public void testUnmarshallerHandler(){}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeBarTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeBarTestCases.java
index 7f281be..50d7f14 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeBarTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeBarTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Foo f = new Foo();
BarXmlValue b = new BarXmlValue();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeBarXmlValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeBarXmlValueTestCases.java
index 31eaf4c..704e01b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeBarXmlValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeBarXmlValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Foo f = new Foo();
Bar b = new Bar();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeNoTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeNoTypeTestCases.java
index 275260e..69ef9b0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeNoTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeNoTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Foo f = new Foo();
f.field = new BigDecimal("10");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeSimpleTestCases.java
index 52843d6..d97074f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelement/type/TypeSimpleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
initXsiType();
}
+ @Override
protected Object getControlObject() {
Foo f = new Foo();
f.field = new BigInteger("10");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ByteArrayCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ByteArrayCollectionTestCases.java
index d90716c..e72d1cb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ByteArrayCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ByteArrayCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Foo foo = new Foo();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ComplexType.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ComplexType.java
index 2f98318..9cfaf55 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ComplexType.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ComplexType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,7 +68,7 @@
protected final static QName NAME = new QName("", "Local");
public TestLocal(BigDecimal value) {
- super(NAME, ((Class) BigDecimal.class), ComplexType.class, value);
+ super(NAME, BigDecimal.class, ComplexType.class, value);
}
public boolean equals(Object theObject){
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeCollectionTestCases.java
index bee3de9..3223cc7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeCollectionTestCases.java
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getJSONReadControlObject(){
//same as getReadControl Except order is different
EmployeeCollection employee = new EmployeeCollection();
@@ -50,6 +51,7 @@
return employee;
}
+ @Override
protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
ArrayList choices = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeSingleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeSingleTestCases.java
index 05e94b1..76df087 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeSingleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/EmployeeSingleTestCases.java
@@ -32,6 +32,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeSingle employee = new EmployeeSingle();
employee.intRoot = new JAXBElement(new QName("myns", "integer-root"), Integer.class, Integer.valueOf(21));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/FooObjectFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/FooObjectFactory.java
index 94f36f3..d320660 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/FooObjectFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/FooObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,6 @@
@XmlElementDecl(namespace = "", name = "things")
public JAXBElement<List<byte[]>> createThings(List<byte[]> value) {
- return new JAXBElement<List<byte[]>>(_Things_QNAME, ((Class) List.class),((List<byte[]> ) value));
+ return new JAXBElement<List<byte[]>>(_Things_QNAME, ((Class) List.class), value);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/XMLElementRefConverterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/XMLElementRefConverterTestCases.java
index 1d7628f..ec64b28 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/XMLElementRefConverterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/XMLElementRefConverterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
ComplexType ct = new ComplexType();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentEmptyTestCases.java
index 206cc64..02ef415 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setClasses(classes);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jaxbMarshaller.setAttachmentMarshaller(new AttachmentMarshaller() {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentNullTestCases.java
index 2fc7cbf..aff7abd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setClasses(classes);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jaxbMarshaller.setAttachmentMarshaller(new AttachmentMarshaller() {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentTestCases.java
index 9c9bbee..7eed7f9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/attachment/XMLElementRefAttachmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setClasses(classes);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
jaxbMarshaller.setAttachmentMarshaller(new AttachmentMarshaller() {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/collections/MyAttachmentMarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/collections/MyAttachmentMarshaller.java
index 6fd1028..4b1ef15 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/collections/MyAttachmentMarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/collections/MyAttachmentMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
return theString;
}
+ @Override
public boolean isXOPPackage() { return true; }
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/duplicatename/DuplicateNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/duplicatename/DuplicateNameTestCases.java
index 4b637f9..e13d449 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/duplicatename/DuplicateNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/duplicatename/DuplicateNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
}
+ @Override
protected Object getControlObject() {
BeanB bean = new BeanB();
bean.value = new ObjectFactory().createBeanBValue();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/missingref/MissingRefObjectFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/missingref/MissingRefObjectFactory.java
index 27d62f9..b7e2f25 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/missingref/MissingRefObjectFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/missingref/MissingRefObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,6 @@
@XmlElementDecl(namespace = "", name = "arg0", scope = Person.class)
public JAXBElement<byte[]> createEchoByteArrayArg0(byte[] value) {
- return new JAXBElement<byte[]>(theQName, byte[].class, Person.class, ((byte[]) value));
+ return new JAXBElement<byte[]>(theQName, byte[].class, Person.class, value);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/missingref/MissingRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/missingref/MissingRefTestCases.java
index 2e6b596..c2b6b67 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/missingref/MissingRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/missingref/MissingRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
initXsiType();
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.setName("theName");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/mixed/XmlElementRefMixedContentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/mixed/XmlElementRefMixedContentTestCases.java
index 2f691e7..c63e584 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/mixed/XmlElementRefMixedContentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/mixed/XmlElementRefMixedContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.tasks = new ArrayList<Object>();
@@ -47,6 +48,7 @@
return emp;
}
+ @Override
protected Object getJSONReadControlObject() {
Employee emp = new Employee();
emp.tasks = new ArrayList<Object>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/notincontext/XmlElementRefNotGivenToContextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/notincontext/XmlElementRefNotGivenToContextTestCases.java
index adaa8cd..71ac2b3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/notincontext/XmlElementRefNotGivenToContextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/notincontext/XmlElementRefNotGivenToContextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
List contents = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ns/ObjectFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ns/ObjectFactory.java
index 046ac5a..345408f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ns/ObjectFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ns/ObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,7 +33,7 @@
@XmlElementDecl(namespace = "http://missing-uri.org/", name = "request", scope = EchoByteArray.class)
public JAXBElement<byte[]> createEchoByteArrayRequest(byte[] value) {
- return new JAXBElement<byte[]>(_EchoByteArrayRequest_QNAME, byte[].class, EchoByteArray.class, ((byte[]) value));
+ return new JAXBElement<byte[]>(_EchoByteArrayRequest_QNAME, byte[].class, EchoByteArray.class, value);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ns/XmlElementRefWithNamespaceTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ns/XmlElementRefWithNamespaceTests.java
index afab554..5c63032 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ns/XmlElementRefWithNamespaceTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/ns/XmlElementRefWithNamespaceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,14 +52,17 @@
}
+ @Override
protected Marshaller getJSONMarshaller() throws Exception{
return jsonMarshaller;
}
+ @Override
protected Unmarshaller getJSONUnmarshaller() throws Exception{
return jsonUnmarshaller;
}
+ @Override
protected Object getControlObject() {
ObjectFactory factory = new ObjectFactory();
EchoByteArray e = factory.createEchoByteArray();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/prefix/XmlElementRefPrefixesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/prefix/XmlElementRefPrefixesTestCases.java
index a330e81..e7c1f52 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/prefix/XmlElementRefPrefixesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementref/prefix/XmlElementRefPrefixesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.name = "theName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementrefs/adapter/ObjectFactory.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementrefs/adapter/ObjectFactory.java
index 7368b79..bc2d4de 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementrefs/adapter/ObjectFactory.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelementrefs/adapter/ObjectFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,7 +59,7 @@
@XmlElementDecl(namespace = "", name = "e1", scope = Foo.class)
@XmlJavaTypeAdapter(HexBinaryAdapter.class)
public JAXBElement<byte[]> createFooE1(byte[] value) {
- return new JAXBElement<byte[]>(_FooE1_QNAME, byte[].class, Foo.class, ((byte[]) value));
+ return new JAXBElement<byte[]>(_FooE1_QNAME, byte[].class, Foo.class, value);
}
/**
@@ -68,7 +68,7 @@
*/
@XmlElementDecl(namespace = "", name = "e2", scope = Foo.class)
public JAXBElement<byte[]> createFooE2(byte[] value) {
- return new JAXBElement<byte[]>(_FooE2_QNAME, byte[].class, Foo.class, ((byte[]) value));
+ return new JAXBElement<byte[]>(_FooE2_QNAME, byte[].class, Foo.class, value);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/CircularTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/CircularTestCases.java
index e73b6c4..94dac74 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/CircularTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/CircularTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Root theRoot = new Root();
theRoot.name = "aName";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsAdapterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsAdapterTestCases.java
index dc313a2..d918165 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsAdapterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsAdapterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsArrayTestCases.java
index b094e1d..c91f069 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsArrayTestCases.java
@@ -38,6 +38,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeArray employee = new EmployeeArray();
employee.id = CONTROL_ID;
@@ -54,6 +55,7 @@
return employee;
}
+ @Override
protected Object getJSONReadControlObject() {
EmployeeArray employee = new EmployeeArray();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsCollectionTestCases.java
index d769da6..474df1e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsCollectionTestCases.java
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
employee.id = CONTROL_ID;
@@ -51,6 +52,7 @@
return employee;
}
+ @Override
protected Object getJSONReadControlObject() {
EmployeeCollection employee = new EmployeeCollection();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsComplexTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsComplexTestCases.java
index fa6c850..04f7821 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsComplexTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsComplexTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsInheritanceTestCases.java
index f2de5ec..5167a1e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsInheritanceTestCases.java
@@ -41,6 +41,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeCollection employee = new EmployeeCollection();
employee.id = CONTROL_ID;
@@ -57,6 +58,7 @@
return employee;
}
+ @Override
protected Object getJSONReadControlObject() {
EmployeeCollection employee = new EmployeeCollection();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsIntegerTestCases.java
index fe87c81..f43958b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsIntegerTestCases.java
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsReferencedClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsReferencedClassTestCases.java
index bc430f9..1beb544 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsReferencedClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsReferencedClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsStringTestCases.java
index 6fc96b9..91b9aa1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlelements/XmlElementsStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/SpaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/SpaceTestCases.java
index f133a64..2b5093d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/SpaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/SpaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setClasses(classes);
}
+ @Override
protected SpaceRoot getControlObject() {
SpaceRoot root = new SpaceRoot();
root.spaceEnum = SpaceEnum.FOO;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumAttributeCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumAttributeCollectionTestCases.java
index 08ca8ab..2fe8300 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumAttributeCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumAttributeCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeDepartmentAttributeList emp = new EmployeeDepartmentAttributeList();
emp.name = CONTROL_NAME;
@@ -49,6 +50,7 @@
return emp;
}
+ @Override
protected Map getProperties(){
Map<String, String> props = new HashMap<String, String>();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumAttributeTestCases.java
index 861e97b..3ee60eb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeDepartmentAttribute emp = new EmployeeDepartmentAttribute();
emp.name = CONTROL_NAME;
@@ -44,6 +45,7 @@
return emp;
}
+ @Override
protected Map getProperties(){
Map<String, String> props = new HashMap<String, String>();
props.put(JAXBContextProperties.JSON_ATTRIBUTE_PREFIX, "@");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumChoiceCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumChoiceCollectionTestCases.java
index 1f02b74..7065ce4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumChoiceCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumChoiceCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeMultipleDepartmentChoice emp = new EmployeeMultipleDepartmentChoice();
emp.name = CONTROL_NAME;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumChoiceObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumChoiceObjectTestCases.java
index cda556b..40b6708 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumChoiceObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumChoiceObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeSingleDepartmentChoice emp = new EmployeeSingleDepartmentChoice();
emp.name = CONTROL_NAME;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementArrayTestCases.java
index 83d3c15..1cd572c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeDepartmentArray emp = new EmployeeDepartmentArray();
emp.name = CONTROL_NAME;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementCollectionTestCases.java
index 1c07e13..40e4cde 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeDepartmentList emp = new EmployeeDepartmentList();
emp.name = CONTROL_NAME;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementTestCases.java
index 81ab3a2..1caae12 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeSingleDepartment emp = new EmployeeSingleDepartment();
emp.name = CONTROL_NAME;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumMapKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumMapKeyTestCases.java
index f6e887b..4cccccb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumMapKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumMapKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeMapDepartmentKey emp = new EmployeeMapDepartmentKey();
emp.name = CONTROL_NAME;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumRootElemTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumRootElemTestCases.java
index f233496..accfa0e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumRootElemTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlEnumRootElemTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
DepartmentRoot dept = DepartmentRoot.RDBMS;
return dept;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlValueAnnotationWithEnumTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlValueAnnotationWithEnumTestCases.java
index 7427db5..47488f2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlValueAnnotationWithEnumTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlenum/XmlValueAnnotationWithEnumTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeSingleDepartmentWithXmlValue emp = new EmployeeSingleDepartmentWithXmlValue();
emp.name = CONTROL_NAME;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlgregoriancalendar/XMLGregorianCalendarObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlgregoriancalendar/XMLGregorianCalendarObjectTestCases.java
index 92a10fb..3572d74 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlgregoriancalendar/XMLGregorianCalendarObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlgregoriancalendar/XMLGregorianCalendarObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -97,6 +97,7 @@
return holder;
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/XmlIdRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/XmlIdRefTestCases.java
index 498ce3f..6506f02 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/XmlIdRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/XmlIdRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
@@ -91,6 +92,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
ArrayList rootPhones = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/array/XmlIdRefArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/array/XmlIdRefArrayTestCases.java
index 4f8c87a..d141e0e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/array/XmlIdRefArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/array/XmlIdRefArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
EmployeeArray employee = new EmployeeArray();
employee.id = CONTROL_ID;
@@ -91,6 +92,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
ArrayList rootPhones = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/inheritance/XmlIdRefInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/inheritance/XmlIdRefInheritanceTestCases.java
index 317e978..9fb9097 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/inheritance/XmlIdRefInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/inheritance/XmlIdRefInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
School school = new School();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/object/XmlIdRefObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/object/XmlIdRefObjectTestCases.java
index 4f1a830..272c792 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/object/XmlIdRefObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/object/XmlIdRefObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
@@ -94,6 +95,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
ArrayList rootPhones = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/object/XmlIdRefObjectWhitespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/object/XmlIdRefObjectWhitespaceTestCases.java
index ac74e11..610cdd4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/object/XmlIdRefObjectWhitespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/object/XmlIdRefObjectWhitespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setWriteControlJSON(JSON_RESOURCE_WRITE);
}
+ @Override
protected Object getControlObject() {
Whitespace w = new Whitespace();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/self/XmlIdRefSelfObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/self/XmlIdRefSelfObjectTestCases.java
index d054eeb..0bcd1a7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/self/XmlIdRefSelfObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/self/XmlIdRefSelfObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Item item1 = new Item();
item1.m_name = "test";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/XmlElementsIdRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/XmlElementsIdRefTestCases.java
index cf1187d..70244d5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/XmlElementsIdRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/XmlElementsIdRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getJSONReadControlObject() {
EmployeeWithElements employee = new EmployeeWithElements();
@@ -98,6 +99,7 @@
return root;
}
+ @Override
protected Object getControlObject() {
EmployeeWithElements employee = new EmployeeWithElements();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/XmlElementsSingleIdRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/XmlElementsSingleIdRefTestCases.java
index ba2bb64..1dd60fd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/XmlElementsSingleIdRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/XmlElementsSingleIdRefTestCases.java
@@ -51,6 +51,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
EmployeeSingle employee = new EmployeeSingle();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/interfaces/XmlElementsIdRefInterfaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/interfaces/XmlElementsIdRefInterfaceTestCases.java
index e047db3..d2fb205 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/interfaces/XmlElementsIdRefInterfaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/interfaces/XmlElementsIdRefInterfaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getJSONReadControlObject() {
EmployeeWithElementsInterfaces employee = new EmployeeWithElementsInterfaces();
@@ -95,6 +96,7 @@
return root;
}
+ @Override
protected Object getControlObject() {
EmployeeWithElementsInterfaces employee = new EmployeeWithElementsInterfaces();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/wrapper/XmlElementsWrapperIdRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/wrapper/XmlElementsWrapperIdRefTestCases.java
index 72b15bd..382c877 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/wrapper/XmlElementsWrapperIdRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidref/xmlelements/wrapper/XmlElementsWrapperIdRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Foo foo = new Foo();
@@ -56,6 +57,7 @@
return foo;
}
+ @Override
protected Object getJSONReadControlObject() {
Foo foo = (Foo)getControlObject();
Attribute removed = foo.attributes.remove(1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidrefs/XmlIdRefsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidrefs/XmlIdRefsTestCases.java
index 4a20100..a93da11 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidrefs/XmlIdRefsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidrefs/XmlIdRefsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.phoneNumbers = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidrefs/object/XmlIdRefsObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidrefs/object/XmlIdRefsObjectTestCases.java
index 992929d..f749545 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidrefs/object/XmlIdRefsObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlidrefs/object/XmlIdRefsObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.phoneNumbers = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/InlineDataHandlerCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/InlineDataHandlerCollectionTestCases.java
index 0e0db85..77296a2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/InlineDataHandlerCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/InlineDataHandlerCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Root obj = new Root();
obj.data = new ArrayList<DataHandler>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/LargeInlineBinaryDataXMLStreamReaderReader.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/LargeInlineBinaryDataXMLStreamReaderReader.java
index 6570916..730bbaf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/LargeInlineBinaryDataXMLStreamReaderReader.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/LargeInlineBinaryDataXMLStreamReaderReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,14 +46,17 @@
private static class LargeInlineBinaryCharSequence implements CharSequence {
+ @Override
public int length() {
return 0;
}
+ @Override
public char charAt(int index) {
return 0;
}
+ @Override
public CharSequence subSequence(int start, int end) {
return null;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/XmlInlineBinaryDataTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/XmlInlineBinaryDataTestCases.java
index 63dfa37..2163f56 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/XmlInlineBinaryDataTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinlinebinary/XmlInlineBinaryDataTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
MyDataPropertyAnnotation data = new MyDataPropertyAnnotation();
data.bytes = new byte[] { 0, 1, 2, 3 };
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/Employee.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/Employee.java
index 9d83f4d..4cc708a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/Employee.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public String empId;
public Address addr;
+ @Override
public Address getAddr(){
return addr;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/Person.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/Person.java
index a727978..e2ba127 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/Person.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/Person.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
@XmlElement
public Address addr;
+ @Override
public Address getAddr(){
return addr;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/XmlInverseRefObjectsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/XmlInverseRefObjectsTestCases.java
index d7c7e1c..aff6121 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/XmlInverseRefObjectsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/XmlInverseRefObjectsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
return p;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -68,6 +69,7 @@
compareObject(testObject);
}
+ @Override
public void jsonToObjectTest(Object testObject, Object controlObject) throws Exception {
if(controlObject == null){
assertNull(testObject);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/list/XmlInverseRefBidirectionalListObjectsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/list/XmlInverseRefBidirectionalListObjectsTestCases.java
index b0ba4d8..ca9903d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/list/XmlInverseRefBidirectionalListObjectsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlinverseref/list/XmlInverseRefBidirectionalListObjectsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
return p;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -76,6 +77,7 @@
compareObject(testObject);
}
+ @Override
public void jsonToObjectTest(Object testObject, Object controlObject) throws Exception {
if(controlObject == null){
assertNull(testObject);
@@ -103,7 +105,7 @@
//////////
Address addr = p.addrs.get(0);
assertTrue(addr.street.equals("theStreet"));
- Person owner = (Person)addr.owner;
+ Person owner = addr.owner;
assertTrue("Expected name differentPerson but was " + owner.name , owner.name.equals("differentPerson"));
assertTrue(owner.addrs.size()==1);
assertTrue(owner.addrs.get(0).street.equals("theStreet"));
@@ -111,7 +113,7 @@
Address addr2 = p.addrs.get(1);
assertTrue(addr2.street.equals("theStreet2"));
- Person owner2 = (Person)addr2.owner;
+ Person owner2 = addr2.owner;
assertTrue("Expected name anotherPerson but was " + owner2.name , owner2.name.equals("anotherPerson"));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CharacterEscapeHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CharacterEscapeHandlerTestCases.java
index fa64452..1dab64f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CharacterEscapeHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CharacterEscapeHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.setName("elem*");
@@ -38,11 +39,13 @@
return emp;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
jaxbMarshaller.setProperty(MarshallerProperties.CHARACTER_ESCAPE_HANDLER, new CustomCharacterEscapeHandler());
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
@@ -51,6 +54,7 @@
* CharacterEscapeHandler is not supported for this marshal target,
* so just pass.
*/
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
}
@@ -58,6 +62,7 @@
* CharacterEscapeHandler is not supported for this marshal target,
* so just pass.
*/
+ @Override
public void testObjectToXMLStreamWriterRecord() throws Exception {
}
@@ -65,6 +70,7 @@
* CharacterEscapeHandler is not supported for this marshal target,
* so just pass.
*/
+ @Override
public void testObjectToXMLEventWriter() throws Exception {
}
@@ -72,6 +78,7 @@
* CharacterEscapeHandler is not supported for this marshal target,
* so just pass.
*/
+ @Override
public void testObjectToContentHandler() throws Exception {
}
@@ -79,6 +86,7 @@
* CharacterEscapeHandler is not supported for this marshal target,
* so just pass.
*/
+ @Override
public void testObjectToXMLDocument() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomCharacterEscapeHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomCharacterEscapeHandler.java
index f43b1c9..d0282b7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomCharacterEscapeHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomCharacterEscapeHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
// This handler doesn't actually escape any of the important characters.
// For testing purposes only!
+ @Override
public void escape(char[] buf, int start, int len, boolean isAttValue, Writer out) throws IOException {
for (int i = start; i < start + len; i++) {
char ch = buf[i];
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomErrorValidationEventHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomErrorValidationEventHandler.java
index 68e6e36..c552e37 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomErrorValidationEventHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomErrorValidationEventHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
return errorCount;
}
+ @Override
public boolean handleEvent(ValidationEvent event) {
if (event.getSeverity() < ValidationEvent.FATAL_ERROR) {
return true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomFatalErrorValidationEventHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomFatalErrorValidationEventHandler.java
index e19a4c6..20ba847 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomFatalErrorValidationEventHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/CustomFatalErrorValidationEventHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
import jakarta.xml.bind.ValidationEvent;
public class CustomFatalErrorValidationEventHandler implements ValidationEventHandler {
+ @Override
public boolean handleEvent(ValidationEvent event) {
if(event.getSeverity() == ValidationEvent.FATAL_ERROR)
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerEncodingTest.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerEncodingTest.java
index 7172a0d..562f325 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerEncodingTest.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerEncodingTest.java
@@ -51,6 +51,7 @@
this.controlString = controlString;
}
+ @Override
public void setUp() throws Exception {
contextPath = System.getProperty("jaxb.test.contextpath", JAXBSAXTestSuite.CONTEXT_PATH);
@@ -250,6 +251,7 @@
fail("A MarshalException should have been thrown but was not");
}
+ @Override
public void tearDown() throws PropertyException {
marshaller.setProperty(Marshaller.JAXB_ENCODING, originalEncoding);
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, originalFormatting);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFormattingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFormattingTestCases.java
index 0903cb0..41db96f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFormattingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFormattingTestCases.java
@@ -18,6 +18,7 @@
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.PropertyException;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.testing.oxm.OXTestCase;
@@ -44,6 +45,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() throws Exception {
contextPath = System.getProperty("jaxb.test.contextpath", JAXBSAXTestSuite.CONTEXT_PATH);
JAXBContext jaxbContext = JAXBContext.newInstance(contextPath, getClass().getClassLoader());
@@ -74,7 +76,7 @@
Object value = Integer.valueOf(10);
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, value);
} catch (PropertyException e) {
- this.assertTrue(true);
+ assertTrue(true);
return;
} catch (Exception e) {
fail("The wrong exception occurred, should have been a PropertyException" + e.getMessage());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFragmentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFragmentTestCases.java
index 420341c..92f9c7f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFragmentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerFragmentTestCases.java
@@ -36,6 +36,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
//set up XMLMarshaller
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
@@ -61,6 +62,7 @@
removeCopyrightNode(controlDocument);
}
+ @Override
public void tearDown() {
try {
marshaller.setProperty(XMLConstants.JAXB_FRAGMENT, originalSetting);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerPropertiesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerPropertiesTestCases.java
index 286f78d..7acda4f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerPropertiesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerPropertiesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
contextPath = System.getProperty("jaxb.test.contextpath", JAXBSAXTestSuite.CONTEXT_PATH);
@@ -58,6 +59,7 @@
originalSchemaLocation = (String)marshaller.getProperty("jaxb.schemaLocation");
}
+ @Override
public void tearDown() throws Exception {
marshaller.setProperty("jaxb.noNamespaceSchemaLocation", originalNNSchemaLocation);
marshaller.setProperty("jaxb.schemaLocation", originalSchemaLocation);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerTestCases.java
index fe18ce0..260b4b6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/MarshallerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
contextPath = System.getProperty("jaxb.test.contextpath", JAXBSAXTestSuite.CONTEXT_PATH);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshalConversionExceptionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshalConversionExceptionTestCases.java
index 7ced4c6..666b49e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshalConversionExceptionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshalConversionExceptionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
public void testCatchConversionExceptions() {
try {
unmarshaller.setEventHandler(new ValidationEventHandler() {
+ @Override
public boolean handleEvent(ValidationEvent arg0) {
return false;
}
@@ -73,6 +74,7 @@
private int count = 0;
+ @Override
public boolean handleEvent(ValidationEvent arg0) {
count++;
return true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshallValidationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshallValidationTestCases.java
index 8bd93e1..4c7efcc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshallValidationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshallValidationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
contextPath = System.getProperty("jaxb.test.contextpath", JAXBSAXTestSuite.CONTEXT_PATH);
@@ -65,6 +66,7 @@
eventHandler = unmarshaller.getEventHandler();
}
+ @Override
public void tearDown() throws Exception {
unmarshaller.setEventHandler(eventHandler);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshallerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshallerTestCases.java
index f469bf6..1e4bae3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshallerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/UnmarshallerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
contextPath = System.getProperty("jaxb.test.contextpath", JAXBSAXTestSuite.CONTEXT_PATH);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/ValidatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/ValidatorTestCases.java
index ed1602b..e766039 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/ValidatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/ValidatorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
contextPath = System.getProperty("jaxb.test.contextpath", JAXBSAXTestSuite.CONTEXT_PATH);
@@ -299,6 +300,7 @@
//=============================== Inner class for eventhandler test =================//
class ValidationEventHandlerImpl implements jakarta.xml.bind.ValidationEventHandler {
+ @Override
public boolean handleEvent(jakarta.xml.bind.ValidationEvent param1) {
return true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/XMLDeclarationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/XMLDeclarationTestCases.java
index 58aa860..022e5a4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/XMLDeclarationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/XMLDeclarationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
//set up XMLMarshaller
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/locator/AnyCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/locator/AnyCollectionTestCases.java
index 8a841c6..0c1be7c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/locator/AnyCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/locator/AnyCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
return classes;
}
+ @Override
public AnyCollectionRoot setupRootObject() {
AnyCollectionRoot control = new AnyCollectionRoot();
control.setName("123456789");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/locator/TestValidationEventHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/locator/TestValidationEventHandler.java
index d8b84a6..2fa62ad 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/locator/TestValidationEventHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmarshaller/locator/TestValidationEventHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
return validationEvents;
}
+ @Override
public boolean handleEvent(ValidationEvent ve) {
validationEvents.add(ve);
return true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmixed/XmlMixedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmixed/XmlMixedTestCases.java
index 74ad816..c6f05e0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmixed/XmlMixedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlmixed/XmlMixedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_ATTRIBUTE_PREFIX, "@");
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.setAttr("attribute value");
@@ -47,6 +48,7 @@
return root;
}
+ @Override
public Object getReadControlObject() {
Root root = new Root();
root.setAttr("attribute value");
@@ -60,6 +62,7 @@
return getControlObject();
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlpath/XmlPathWithMultipleEqualsCharactersTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlpath/XmlPathWithMultipleEqualsCharactersTestCases.java
index 624de84..94c4b21 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlpath/XmlPathWithMultipleEqualsCharactersTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlpath/XmlPathWithMultipleEqualsCharactersTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
super(name);
}
+ @Override
public String getName() {
return "XmlPathWithMultipleEqualsCharactersTestCases: " + super.getName();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNamespaceTestCases.java
index d6c94de..56eb8f3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,14 +52,17 @@
jsonUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected Marshaller getJSONMarshaller() throws Exception{
return jsonMarshaller;
}
+ @Override
protected Unmarshaller getJSONUnmarshaller() throws Exception{
return jsonUnmarshaller;
}
+ @Override
protected Object getControlObject() {
EmployeeNamespace employee = new EmployeeNamespace();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNilTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNilTestCases.java
index 6c03679..aa10062 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNilTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNilTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeNoNamespace employee = new EmployeeNoNamespace();
return employee;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNoNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNoNamespaceTestCases.java
index 51a3d9f..fd570ac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNoNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlrootelement/XmlRootElementNoNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeNoNamespace employee = new EmployeeNoNamespace();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/XMLSchemaModelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/XMLSchemaModelTestCases.java
index 9c5aee7..f8557a1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/XMLSchemaModelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/XMLSchemaModelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Schema xmlschema = new Schema();
@@ -41,6 +42,7 @@
return xmlschema;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
@@ -58,6 +60,7 @@
assertEquals("testComplexType", ((TopLevelComplexType)item).getName());
}
+ @Override
public void jsonToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeFormDefaultQualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeFormDefaultQualifiedTestCases.java
index 933470f..ab6f575 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeFormDefaultQualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeFormDefaultQualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -48,6 +49,7 @@
jaxbUnmarshaller.setProperty(UnmarshallerProperties.JSON_NAMESPACE_PREFIX_MAPPER, namespaces);
}
+ @Override
protected Object getControlObject() {
Address addr = new Address();
addr.city = "Ottawa";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeNSQualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeNSQualifiedTestCases.java
index 8b620c9..3115284 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeNSQualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeNSQualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
RootWithAttributeNS root = new RootWithAttributeNS();
root.child = "abc";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeQualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeQualifiedTestCases.java
index 0e896e4..e5e523f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeQualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/AttributeQualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
RootWithAttribute root = new RootWithAttribute();
root.child = "abc";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/NoAttributeQualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/NoAttributeQualifiedTestCases.java
index 3fa4663..a2ea619 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/NoAttributeQualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/qualified/NoAttributeQualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
RootNoAttributes root = new RootNoAttributes();
root.child = "abc";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeFormDefaultUnqualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeFormDefaultUnqualifiedTestCases.java
index e5d0a03..a18511f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeFormDefaultUnqualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeFormDefaultUnqualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -50,6 +51,7 @@
}
+ @Override
protected Object getControlObject() {
Address addr = new Address();
addr.city = "Ottawa";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeNSUnqualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeNSUnqualifiedTestCases.java
index 781f883..4a8ef6d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeNSUnqualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeNSUnqualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
RootWithAttributeNS root = new RootWithAttributeNS();
root.child = "abc";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeUnqualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeUnqualifiedTestCases.java
index b7be9a7..0e62bfa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeUnqualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/AttributeUnqualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
RootWithAttribute root = new RootWithAttribute();
root.child = "abc";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/NoAttributeUnqualifiedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/NoAttributeUnqualifiedTestCases.java
index 4de2426..364154f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/NoAttributeUnqualifiedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unqualified/NoAttributeUnqualifiedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
RootNoAttributes root = new RootNoAttributes();
root.child = "abc";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unset/AttributeFormDefaultUnsetTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unset/AttributeFormDefaultUnsetTestCases.java
index 861fe43..83a6ca4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unset/AttributeFormDefaultUnsetTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/attributeformdefault/unset/AttributeFormDefaultUnsetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
setControlJSON(JSON_RESOURCE);
@@ -50,6 +51,7 @@
}
+ @Override
protected Object getControlObject() {
Address addr = new Address();
addr.city = "Ottawa";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/defaultns/emptyprefix/DefaultNamespaceEmptyStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/defaultns/emptyprefix/DefaultNamespaceEmptyStringTestCases.java
index c6ba0c3..059af24 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/defaultns/emptyprefix/DefaultNamespaceEmptyStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/defaultns/emptyprefix/DefaultNamespaceEmptyStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
@@ -34,6 +35,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.name = "Bob Smith";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/defaultns/singleemptyprefix/DefaultNamespaceSingleEmptyStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/defaultns/singleemptyprefix/DefaultNamespaceSingleEmptyStringTestCases.java
index 15dd39b..65d4fc9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/defaultns/singleemptyprefix/DefaultNamespaceSingleEmptyStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschema/defaultns/singleemptyprefix/DefaultNamespaceSingleEmptyStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
setControlDocument(XML_RESOURCE);
@@ -32,6 +33,7 @@
setTypes(types);
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.name = "Bob Smith";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/NonNegativeIntegerSchemaTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/NonNegativeIntegerSchemaTypeTestCases.java
index 4b58cfa..45fe452 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/NonNegativeIntegerSchemaTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/NonNegativeIntegerSchemaTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.count = new BigInteger("100");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeDateEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeDateEmptyTestCases.java
index b987b56..e8100e0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeDateEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeDateEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeDate employee = new EmployeeDate();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeDateTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeDateTestCases.java
index 7ba7cbc..ba52742 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeDateTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeDateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeDate employee = new EmployeeDate();
Calendar cal = Calendar.getInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeTwoDatesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeTwoDatesTestCases.java
index 3f526a2..962618c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeTwoDatesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlschematype/XmlSchemaTypeTwoDatesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
EmployeeTwoDates employee = new EmployeeTwoDates();
Calendar cal = Calendar.getInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmltype/XmlTypeNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmltype/XmlTypeNameTestCases.java
index 1ded4b4..ca23462 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmltype/XmlTypeNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmltype/XmlTypeNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
Page returnPage = new Page();
returnPage.setIsEmailLinkRequired(VALUE);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmltype/XmlTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmltype/XmlTypeTestCases.java
index 5578c93..41532f3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmltype/XmlTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmltype/XmlTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
return Employee.buildEmployee();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueByteArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueByteArrayTestCases.java
index b372708..fb2bd14 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueByteArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueByteArrayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
BytesHolder holder = new BytesHolder();
byte[] bytes = "ASTRING".getBytes();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueByteArrayWithIdTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueByteArrayWithIdTestCases.java
index 03e7660..012f9d7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueByteArrayWithIdTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueByteArrayWithIdTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
BytesHolderWithXmlId holder = new BytesHolderWithXmlId();
byte[] bytes = "ASTRING".getBytes();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueListTestCases.java
index 591a565..717aff8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
PhoneNumberList pn = new PhoneNumberList();
ArrayList numbers = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueTestCases.java
index 797465c..4af8c58 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
PhoneNumber pn = new PhoneNumber();
pn.number = CONTROL_NUMBER;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithAttributesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithAttributesTestCases.java
index d768597..2bffa23 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithAttributesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithAttributesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,12 +38,14 @@
setClasses(classes);
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_VALUE_WRAPPER, "value");
return props;
}
+ @Override
protected Object getControlObject() {
PhoneNumberWithAtts pn = new PhoneNumberWithAtts();
pn.number = CONTROL_NUMBER;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithAttributesXpathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithAttributesXpathTestCases.java
index 17d7943..ce515a8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithAttributesXpathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithAttributesXpathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setClasses(classes);
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_VALUE_WRAPPER, "value");
@@ -48,6 +49,7 @@
return props;
}
+ @Override
protected Object getControlObject() {
PhoneNumberWithAtts pn = new PhoneNumberWithAtts();
pn.number = CONTROL_NUMBER;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithNullAttrTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithNullAttrTestCases.java
index 890370d..880a0bf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithNullAttrTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvalue/XmlValueWithNullAttrTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,12 +38,14 @@
setClasses(classes);
}
+ @Override
public Map getProperties(){
Map props = new HashMap();
props.put(JAXBContextProperties.JSON_VALUE_WRAPPER, "value");
return props;
}
+ @Override
protected Object getControlObject() {
PhoneNumberWithAtts pn = new PhoneNumberWithAtts();
pn.number = CONTROL_NUMBER;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/Child.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/Child.java
index c5bec90..7f5e173 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/Child.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/Child.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,7 +22,7 @@
if(obj instanceof Child){
return ((childAttribute ==null && ((Child)obj).childAttribute==null) || (childAttribute.equals(((Child)obj).childAttribute)))
- && super.equals((Child)obj);
+ && super.equals(obj);
}
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeNullValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeNullValueTestCases.java
index fde8607..06f3dc2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeNullValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeNullValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
expectsMarshalException = true;
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
@@ -66,6 +67,7 @@
return r;
}
+ @Override
public void assertMarshalException(Exception exception) throws Exception {
Throwable nested = exception.getCause();// getLinkedException();
assertTrue(nested instanceof XMLMarshalException);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeNullsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeNullsTestCases.java
index 6b59bc6..6d10903 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeNullsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeNullsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setClasses(new Class[]{Root.class});
}
+ @Override
public boolean isUnmarshalTest(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeQNameNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeQNameNSTestCases.java
index 50dbcdc..49f56a7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeQNameNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/XmlVariableNodeQNameNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
}
+ @Override
protected Marshaller getJSONMarshaller() throws Exception{
Map<String, String> namespaces = new HashMap<String, String>();
namespaces.put("uri1", "xxx");
@@ -66,6 +67,7 @@
}
+ @Override
protected Map getProperties() {
Map overrides = new HashMap();
String overridesString =
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/method/XmlVariableNodeMethodGetOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/method/XmlVariableNodeMethodGetOnlyTestCases.java
index d5f7953..b092c45 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/method/XmlVariableNodeMethodGetOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/method/XmlVariableNodeMethodGetOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,6 +67,7 @@
return r;
}
+ @Override
public void testRoundTrip(){
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/method/XmlVariableNodeMethodSetOnlyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/method/XmlVariableNodeMethodSetOnlyTestCases.java
index 7abd527..b564cd2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/method/XmlVariableNodeMethodSetOnlyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvariablenode/method/XmlVariableNodeMethodSetOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
return r;
}
+ @Override
public void testRoundTrip(){}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/XmlVirtualAccessMethodsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/XmlVirtualAccessMethodsTestCases.java
index b1efd4c..e04345c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/XmlVirtualAccessMethodsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/XmlVirtualAccessMethodsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
super(name);
}
+ @Override
public String getName() {
return "XML Virtual Access Methods: " + super.getName();
}
@@ -364,6 +365,7 @@
private class LogErrorHandler implements ErrorHandler {
private int errorCount = 0;
+ @Override
public void warning(SAXParseException exception) throws SAXException {
errorCount++;
if (DEBUG) {
@@ -373,6 +375,7 @@
if (THROW_VALIDATION_ERRORS) throw exception;
}
+ @Override
public void error(SAXParseException exception) throws SAXException {
errorCount++;
if (DEBUG) {
@@ -382,6 +385,7 @@
if (THROW_VALIDATION_ERRORS) throw exception;
}
+ @Override
public void fatalError(SAXParseException exception) throws SAXException {
errorCount++;
if (DEBUG) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/PropOrderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/PropOrderTestCases.java
index 426add8..7d1734a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/PropOrderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/PropOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,10 +68,12 @@
return customer;
}
+ @Override
public String getWriteControlJSONFormatted(){
return "org/eclipse/persistence/testing/jaxb/xmlvirtualaccessmethods/proporder/customer_formatted.json";
}
+ @Override
public boolean shouldRemoveWhitespaceFromControlDocJSON(){
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/OtherRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/OtherRootTestCases.java
index d5b66d6..49bc449 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/OtherRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/OtherRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
JAXBElement<Root> obj = new JAXBElement<Root>(new QName("otherNamespace", "otherRoot"), Root.class, new Root());
return obj;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/TypeAttributeInheritanceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/TypeAttributeInheritanceTestCases.java
index 65262b8..e73bf94 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/TypeAttributeInheritanceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/TypeAttributeInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
return new Child();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/TypeAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/TypeAttributeTestCases.java
index 8a1eb04..f2f49eb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/TypeAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/jaxb/xsitype/TypeAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setClasses(classes);
}
+ @Override
protected Object getControlObject() {
return new Root();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/moxy/unit/jaxb/compiler/SchemaGeneratorTestCase.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/moxy/unit/jaxb/compiler/SchemaGeneratorTestCase.java
index 2130ecc..b858f74 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/moxy/unit/jaxb/compiler/SchemaGeneratorTestCase.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/moxy/unit/jaxb/compiler/SchemaGeneratorTestCase.java
@@ -108,47 +108,89 @@
JavaModelInputImpl jModelInput = new JavaModelInputImpl(DOMAIN_CLASSES, new JavaModelImpl(new JaxbClassLoader(Thread.currentThread().getContextClassLoader(), DOMAIN_CLASSES)));
Helper helper = new Helper(jModelInput.getJavaModel());
- assertFalse(helper.isBuiltInJavaType(new JavaClass() { public String getRawName() { return "javax.xml.rpc.StringHolder";}
+ assertFalse(helper.isBuiltInJavaType(new JavaClass() { @Override
+ public String getRawName() { return "javax.xml.rpc.StringHolder";}
+ @Override
public JavaClassInstanceOf instanceOf() { return null; }
+ @Override
public boolean isSynthetic() { return false; }
+ @Override
public Collection getActualTypeArguments() { return null; }
+ @Override
public JavaClass getComponentType() { return null; }
+ @Override
public String getQualifiedName() { return null; }
+ @Override
public boolean hasActualTypeArguments() { return false; }
+ @Override
public Collection getDeclaredClasses() { return null; }
+ @Override
public JavaField getDeclaredField(String arg0) { return null; }
+ @Override
public Collection getDeclaredFields() { return null; }
+ @Override
public JavaMethod getDeclaredMethod(String arg0, JavaClass[] arg1) { return null; }
+ @Override
public Collection getDeclaredMethods() { return null; }
+ @Override
public JavaMethod getMethod(String arg0, JavaClass[] arg1) { return null; }
+ @Override
public Collection getMethods() { return null ;}
+ @Override
public JavaConstructor getConstructor(JavaClass[] parameterTypes) { return null; }
+ @Override
public Collection getConstructors() { return null; }
+ @Override
public JavaConstructor getDeclaredConstructor(JavaClass[] parameterTypes) { return null; }
+ @Override
public Collection getDeclaredConstructors() { return null; }
+ @Override
public int getModifiers() { return 0; }
+ @Override
public String getName() { return null; }
+ @Override
public JavaPackage getPackage() { return null; }
+ @Override
public String getPackageName() { return null; }
+ @Override
public JavaClass getSuperclass() { return null; }
+ @Override
public Type[] getGenericInterfaces() { return null; }
+ @Override
public Type getGenericSuperclass() { return null; }
+ @Override
public boolean isAbstract() { return false; }
+ @Override
public boolean isAnnotation() { return false; }
+ @Override
public boolean isArray() { return false; }
+ @Override
public boolean isAssignableFrom(JavaClass arg0) { return false; }
+ @Override
public boolean isEnum() { return false; }
+ @Override
public boolean isFinal() { return false; }
+ @Override
public boolean isInterface() { return false; }
+ @Override
public boolean isMemberClass() { return false; }
+ @Override
public boolean isPrimitive() { return false; }
+ @Override
public boolean isPrivate() { return false; }
+ @Override
public boolean isProtected() { return false; }
+ @Override
public boolean isPublic() { return false; }
+ @Override
public boolean isStatic() { return false; }
+ @Override
public JavaAnnotation getAnnotation(JavaClass arg0) { return null; }
+ @Override
public Collection getAnnotations() { return null; }
+ @Override
public JavaAnnotation getDeclaredAnnotation(JavaClass arg0) { return null; }
+ @Override
public Collection getDeclaredAnnotations() { return null; }
}));
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/moxy/unit/jaxb/compiler/builder/ChildSchemaGenerator.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/moxy/unit/jaxb/compiler/builder/ChildSchemaGenerator.java
index b74e755..a49a00b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/moxy/unit/jaxb/compiler/builder/ChildSchemaGenerator.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/moxy/unit/jaxb/compiler/builder/ChildSchemaGenerator.java
@@ -26,6 +26,7 @@
super(helper);
}
+ @Override
public TransformerPropertyBuilder getTransformerPropertyBuilder(Property property, TypeInfo typeInfo) {
return super.getTransformerPropertyBuilder(property, typeInfo);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/OXTestCase.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/OXTestCase.java
index 67d799f..db18a0f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/OXTestCase.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/OXTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -251,6 +251,7 @@
}
}
+ @Override
public String getName() {
String longClassName = this.getClass().getName();
String shortClassName = longClassName.substring(longClassName.lastIndexOf(".") + 1, longClassName.length() - 1);
@@ -420,6 +421,7 @@
}
}
+ @Override
protected void compareValues(Object controlValue, Object testValue){
if(controlValue instanceof JAXBElement && testValue instanceof JAXBElement){
compareJAXBElementObjects((JAXBElement)controlValue, (JAXBElement)testValue);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/ClassLoaderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/ClassLoaderTestCases.java
index 62412ce..f338860 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/ClassLoaderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/ClassLoaderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
String[] arguments = { "-c", "org.eclipse.persistence.testing.oxm.classloader.ClassLoaderTestCases" };
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
employeeClassLoader = new JARClassLoader("org/eclipse/persistence/testing/oxm/classloader/Employee.jar");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/JARClassLoader.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/JARClassLoader.java
index e40707a..37d250e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/JARClassLoader.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/JARClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -147,6 +147,7 @@
/**
* Return the class for the specified name, resolving it if necessary.
*/
+@Override
protected Class loadClass(String className, boolean resolve) throws ClassNotFoundException {
Class c = this.loadUnresolvedClass(className);
if (resolve) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/MappingClassLoaderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/MappingClassLoaderTestCases.java
index 0ad7618..1e3132a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/MappingClassLoaderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/classloader/MappingClassLoaderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() throws Exception {
classLoader = new JARClassLoader("org/eclipse/persistence/testing/oxm/classloader/MappingTests.jar");
xmlContext = getXMLContext(new MappingTestProject(classLoader, platform, metadata), classLoader);
@@ -96,7 +97,7 @@
unmarshalDoc = parse(MAPPING_TEST_RESOURCE_NO_CHOICE);
}
} else {
- if(platform == OXTestCase.platform.SAX) {
+ if(platform == Platform.SAX) {
unmarshalDoc = parse(MAPPING_TEST_RESOURCE_NO_BINARY);
} else {
unmarshalDoc = parse(MAPPING_TEST_RESOURCE_NO_CHOICE_OR_BINARY);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/jaxbenum/JAXBEnumTypeConverterProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/jaxbenum/JAXBEnumTypeConverterProject.java
index 2a5ddd7..9d55633 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/jaxbenum/JAXBEnumTypeConverterProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/jaxbenum/JAXBEnumTypeConverterProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@
firstNameMapping.setXPath("first-name/text()");
JAXBEnumTypeConverter converter = new JAXBEnumTypeConverter(firstNameMapping,"theClassName", false);
- ((XMLDirectMapping)firstNameMapping).setConverter(converter);
+ firstNameMapping.setConverter(converter);
descriptor.addMapping(firstNameMapping);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/typesafeenum/TypeSafeEnumConverterProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/typesafeenum/TypeSafeEnumConverterProject.java
index d32bb47..b5d1bd7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/typesafeenum/TypeSafeEnumConverterProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/typesafeenum/TypeSafeEnumConverterProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,31 +60,31 @@
XMLDirectMapping shirtmapping = (XMLDirectMapping)desc.getMappingForAttributeName("shirtSize");
JAXBTypesafeEnumConverter shirtConverter = new JAXBTypesafeEnumConverter();
shirtConverter.setEnumClass(MyTypeSafeEnumClass.class);
- ((XMLDirectMapping)shirtmapping).setConverter(shirtConverter);
+ shirtmapping.setConverter(shirtConverter);
XMLCompositeDirectCollectionMapping hatmapping = (XMLCompositeDirectCollectionMapping)desc.getMappingForAttributeName("hatSizes");
JAXBTypesafeEnumConverter hatConverter = new JAXBTypesafeEnumConverter();
hatConverter.setEnumClass(MyTypeSafeEnumClass.class);
- ((XMLCompositeDirectCollectionMapping)hatmapping).setValueConverter(hatConverter);
+ hatmapping.setValueConverter(hatConverter);
}
public static void amendDescriptorNoEnumClass(ClassDescriptor desc) {
XMLDirectMapping shirtmapping = (XMLDirectMapping)desc.getMappingForAttributeName("shirtSize");
JAXBTypesafeEnumConverter shirtConverter = new JAXBTypesafeEnumConverter();
- ((XMLDirectMapping)shirtmapping).setConverter(shirtConverter);
+ shirtmapping.setConverter(shirtConverter);
}
public static void amendDescriptorNoSuchMethod(ClassDescriptor desc) {
XMLDirectMapping shirtmapping = (XMLDirectMapping)desc.getMappingForAttributeName("shirtSize");
JAXBTypesafeEnumConverter shirtConverter = new JAXBTypesafeEnumConverter();
shirtConverter.setEnumClass(TypeSafeEnumConverterTestCases.class);
- ((XMLDirectMapping)shirtmapping).setConverter(shirtConverter);
+ shirtmapping.setConverter(shirtConverter);
}
public static void amendDescriptorInvalidEnumClass(ClassDescriptor desc) {
XMLDirectMapping shirtmapping = (XMLDirectMapping)desc.getMappingForAttributeName("shirtSize");
JAXBTypesafeEnumConverter shirtConverter = new JAXBTypesafeEnumConverter();
shirtConverter.setEnumClassName("a.b.c");
- ((XMLDirectMapping)shirtmapping).setConverter(shirtConverter);
+ shirtmapping.setConverter(shirtConverter);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/typesafeenum/TypeSafeEnumConverterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/typesafeenum/TypeSafeEnumConverterTestCases.java
index 09fdb5e..10d308e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/typesafeenum/TypeSafeEnumConverterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/converter/typesafeenum/TypeSafeEnumConverterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setFirstName("Linda");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deferred/DeferredContentHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deferred/DeferredContentHandlerTestCases.java
index 3e23c97..3c91264 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deferred/DeferredContentHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deferred/DeferredContentHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setNamespaceAware(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deferred/TestDeferredContentHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deferred/TestDeferredContentHandler.java
index f9adec0..def35a0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deferred/TestDeferredContentHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deferred/TestDeferredContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
reader = theReader;
}
+ @Override
protected void processEmptyElement() throws SAXException {
PROCESS_EMPTY++;
endProcessing();
@@ -45,11 +46,13 @@
endProcessing();
}
+ @Override
protected void processComplexElement() throws SAXException {
PROCESS_COMPLEX_ELEMENT++;
endProcessing();
}
+ @Override
protected void processSimpleElement() throws SAXException {
PROCESS_SIMPLE_ELEMENT++;
endProcessing();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deploymentxml/DeploymentXMLXsiTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deploymentxml/DeploymentXMLXsiTypeTestCases.java
index 5960ea3..87801fb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deploymentxml/DeploymentXMLXsiTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/deploymentxml/DeploymentXMLXsiTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,10 +44,10 @@
XMLPlatform xmlPlatform = XMLPlatformFactory.getInstance().getXMLPlatform();
XMLParser parser = xmlPlatform.newXMLParser();
InputStream stream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/deploymentxml/db-adapter-toplink-mapping-file.xml");
- Project proj = reader.read(new InputStreamReader(stream));
+ Project proj = XMLProjectReader.read(new InputStreamReader(stream));
StringWriter writer = new StringWriter();
- new XMLProjectWriter().write(proj, writer);
+ XMLProjectWriter.write(proj, writer);
parser.setNamespaceAware(true);
@@ -57,6 +57,7 @@
URL eclipselinkSchemaURL = getClass().getClassLoader().getResource(schema);
parser.setEntityResolver(new EntityResolver() {
+ @Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
if (XMLProjectReader.OPM_SCHEMA.equals(systemId)) {
URL url = getClass().getClassLoader().getResource(XMLProjectReader.SCHEMA_DIR + XMLProjectReader.OPM_SCHEMA);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsAlwaysWrapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsAlwaysWrapTestCases.java
index 3f575df..7cceb13 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsAlwaysWrapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsAlwaysWrapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
TestRunner.main(arguments);
}
+ @Override
protected Object getControlObject() {
XMLRoot xmlRoot = new XMLRoot();
MailingAddress address = new MailingAddress();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases.java
index 36c2a8a..2665634 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
TestRunner.main(arguments);
}
+ @Override
protected Object getControlObject() {
MailingAddress address = new MailingAddress();
XMLRoot xmlRoot = new XMLRoot();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases2.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases2.java
index 0ae3f42..31b3e5b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases2.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
TestRunner.main(arguments);
}
+ @Override
protected Object getControlObject() {
MailingAddress address = new MailingAddress();
XMLRoot xmlRoot = new XMLRoot();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases3.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases3.java
index 5a63335..2f068c6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases3.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/descriptor/rootelement/multipleroots/MultipleRootsTestCases3.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
TestRunner.main(arguments);
}
+ @Override
protected Object getControlObject() {
MailingAddress address = new MailingAddress();
return address;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/BasicDocumentPreservationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/BasicDocumentPreservationTestCases.java
index c5d72ea..da24c23 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/BasicDocumentPreservationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/BasicDocumentPreservationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
context = this.getXMLContext("DocumentPreservationSession");
marshaller = context.createMarshaller();
@@ -56,7 +57,7 @@
Employee emp = (Employee)unmarshaller.unmarshal(sourceDocument);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
@@ -68,7 +69,7 @@
emp.setLastName(null);
emp.getAddress().setCity(null);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
@@ -84,7 +85,7 @@
addr.setProvince("ON");
addr.setPostalCode("A1A 1A1");
emp.setAddress(addr);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/CompositeCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/CompositeCollectionTestCases.java
index e76b3ed..ed14d3e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/CompositeCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/CompositeCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
context = this.getXMLContext("DocumentPreservationSession");
marshaller = context.createMarshaller();
@@ -64,7 +65,7 @@
newPhones.addElement(pn);
}
emp.setPhoneNumbers(newPhones);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
@@ -77,7 +78,7 @@
Vector phones = emp.getPhoneNumbers();
phones.remove(0);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
@@ -95,7 +96,7 @@
num.setNumber(4321);
phones.addElement(num);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
@@ -110,7 +111,7 @@
num.setExchange(456);
num.setNumber(7890);
phones.addElement(num);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
@@ -121,7 +122,7 @@
Employee emp = (Employee)unmarshaller.unmarshal(sourceDocument);
emp.setPhoneNumbers(null);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
@@ -132,7 +133,7 @@
Employee emp = (Employee)unmarshaller.unmarshal(sourceDocument);
emp.setPhoneNumbers(new Vector());
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/CompositeObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/CompositeObjectTestCases.java
index 80f8fb6..75b9275 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/CompositeObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/CompositeObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
context = this.getXMLContext("DocumentPreservationSession");
marshaller = context.createMarshaller();
@@ -60,7 +61,7 @@
Employee emp = (Employee)unmarshaller.unmarshal(sourceDocument);
emp.getAddress().setCity("New Minas");
((CanadianAddress)emp.getAddress()).setProvince("NS");
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
@@ -70,7 +71,7 @@
Employee emp = (Employee)unmarshaller.unmarshal(sourceDocument);
emp.setAddress(null);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
@@ -85,7 +86,7 @@
addr.setState("NY");
addr.setZipCode("90210");
emp.setAddress(addr);
- Document outputDoc = (Document)marshaller.objectToXML(emp);
+ Document outputDoc = marshaller.objectToXML(emp);
assertXMLIdentical(controlDocument, outputDoc);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/DocumentPreservationFragmentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/DocumentPreservationFragmentTestCases.java
index 236b80a..1f7a3b5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/DocumentPreservationFragmentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/DocumentPreservationFragmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
context = this.getXMLContext("DocumentPreservationSession");
marshaller = context.createMarshaller();
@@ -54,6 +55,7 @@
}
+ @Override
public void tearDown() {
marshaller.setFragment(false);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/MyContentHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/MyContentHandler.java
index a5d87b9..1d38661 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/MyContentHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/documentpreservation/MyContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,11 +25,13 @@
super();
}
+ @Override
public void startDocument() throws SAXException {
startTriggered = true;
super.startDocument();
}
+ @Override
public void endDocument() throws SAXException {
endTriggered = true;
super.endDocument();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/dynamic/DynamicTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/dynamic/DynamicTestCases.java
index edf32b1..dd2cf6e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/dynamic/DynamicTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/dynamic/DynamicTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,12 +55,13 @@
ClassLoader sysClassLoader = Thread.currentThread().getContextClassLoader();
dynamicClassLoader = new DynamicClassLoader(sysClassLoader);
- dynamicTestProject = DynamicTypeBuilder.loadDynamicProject((Project) new DynamicTestProject(), null, dynamicClassLoader);
+ dynamicTestProject = DynamicTypeBuilder.loadDynamicProject(new DynamicTestProject(), null, dynamicClassLoader);
setProject(dynamicTestProject);
setControlDocument(XML_RESOURCE);
}
+ @Override
public Object getControlObject() {
try {
Object rootObj = newInstance(ROOT_CLASS_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/MarshalListenerImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/MarshalListenerImpl.java
index b2bac90..4651bb9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/MarshalListenerImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/MarshalListenerImpl.java
@@ -37,6 +37,7 @@
public MarshalListenerImpl() {
events = new ArrayList();
}
+ @Override
public void beforeMarshal(Object obj) {
if(obj instanceof Employee) {
events.add(EMPLOYEE_BEFORE_MARSHAL);
@@ -46,6 +47,7 @@
events.add(PHONE_BEFORE_MARSHAL);
}
}
+ @Override
public void afterMarshal(Object obj) {
if(obj instanceof Employee) {
events.add(EMPLOYEE_AFTER_MARSHAL);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithAnyCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithAnyCollectionTestCases.java
index bd3c7a0..4561df1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithAnyCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithAnyCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
expectedUnmarshalEvents.add(UnmarshalListenerImpl.EMPLOYEE_AFTER_UNMARSHAL);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
unmarshalListener = new UnmarshalListenerImpl();
@@ -70,16 +71,19 @@
return marshaller;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Expected sequence of Unmarshal events not found", expectedUnmarshalEvents.equals(unmarshalListener.events));
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Expected sequence of Marshal events not found", expectedMarshalEvents.equals(listener.events));
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
ArrayList anyCollection = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithAnyObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithAnyObjectTestCases.java
index 4e9567a..6ad6c65 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithAnyObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithAnyObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
expectedUnmarshalEvents.add(UnmarshalListenerImpl.EMPLOYEE_AFTER_UNMARSHAL);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
unmarshalListener = new UnmarshalListenerImpl();
@@ -64,16 +65,19 @@
return marshaller;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Expected sequence of Unmarshal events not found", expectedUnmarshalEvents.equals(unmarshalListener.events));
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Expected sequence of Marshal events not found", expectedMarshalEvents.equals(listener.events));
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
Address address = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithCompositeCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithCompositeCollectionTestCases.java
index 1d08802..628c54c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithCompositeCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithCompositeCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
expectedUnmarshalEvents.add(UnmarshalListenerImpl.EMPLOYEE_AFTER_UNMARSHAL);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
unmarshalListener = new UnmarshalListenerImpl();
@@ -69,16 +70,19 @@
return marshaller;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Expected sequence of Unmarshal events not found", expectedUnmarshalEvents.equals(unmarshalListener.events));
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Expected sequence of Marshal events not found", expectedMarshalEvents.equals(listener.events));
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithCompositeObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithCompositeObjectTestCases.java
index 635e271..64636e4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithCompositeObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/RootWithCompositeObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
expectedUnmarshalEvents.add(UnmarshalListenerImpl.EMPLOYEE_AFTER_UNMARSHAL);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
unmarshalListener = new UnmarshalListenerImpl();
@@ -65,16 +66,19 @@
return marshaller;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Expected sequence of Unmarshal events not found", expectedUnmarshalEvents.equals(unmarshalListener.events));
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertTrue("Expected sequence of Marshal events not found", expectedMarshalEvents.equals(listener.events));
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
Address address = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/UnmarshalListenerImpl.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/UnmarshalListenerImpl.java
index de1270e..2864a49 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/UnmarshalListenerImpl.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/UnmarshalListenerImpl.java
@@ -37,6 +37,7 @@
public UnmarshalListenerImpl() {
events = new ArrayList();
}
+ @Override
public void beforeUnmarshal(Object obj, Object parent) {
if(obj instanceof Employee) {
events.add(EMPLOYEE_BEFORE_UNMARSHAL);
@@ -46,6 +47,7 @@
events.add(PHONE_BEFORE_UNMARSHAL);
}
}
+ @Override
public void afterUnmarshal(Object obj, Object parent) {
if(obj instanceof Employee) {
events.add(EMPLOYEE_AFTER_UNMARSHAL);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/EmployeeProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/EmployeeProject.java
index 1d19437..dc26f95 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/EmployeeProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/EmployeeProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,9 +31,11 @@
super();
}
+ @Override
public XMLDescriptor addEmployeeDescriptor() {
XMLDescriptor descriptor = super.addEmployeeDescriptor();
descriptor.getEventManager().addListener(new DescriptorEventAdapter() {
+ @Override
public void postBuild(DescriptorEvent event) {
events.add(PostBuildEventTestCases.EMPLOYEE_POST_BUILD);
}
@@ -41,9 +43,11 @@
return descriptor;
}
+ @Override
public XMLDescriptor addAddressDescriptor() {
XMLDescriptor descriptor = super.addAddressDescriptor();
descriptor.getEventManager().addListener(new DescriptorEventAdapter() {
+ @Override
public void postBuild(DescriptorEvent event) {
events.add(PostBuildEventTestCases.ADDRESS_POST_BUILD);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/PostBuildEventTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/PostBuildEventTestCases.java
index b364a6d..c3ac90e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/PostBuildEventTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/events/descriptor/PostBuildEventTestCases.java
@@ -35,17 +35,20 @@
setControlDocument("org/eclipse/persistence/testing/oxm/events/composite_object.xml");
}
+ @Override
public void setUp() throws Exception {
super.setUp();
project.setup();
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertTrue("Employee post build event did not occur as expected", project.events.contains(EMPLOYEE_POST_BUILD));
assertTrue("Address post build event did not occur as expected", project.events.contains(ADDRESS_POST_BUILD));
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
Address address = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarDefaultNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarDefaultNSTestCases.java
index 8a201b8..2e191b9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarDefaultNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarDefaultNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/inheritance/car.json");
}
+ @Override
public Object getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarDiffPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarDiffPrefixTestCases.java
index 0fda996..0ce6795 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarDiffPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarDiffPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setWriteControlDocument("org/eclipse/persistence/testing/oxm/inheritance/car.xml");
}
+ @Override
public Object getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarNoPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarNoPrefixTestCases.java
index 417f1e3..332d7a0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarNoPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarNoPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
setControlJSONWrite("org/eclipse/persistence/testing/oxm/inheritance/car.json");
}
+ @Override
public Object getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarTestCases.java
index 724d592..1539d2c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceCarTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/inheritance/car.json");
}
+ @Override
public Object getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceDiffPrefixNonRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceDiffPrefixNonRootTestCases.java
index 32ec1df..525d8fa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceDiffPrefixNonRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceDiffPrefixNonRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
ParkingLot lot = new ParkingLot();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceNoRootOnChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceNoRootOnChildTestCases.java
index 8ca6dd4..0e1316e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceNoRootOnChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceNoRootOnChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/inheritance/car.json");
}
+ @Override
public Object getControlObject() {
Car car = new Car();
car.numberOfDoors = 2;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceProjectNoRootOnChild.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceProjectNoRootOnChild.java
index d8f0f95..b64c425 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceProjectNoRootOnChild.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceProjectNoRootOnChild.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
public class InheritanceProjectNoRootOnChild extends InheritanceProject{
+ @Override
public XMLDescriptor getCarDescriptor() {
XMLDescriptor descriptor = new XMLDescriptor();
descriptor.setJavaClass(org.eclipse.persistence.testing.oxm.inheritance.Car.class);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceVehicleDiffPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceVehicleDiffPrefixTestCases.java
index 003a102..cdebb03 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceVehicleDiffPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceVehicleDiffPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
Vehicle vehicle = new Vehicle();
vehicle.model = "Blah Blah";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceVehicleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceVehicleTestCases.java
index b2b2cdf..0a7ebdb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceVehicleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/InheritanceVehicleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/inheritance/vehicle.json");
}
+ @Override
public Object getControlObject() {
Vehicle vehicle = new Vehicle();
vehicle.model = "Blah Blah";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/classextractor/CarClassExtractorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/classextractor/CarClassExtractorTestCases.java
index afb9132..9e18cf9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/classextractor/CarClassExtractorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/classextractor/CarClassExtractorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,12 +40,14 @@
TestRunner.main(arguments);
}
+ @Override
protected Map<String, String> getNamespaces(){
Map map = new HashMap<String, String>();
map.put("mynamespaceuri", "prefix");
return map;
}
+ @Override
public Object getControlObject() {
ParkingLot lot = new ParkingLot();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/ns/NSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/ns/NSTestCases.java
index b80834e..8867b94 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/ns/NSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/ns/NSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,10 +32,12 @@
setControlJSON("org/eclipse/persistence/testing/oxm/inheritance/ns.json");
}
+ @Override
protected boolean getNamespaceAware(){
return true;
}
+ @Override
protected Map<String, String> getNamespaces(){
Map<String, String> namespaces = new HashMap<String, String>();
namespaces.put("urn:parent", "parent");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/AddressAsNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/AddressAsNestedTestCases.java
index a52383b..3f79dbb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/AddressAsNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/AddressAsNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
Address add = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/AddressAsNestedWithCdnAddressXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/AddressAsNestedWithCdnAddressXsiTestCases.java
index 6a7cae3..5ccfb9c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/AddressAsNestedWithCdnAddressXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/AddressAsNestedWithCdnAddressXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
CanadianAddress add = new CanadianAddress();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/CanadianAddressAsNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/CanadianAddressAsNestedTestCases.java
index 716373c..f075921 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/CanadianAddressAsNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/CanadianAddressAsNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Dependant dep = new Dependant();
CanadianAddress cadd = new CanadianAddress();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/CanadianAddressAsRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/CanadianAddressAsRootTestCases.java
index d44705c..7dd2263 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/CanadianAddressAsRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/CanadianAddressAsRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setControlDocument(READ_DOC);
}
+ @Override
public Object getControlObject() {
CanadianAddress cadd = new CanadianAddress();
cadd.setId("123");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsCdnAddressTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsCdnAddressTestCases.java
index 2883d18..c17fcf0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsCdnAddressTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsCdnAddressTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlJSONWrite(JSON_WRITE_DOC);
}
+ @Override
public Object getControlObject() {
ContactMethod cm = new ContactMethod();
cm.setId("123");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedCdnAddressTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedCdnAddressTestCases.java
index e26c9e6..d4faca9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedCdnAddressTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedCdnAddressTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlJSONWrite(JSON_WRITE_DOC);
}
+ @Override
public Object getControlObject() {
Customer cust = new Customer();
ContactMethod cm = new ContactMethod();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedTestCases.java
index 4ef015e..a0a0817 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Customer cust = new Customer();
ContactMethod cm = new ContactMethod();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedWithAddressXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedWithAddressXsiTestCases.java
index 42a9189..dc05de5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedWithAddressXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedWithAddressXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Customer cust = new Customer();
Address add = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedWithCdnAddressXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedWithCdnAddressXsiTestCases.java
index 5af47f1..4497ea4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedWithCdnAddressXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsNestedWithCdnAddressXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Customer cust = new Customer();
CanadianAddress add = new CanadianAddress();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsRootTestCases.java
index 5f04481..40aa4b6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
ContactMethod cm = new ContactMethod();
cm.setId("123");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsRootWithAddressXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsRootWithAddressXsiTestCases.java
index 14654c9..65b0c90 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsRootWithAddressXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/ContactAsRootWithAddressXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Address add = new Address();
add.setId("123");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/XmlRootWithContactXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/XmlRootWithContactXsiTestCases.java
index 9f302cc..04576e9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/XmlRootWithContactXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/XmlRootWithContactXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
return namespaces;
}
+ @Override
public Object getControlObject() {
ContactMethod cm = new ContactMethod();
cm.setId("123");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/any/ContactAsAnyNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/any/ContactAsAnyNestedTestCases.java
index 91674eb..32e0fc0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/any/ContactAsAnyNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/any/ContactAsAnyNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_DOC);
}
+ @Override
public Object getControlObject() {
Customer cust = new Customer();
ContactMethod cm = new ContactMethod();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/any/collection/ContactsAsAnyNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/any/collection/ContactsAsAnyNestedTestCases.java
index 9f7a68b..8b99718 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/any/collection/ContactsAsAnyNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/any/collection/ContactsAsAnyNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlJSON(JSON_DOC);
}
+ @Override
public Object getControlObject() {
Customer cust = new Customer();
ArrayList contacts = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedTestCases.java
index 6421256..10b0673 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
ArrayList adds = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedWithCdnAddressNoDefaultRootTypeXsiTestsCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedWithCdnAddressNoDefaultRootTypeXsiTestsCases.java
index 2b65edc..652b9b5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedWithCdnAddressNoDefaultRootTypeXsiTestsCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedWithCdnAddressNoDefaultRootTypeXsiTestsCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,13 +34,14 @@
((XMLDescriptor)p.getDescriptor(CanadianAddress.class)).setDefaultRootElementField(null);
((XMLDescriptor)p.getDescriptor(CanadianAddress.class)).setDefaultRootElement(null);
- ((XMLCompositeCollectionMapping)((XMLDescriptor)p.getDescriptor(Employee.class)).getMappingForAttributeName("addresses")).setReferenceClass(null);
- ((XMLField)((XMLCompositeCollectionMapping)((XMLDescriptor)p.getDescriptor(Employee.class)).getMappingForAttributeName("addresses")).getField()).setLeafElementType(null);
+ ((XMLCompositeCollectionMapping) p.getDescriptor(Employee.class).getMappingForAttributeName("addresses")).setReferenceClass(null);
+ ((XMLField) p.getDescriptor(Employee.class).getMappingForAttributeName("addresses").getField()).setLeafElementType(null);
setProject(p);
setControlDocument(READ_DOC);
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
ArrayList adds = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedWithCdnAddressXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedWithCdnAddressXsiTestCases.java
index 2e51945..888028d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedWithCdnAddressXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/AddressesAsNestedWithCdnAddressXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
ArrayList adds = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/CanadianAddressAsRefClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/CanadianAddressAsRefClassTestCases.java
index cde5155..f91f5bb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/CanadianAddressAsRefClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/CanadianAddressAsRefClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,7 +30,7 @@
super(name);
Project p = new COMCollectionTypeProject();
((XMLCompositeCollectionMapping)p.getDescriptor(Employee.class).getMappingForAttributeName("addresses")).setReferenceClass(CanadianAddress.class);
- ((XMLField)((XMLCompositeCollectionMapping)p.getDescriptor(Employee.class).getMappingForAttributeName("addresses")).getField()).setLeafElementType(null);
+ ((XMLField) p.getDescriptor(Employee.class).getMappingForAttributeName("addresses").getField()).setLeafElementType(null);
setProject(p);
setControlDocument(READ_DOC);
@@ -38,6 +38,7 @@
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
ArrayList adds = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/CanadianAddressesAsNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/CanadianAddressesAsNestedTestCases.java
index 12d7aeb..78b49e4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/CanadianAddressesAsNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/CanadianAddressesAsNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
}
+ @Override
public Object getControlObject() {
Dependant dep = new Dependant();
ArrayList adds = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedTestCases.java
index 06c840b..e494b1c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
}
+ @Override
public Object getControlObject() {
Customer cust = new Customer();
ArrayList contacts = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedWithAddressXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedWithAddressXsiTestCases.java
index 9de65ba..bf5bcea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedWithAddressXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedWithAddressXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
}
+ @Override
public Object getControlObject() {
Customer cust = new Customer();
ArrayList addresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedWithCdnAddressXsiTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedWithCdnAddressXsiTestCases.java
index b864f91..4a8aedd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedWithCdnAddressXsiTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/inheritance/typetests/compositecollection/ContactsAsNestedWithCdnAddressXsiTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON(JSON_READ_DOC);
}
+ @Override
public Object getControlObject() {
Customer cust = new Customer();
ArrayList addresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/XMLMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/XMLMappingTestCases.java
index 6c14c22..dc4a3c1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/XMLMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/XMLMappingTestCases.java
@@ -110,6 +110,7 @@
}
}
+ @Override
public void setUp() throws Exception {
setupParser();
@@ -126,6 +127,7 @@
return xmlMarshaller;
}
+ @Override
public void tearDown() {
parser = null;
xmlContext = null;
@@ -487,7 +489,7 @@
if(XML_OUTPUT_FACTORY != null && staxResultClass != null) {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLStreamWriter streamWriter= factory.createXMLStreamWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -532,7 +534,7 @@
if(XML_OUTPUT_FACTORY != null && staxResultClass != null) {
StringWriter writer = new StringWriter();
XMLOutputFactory factory = XMLOutputFactory.newInstance();
- factory.setProperty(factory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
+ factory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(false));
XMLEventWriter eventWriter= factory.createXMLEventWriter(writer);
Object objectToWrite = getWriteControlObject();
@@ -692,36 +694,47 @@
private static class FakeValidatorHandler extends ValidatorHandler {
+ @Override
public void setDocumentLocator(Locator locator) {
}
+ @Override
public void startDocument() throws SAXException {
}
+ @Override
public void endDocument() throws SAXException {
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException {
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void processingInstruction(String target, String data) throws SAXException {
}
+ @Override
public void skippedEntity(String name) throws SAXException {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/reuse/AnyAttributeReuseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/reuse/AnyAttributeReuseTestCases.java
index faa226e..4b8796c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/reuse/AnyAttributeReuseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/reuse/AnyAttributeReuseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyattribute/reuse/reuse.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Properties any = new Properties();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/usemaptests/AnyAttributeUsingMapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/usemaptests/AnyAttributeUsingMapTestCases.java
index 0b49518..34e69f0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/usemaptests/AnyAttributeUsingMapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/usemaptests/AnyAttributeUsingMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/usemaptests/multiple_attributes.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Hashtable any = new Hashtable();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesNSExcludeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesNSExcludeTestCases.java
index dfc4556..0ad6091 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesNSExcludeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesNSExcludeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/multiple_attributes_ns.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
@@ -47,6 +48,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesNSTestCases.java
index 27fbe2e..7712f71 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/multiple_attributes_ns.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
@@ -46,6 +47,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesTestCases.java
index dac4605..919916c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeMultipleAttributesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
xmlToObjectTest(testObject);
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeNoAttributesNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeNoAttributesNSTestCases.java
index e8796ea..72a81ae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeNoAttributesNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeNoAttributesNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setProject(new AnyAttributeWithGroupingElementNSProject());
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/no_attributes_ns.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeNoAttributesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeNoAttributesTestCases.java
index ae4d7bf..2e6cf4e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeNoAttributesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withgroupingelement/AnyAttributeNoAttributesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/no_attributes.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesNSExcludeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesNSExcludeTestCases.java
index 779d3eb..488c96b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesNSExcludeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesNSExcludeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/multiple_attributes_ns.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
@@ -54,6 +55,7 @@
}
+ @Override
public Object getWriteControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesNSTestCases.java
index 39b9e6e..01c6c0c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/multiple_attributes_ns.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
@@ -52,6 +53,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesTestCases.java
index ce44acc..cb023d5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeMultipleAttributesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/multiple_attributes.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNSonRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNSonRootTestCases.java
index cfdbf5d..5f7b282 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNSonRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNSonRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/multiple_attributes_ns_on_root.xml");
}
+ @Override
public Object getControlObject() {
Wrapper theWrapper = new Wrapper();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNoAttributesNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNoAttributesNSTestCases.java
index edfbc43..3145a62 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNoAttributesNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNoAttributesNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/no_attributes_ns.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
@@ -35,6 +36,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNoAttributesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNoAttributesTestCases.java
index 24d3438..0fcecf3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNoAttributesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNoAttributesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/no_attributes.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNotInNRTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNotInNRTestCases.java
index b0110ce..a3963da 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNotInNRTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/AnyAttributeNotInNRTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyattribute/withoutgroupingelement/multiple_attributes_ns_not_in_nr.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
HashMap any = new HashMap();
@@ -48,6 +49,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
Root root = new Root();
HashMap any = new HashMap();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/defaultnamespace/AnyCollectionComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/defaultnamespace/AnyCollectionComplexChildrenTestCases.java
index d8c6591..33433d5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/defaultnamespace/AnyCollectionComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/defaultnamespace/AnyCollectionComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/defaultnamespace/complex_children.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/reuse/AnyCollectionReuseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/reuse/AnyCollectionReuseTestCases.java
index 8f75098..be6ff9a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/reuse/AnyCollectionReuseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/reuse/AnyCollectionReuseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/defaultnamespace/complex_children.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Stack();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionComplexChildrenNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionComplexChildrenNSTestCases.java
index fbb8fd8..18cd021 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionComplexChildrenNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionComplexChildrenNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
//setWriteControlDoc("org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/complex_children_ns_write.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionComplexChildrenTestCases.java
index 8582d84..3517f9f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/complex_children.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionMixedChildrenArrayListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionMixedChildrenArrayListTestCases.java
index ad471f4..3a92c51 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionMixedChildrenArrayListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionMixedChildrenArrayListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/mixed_children.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionMixedChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionMixedChildrenTestCases.java
index 35a8165..c290795 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionMixedChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionMixedChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/mixed_children.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoChildrenTestCases.java
index 3191e97..552d915 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/no_children.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
return root;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoDefaultRootComplexChildrenTestCases.java
index 0c40984..6b92599 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,10 +39,12 @@
expectsMarshalException = true;
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoDefaultRootWithGroupingElementProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoDefaultRootWithGroupingElementProject.java
index 3453986..e04dafd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoDefaultRootWithGroupingElementProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionNoDefaultRootWithGroupingElementProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
public class AnyCollectionNoDefaultRootWithGroupingElementProject
extends AnyCollectionWithGroupingElementProject {
+ @Override
public ClassDescriptor buildChildDescriptor() {
XMLDescriptor descriptor = new XMLDescriptor();
descriptor.setJavaClass(Child.class);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionTextChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionTextChildTestCases.java
index ae711aa..4bb568b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionTextChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionTextChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/text_children.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionWithGroupingWithXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionWithGroupingWithXMLRootTestCases.java
index c2631a4..3b0fa22 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionWithGroupingWithXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withgroupingelement/AnyCollectionWithGroupingWithXMLRootTestCases.java
@@ -33,7 +33,7 @@
public AnyCollectionWithGroupingWithXMLRootTestCases(String name) throws Exception {
super(name);
Project project = new AnyCollectionWithGroupingElementProjectNS();
- ((XMLAnyCollectionMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyCollectionMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
XMLSchemaClassPathReference schemaRef = new XMLSchemaClassPathReference();
schemaRef.setSchemaContext("/myns:childType");
@@ -52,6 +52,7 @@
return namespaces;
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
@@ -133,6 +134,7 @@
return root;
}
+ @Override
public Object getJSONReadControlObject(){
//different order - mixed always last and same qnames grouped together, no namespaces
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionComplexChildrenTestCases.java
index d40b867..c54c006 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
//setWriteControlDoc("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/complex_children_write.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepAllAsElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepAllAsElementTestCases.java
index dbd8151..e0dfb23 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepAllAsElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepAllAsElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/keep_as_element.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementNS2TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementNS2TestCases.java
index 9679963..2c89615 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementNS2TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementNS2TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/keep_as_element_ns2.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
@@ -72,6 +73,7 @@
TestRunner.main(arguments);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
Object firstObject = ((Root)testObject).getAny().get(1);
@@ -85,6 +87,7 @@
}
+ @Override
public Document getWriteControlDocument() throws Exception
{
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementNSTestCases.java
index 4f70cef..0e58d74 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/keep_as_element_ns.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
@@ -70,6 +71,7 @@
TestRunner.main(arguments);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
Object firstObject = ((Root)testObject).getAny().get(1);
@@ -83,6 +85,7 @@
}
+ @Override
public Document getWriteControlDocument() throws Exception {
java.io.InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/keep_as_element_ns_write.xml");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementTestCases.java
index 5d35272..e2f027b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionKeepUnknownAsElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/keep_as_element.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionMixedChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionMixedChildrenTestCases.java
index 14057f6..8b6bdac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionMixedChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionMixedChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/mixed_children.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoChildrenTestCases.java
index a32d6b7..afeac32 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/no_children.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
return root;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoDefaultRootComplexChildrenTestCases.java
index d0c0bbb..a8e02bb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,10 +37,12 @@
expectsMarshalException = true;
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoDefaultRootWithGroupingElementProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoDefaultRootWithGroupingElementProject.java
index b192c56..84d1fdd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoDefaultRootWithGroupingElementProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNoDefaultRootWithGroupingElementProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
public class AnyCollectionNoDefaultRootWithGroupingElementProject
extends AnyCollectionWithGroupingElementProject {
+ @Override
public ClassDescriptor buildChildDescriptor() {
XMLDescriptor descriptor = new XMLDescriptor();
descriptor.setJavaClass(Child.class);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNonRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNonRootTestCases.java
index c066eef..8c4ce72 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNonRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionNonRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
Wrapper wrapper = new Wrapper();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionOnlyMappedWithoutGroupingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionOnlyMappedWithoutGroupingTestCases.java
index f7fcdb4..da4979d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionOnlyMappedWithoutGroupingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionOnlyMappedWithoutGroupingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,7 +44,7 @@
schemaRef.setType(XMLSchemaClassPathReference.COMPLEX_TYPE);
((XMLDescriptor)project.getDescriptor(Child.class)).setSchemaReference(schemaRef);
- ((XMLAnyCollectionMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyCollectionMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
setProject(project);
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/complex_children_mapped_only.xml");
@@ -52,6 +52,7 @@
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
@@ -95,6 +96,7 @@
return root;
}
+ @Override
public Document getWriteControlDocument() {
return writeControlDoc;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionSkipUnknownTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionSkipUnknownTestCases.java
index 2f30efc..ff8bc10 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionSkipUnknownTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionSkipUnknownTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,11 +28,12 @@
public AnyCollectionSkipUnknownTestCases(String name) throws Exception {
super(name);
Project project = new AnyCollectionWithGroupingElementProject();
- ((XMLAnyCollectionMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyCollectionMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
setProject(project);
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/skip_unknown_children.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
@@ -53,6 +54,7 @@
return root;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
String resource = "org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/skip_unknown_children_write.xml";
InputStream inputStream = ClassLoader.getSystemResourceAsStream(resource);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionTextChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionTextChildTestCases.java
index d11cd8d..f0ca767 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionTextChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionTextChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/text_children.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionWithoutGroupingWithXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionWithoutGroupingWithXMLRootTestCases.java
index 156f0c1..c0b9e64 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionWithoutGroupingWithXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/AnyCollectionWithoutGroupingWithXMLRootTestCases.java
@@ -31,7 +31,7 @@
super(name);
Project project = new AnyCollectionWithGroupingElementProject();
- ((XMLAnyCollectionMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyCollectionMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
XMLSchemaClassPathReference schemaRef = new XMLSchemaClassPathReference();
schemaRef.setSchemaContext("/childType");
@@ -45,6 +45,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anycollection/withoutgroupingelement/complex_children_xmlroot.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Vector any = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectComplexChildNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectComplexChildNSTestCases.java
index 86506cb..82f35af 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectComplexChildNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectComplexChildNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/complex_child_ns.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Child child = new Child();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectComplexChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectComplexChildTestCases.java
index a986071..2b0119c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectComplexChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectComplexChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/complex_child.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Child child = new Child();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoChildTestCases.java
index ab7f81b..a67aef6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/no_child.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoDefaultRootComplexChildrenTestCases.java
index cf1d3d2..9f70fc2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,10 +33,12 @@
expectsMarshalException = true;
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Child child = new Child();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoDefaultRootWithGroupingElementProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoDefaultRootWithGroupingElementProject.java
index 86b8a1c..a4f2bee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoDefaultRootWithGroupingElementProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectNoDefaultRootWithGroupingElementProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
this.addDescriptor(buildChildDescriptor());
}
+ @Override
public ClassDescriptor buildRootDescriptor() {
XMLDescriptor descriptor = new XMLDescriptor();
descriptor.setJavaClass(Root.class);
@@ -42,6 +43,7 @@
return descriptor;
}
+ @Override
public ClassDescriptor buildChildDescriptor() {
XMLDescriptor descriptor = new XMLDescriptor();
descriptor.setJavaClass(Child.class);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectTextChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectTextChildTestCases.java
index 82a0293..b82aa59 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectTextChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectTextChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/text_child.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
root.setAny("root's text");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootSimpleTestCases.java
index daee683..96720e9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootSimpleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,13 +26,14 @@
public AnyObjectWithGroupingWithXMLRootSimpleTestCases(String name) throws Exception {
super(name);
Project project = new AnyObjectWithGroupingElementProjectNS();
- ((XMLAnyObjectMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyObjectMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
setProject(project);
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/simple_ns_xmlroot.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootTestCases.java
index 5d1aba8..e1c8de4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,7 @@
public AnyObjectWithGroupingWithXMLRootTestCases(String name) throws Exception {
super(name);
Project project = new AnyObjectWithGroupingElementProjectNS();
- ((XMLAnyObjectMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyObjectMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
XMLSchemaClassPathReference schemaRef = new XMLSchemaClassPathReference();
schemaRef.setSchemaContext("/myns:childType");
@@ -37,6 +37,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/complex_child_ns_xmlroot.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootXSITypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootXSITypeTestCases.java
index e3ffc5b..8ae9dbd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootXSITypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectWithGroupingWithXMLRootXSITypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@
public AnyObjectWithGroupingWithXMLRootXSITypeTestCases(String name) throws Exception {
super(name);
Project project = new AnyObjectWithGroupingElementProjectNS();
- ((XMLAnyObjectMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyObjectMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
XMLSchemaClassPathReference schemaRef = new XMLSchemaClassPathReference();
schemaRef.setSchemaContext("/myns:childType");
@@ -38,6 +38,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/complex_child_ns_xmlroot_xsitype.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectXMLRootSimpleNonStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectXMLRootSimpleNonStringTestCases.java
index 2ad98b7..17334e0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectXMLRootSimpleNonStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/AnyObjectXMLRootSimpleNonStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@
public AnyObjectXMLRootSimpleNonStringTestCases(String name) throws Exception {
super(name);
Project project = new AnyObjectWithGroupingElementProjectNS();
- ((XMLAnyObjectMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyObjectMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
XMLSchemaClassPathReference schemaRef = new XMLSchemaClassPathReference();
schemaRef.setSchemaContext("/myns:childType");
@@ -38,6 +38,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyobject/withgroupingelement/simple_non_string_xmlroot.xml");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectComplexChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectComplexChildTestCases.java
index 9e243ac..d8646e8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectComplexChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectComplexChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/complex_child.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Child child = new Child();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectKeepAllAsElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectKeepAllAsElementTestCases.java
index 3a32609..35eb703 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectKeepAllAsElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectKeepAllAsElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/keep_all_as_element.json");
}
+ @Override
public Object getControlObject() {
RootKeepAsElement root = new RootKeepAsElement();
try {
@@ -53,6 +54,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
Child child = new Child();
child.setContent(TEXT);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectKeepUnknownAsElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectKeepUnknownAsElementTestCases.java
index 5b36599..2a10c3b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectKeepUnknownAsElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectKeepUnknownAsElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/keep_unknown_as_element.json");
}
+ @Override
public Object getControlObject() {
RootKeepAsElement root = new RootKeepAsElement();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoChildTestCases.java
index 4f3e956..2e8c408 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/no_child.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoDefaultRootComplexChildrenTestCases.java
index ebabaef..c024eed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,10 +39,12 @@
expectsMarshalException = true;
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
+ @Override
public Object getControlObject() {
Root root = new Root();
Child child = new Child();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoDefaultRootWithoutGroupingElementProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoDefaultRootWithoutGroupingElementProject.java
index d3f1406..3172b5f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoDefaultRootWithoutGroupingElementProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectNoDefaultRootWithoutGroupingElementProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
this.addDescriptor(buildChildDescriptor());
}
+ @Override
public ClassDescriptor buildRootDescriptor() {
XMLDescriptor descriptor = new XMLDescriptor();
descriptor.setJavaClass(Root.class);
@@ -46,6 +47,7 @@
return descriptor;
}
+ @Override
public ClassDescriptor buildChildDescriptor() {
XMLDescriptor descriptor = new XMLDescriptor();
descriptor.setJavaClass(Child.class);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectTextChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectTextChildTestCases.java
index 71940d8..6e80389 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectTextChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectTextChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/text_child.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
root.setAny("root's text");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectWithoutGroupingWithXMLRootSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectWithoutGroupingWithXMLRootSimpleTestCases.java
index d209897..5114d2c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectWithoutGroupingWithXMLRootSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectWithoutGroupingWithXMLRootSimpleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,12 +25,13 @@
public AnyObjectWithoutGroupingWithXMLRootSimpleTestCases(String name) throws Exception {
super(name);
Project project = new AnyObjectWithoutGroupingElementProject();
- ((XMLAnyObjectMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyObjectMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
setProject(project);
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/simple_xmlroot.xml");
setControlJSON("org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/simple_xmlroot.json");
}
+ @Override
public Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectWithoutGroupingWithXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectWithoutGroupingWithXMLRootTestCases.java
index 6a55aad..a2a19f1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectWithoutGroupingWithXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectWithoutGroupingWithXMLRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,7 @@
public AnyObjectWithoutGroupingWithXMLRootTestCases(String name) throws Exception {
super(name);
Project project = new AnyObjectWithoutGroupingElementProject();
- ((XMLAnyObjectMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyObjectMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
XMLSchemaClassPathReference schemaRef = new XMLSchemaClassPathReference();
schemaRef.setSchemaContext("/childType");
@@ -40,6 +40,7 @@
}
+ @Override
public Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectXMLRootSimpleNonStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectXMLRootSimpleNonStringTestCases.java
index a9e2015..c9fa019 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectXMLRootSimpleNonStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobject/withoutgroupingelement/AnyObjectXMLRootSimpleNonStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,7 @@
public AnyObjectXMLRootSimpleNonStringTestCases(String name) throws Exception {
super(name);
Project project = new AnyObjectWithoutGroupingElementProject();
- ((XMLAnyObjectMapping)((XMLDescriptor)project.getDescriptor(Root.class)).getMappingForAttributeName("any")).setUseXMLRoot(true);
+ ((XMLAnyObjectMapping) project.getDescriptor(Root.class).getMappingForAttributeName("any")).setUseXMLRoot(true);
XMLSchemaClassPathReference schemaRef = new XMLSchemaClassPathReference();
schemaRef.setSchemaContext("/childType");
@@ -50,6 +50,7 @@
return namespaces;
}
+ @Override
public Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC01NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC01NoDefaultRootComplexChildrenTestCases.java
index 2457e6a..9037afc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC01NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC01NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
/**
* This object is used in xml to object unmarshalling
*/
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -85,6 +86,7 @@
* Returns the object to be used in a comparison on a read
* This will typically be the same object used to write
*/
+ @Override
public Object getReadControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -107,48 +109,48 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
- ((XMLAnyObjectMapping)anyMapping1).setGetMethodName("getAnyObject");
- ((XMLAnyObjectMapping)anyMapping1).setSetMethodName("setAnyObject");
+ anyMapping1.setAttributeName("anyObject");
+ anyMapping1.setGetMethodName("getAnyObject");
+ anyMapping1.setSetMethodName("setAnyObject");
if (firstMappingXPathSet) {
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
- ((XMLAnyCollectionMapping)anyMapping1).setGetMethodName("getContactMethods");
- ((XMLAnyCollectionMapping)anyMapping1).setSetMethodName("setContactMethods");
+ anyMapping1.setAttributeName("contactMethods");
+ anyMapping1.setGetMethodName("getContactMethods");
+ anyMapping1.setSetMethodName("setContactMethods");
if (firstMappingXPathSet) {
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
- ((XMLAnyObjectMapping)anyMapping2).setGetMethodName("getAnyObject");
- ((XMLAnyObjectMapping)anyMapping2).setSetMethodName("setAnyObject");
+ anyMapping2.setAttributeName("anyObject");
+ anyMapping2.setGetMethodName("getAnyObject");
+ anyMapping2.setSetMethodName("setAnyObject");
if (secondMappingXPathSet) {
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
- ((XMLAnyCollectionMapping)anyMapping2).setGetMethodName("getContactMethods");
- ((XMLAnyCollectionMapping)anyMapping2).setSetMethodName("setContactMethods");
+ anyMapping2.setAttributeName("contactMethods");
+ anyMapping2.setGetMethodName("getContactMethods");
+ anyMapping2.setSetMethodName("setContactMethods");
if (secondMappingXPathSet) {
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC02NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC02NoDefaultRootComplexChildrenTestCases.java
index 5c369b4..0900682 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC02NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC02NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -81,6 +82,7 @@
* Returns the object to be used in a comparison on a read
* This will typically be the same object used to write
*/
+ @Override
public Object getReadControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -103,7 +105,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -111,10 +113,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -122,14 +124,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -137,10 +139,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -148,7 +150,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC03NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC03NoDefaultRootComplexChildrenTestCases.java
index 92d2f93..9c5d350 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC03NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC03NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -95,7 +96,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -103,10 +104,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -114,14 +115,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -129,10 +130,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -140,7 +141,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC04NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC04NoDefaultRootComplexChildrenTestCases.java
index c16c89e..cb3ca64 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC04NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC04NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -90,7 +91,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -98,10 +99,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -109,14 +110,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -124,10 +125,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -135,7 +136,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
@@ -187,14 +188,17 @@
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromURL() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC05NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC05NoDefaultRootComplexChildrenTestCases.java
index 68a1c2b..7d31af3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC05NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC05NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -92,7 +93,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -100,10 +101,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -111,14 +112,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -126,10 +127,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -137,7 +138,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
@@ -169,14 +170,17 @@
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromURL() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC06NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC06NoDefaultRootComplexChildrenTestCases.java
index e6bc3c0..7a4224d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC06NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC06NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -81,6 +82,7 @@
* Returns the object to be used in a comparison on a read
* This will typically be the same object used to write
*/
+ @Override
public Object getReadControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -103,7 +105,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -111,10 +113,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -122,14 +124,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -137,10 +139,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -148,7 +150,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC07NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC07NoDefaultRootComplexChildrenTestCases.java
index 03527ad..7a143d7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC07NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC07NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -91,7 +92,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -99,10 +100,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -110,14 +111,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -125,10 +126,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -136,7 +137,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
@@ -168,14 +169,17 @@
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromURL() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC08NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC08NoDefaultRootComplexChildrenTestCases.java
index b6bbfb8..d77a1d4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC08NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC08NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setControlDocument(XML_RESOURCE_PATH);
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -90,7 +91,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -98,10 +99,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -109,14 +110,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -124,10 +125,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -135,7 +136,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC09NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC09NoDefaultRootComplexChildrenTestCases.java
index 296f0f2..4aed8bb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC09NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC09NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setControlDocument(XML_RESOURCE_PATH);
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -80,6 +81,7 @@
* Returns the object to be used in a comparison on a read
* This will typically be the same object used to write
*/
+ @Override
public Object getReadControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -114,7 +116,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -122,10 +124,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -133,14 +135,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -148,10 +150,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -159,7 +161,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC10NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC10NoDefaultRootComplexChildrenTestCases.java
index 721ecd3..2e4aaea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC10NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC10NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -92,7 +93,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -100,10 +101,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -111,14 +112,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -126,10 +127,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -137,7 +138,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
@@ -169,14 +170,17 @@
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromURL() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC11NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC11NoDefaultRootComplexChildrenTestCases.java
index eabf685..cc4169a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC11NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC11NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -81,6 +82,7 @@
* Returns the object to be used in a comparison on a read
* This will typically be the same object used to write
*/
+ @Override
public Object getReadControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -117,7 +119,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -125,10 +127,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -136,14 +138,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -151,10 +153,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -162,7 +164,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC12NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC12NoDefaultRootComplexChildrenTestCases.java
index 4901e18..40439f4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC12NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC12NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -91,7 +92,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -99,10 +100,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -110,14 +111,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -125,10 +126,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -136,7 +137,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
@@ -168,14 +169,17 @@
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromURL() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC13NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC13NoDefaultRootComplexChildrenTestCases.java
index 77bfe6c..5a041b1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC13NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC13NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -91,7 +92,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -99,10 +100,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -110,14 +111,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -125,10 +126,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -136,7 +137,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
@@ -168,14 +169,17 @@
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromURL() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC14NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC14NoDefaultRootComplexChildrenTestCases.java
index cfb49ab..3e52c69 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC14NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC14NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -90,7 +91,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -98,10 +99,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -109,14 +110,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -124,10 +125,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -135,7 +136,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC15NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC15NoDefaultRootComplexChildrenTestCases.java
index a32c1b6..067847a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC15NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC15NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -90,7 +91,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -98,10 +99,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -109,14 +110,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -124,10 +125,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -135,7 +136,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
@@ -167,14 +168,17 @@
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testXMLToObjectFromURL() throws Exception {
}
// override superclass testcase since it is invalid here
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC16NoDefaultRootComplexChildrenTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC16NoDefaultRootComplexChildrenTestCases.java
index 2a813ec..f318c8e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC16NoDefaultRootComplexChildrenTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/anyobjectandanycollection/AnyObjectAndAnyCollectionUC16NoDefaultRootComplexChildrenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
+ @Override
public Object getControlObject() {
//<customer><contact-method><address>Ottawa</address><address>Montreal</address><phone>5551111</phone>joe@example.com<address>Ottawa</address><address>Montreal</address><phone>5551111</phone>joe@example.com</contact-method></customer>F
Customer customer = new Customer();
@@ -88,6 +89,7 @@
* Returns the object to be used in a comparison on a read
* This will typically be the same object used to write
*/
+ @Override
public Object getReadControlObject() {
Customer customer = new Customer();
Address anAddress1 = new Address();
@@ -127,7 +129,7 @@
// First Mapping
if (!firstMappingIsAnyCollection) {
anyMapping1 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping1).setAttributeName("anyObject");
+ anyMapping1.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping1).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping1).setSetMethodName("setAnyObject");
@@ -135,10 +137,10 @@
// set first mapping XPath
((XMLAnyObjectMapping)anyMapping1).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
} else {
anyMapping1 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping1).setAttributeName("contactMethods");
+ anyMapping1.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping1).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping1).setSetMethodName("setAnyCollection");
@@ -146,14 +148,14 @@
// set first mapping XPath
((XMLAnyCollectionMapping)anyMapping1).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping1);
+ descriptor.addMapping(anyMapping1);
}
// Second Mapping
DatabaseMapping anyMapping2 = null;
if (!secondMappingIsAnyCollection) {
anyMapping2 = new XMLAnyObjectMapping();
- ((XMLAnyObjectMapping)anyMapping2).setAttributeName("anyObject");
+ anyMapping2.setAttributeName("anyObject");
//((XMLAnyObjectMapping) anyMapping2).setGetMethodName("getAnyObject");
//((XMLAnyObjectMapping) anyMapping2).setSetMethodName("setAnyObject");
@@ -161,10 +163,10 @@
// set second mapping XPath
((XMLAnyObjectMapping)anyMapping2).setXPath(MAPPING_XPATH_OBJ);
}
- descriptor.addMapping((XMLAnyObjectMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
} else {
anyMapping2 = new XMLAnyCollectionMapping();
- ((XMLAnyCollectionMapping)anyMapping2).setAttributeName("contactMethods");
+ anyMapping2.setAttributeName("contactMethods");
//((XMLAnyCollectionMapping) anyMapping2).setGetMethodName("getAnyCollection");
//((XMLAnyCollectionMapping) anyMapping2).setSetMethodName("setAnyCollection");
@@ -172,7 +174,7 @@
// set second mapping XPath
((XMLAnyCollectionMapping)anyMapping2).setXPath(MAPPING_XPATH);
}
- descriptor.addMapping((XMLAnyCollectionMapping)anyMapping2);
+ descriptor.addMapping(anyMapping2);
}
return descriptor;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataAbsentElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataAbsentElementTestCases.java
index 6fe01bc..41a1d05 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataAbsentElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataAbsentElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(123);
emp.setPhoto(null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataCompositeSelfNillableTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataCompositeSelfNillableTestCases.java
index 123e820..ebff5b1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataCompositeSelfNillableTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataCompositeSelfNillableTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setProject(p);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller handler = new MyAttachmentUnmarshaller();
@@ -55,12 +56,14 @@
return marshaller;
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(123);
emp.setMyImage(null);
return emp;
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertNull(this.attachmentMarshaller.getLocalName());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataCompositeSelfTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataCompositeSelfTestCases.java
index e2c8977..0312ae9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataCompositeSelfTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataCompositeSelfTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(p);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller handler = new MyAttachmentUnmarshaller();
@@ -51,6 +52,7 @@
return marshaller;
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(123);
@@ -60,6 +62,7 @@
return emp;
}
+ @Override
public Object getReadControlObject() {
Employee emp = new Employee(123);
@@ -70,6 +73,7 @@
return emp;
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertNotNull(this.attachmentMarshaller.getLocalName());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataEmptyElementEmptyNodeFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataEmptyElementEmptyNodeFalseTestCases.java
index 8bdbc4b..4c9b02f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataEmptyElementEmptyNodeFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataEmptyElementEmptyNodeFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(123);
emp.setPhoto(new byte[0]);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataEmptyElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataEmptyElementTestCases.java
index 86e72e6..5febfa5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataEmptyElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataEmptyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(123);
emp.setPhoto(null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataInlineNillableTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataInlineNillableTestCases.java
index 69e88da..33aaf03 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataInlineNillableTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataInlineNillableTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(123);
emp.setPhoto(null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataInlineTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataInlineTestCases.java
index 436d5a5..87b165d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataInlineTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataInlineTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setProject(new BinaryDataInlineProject());
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(123);
emp.setPhoto(new byte[]{0,1,2,3});
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataSelfDataHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataSelfDataHandlerTestCases.java
index fa22eaf..a5bd311 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataSelfDataHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataSelfDataHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setProject(p);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller handler = new MyAttachmentUnmarshaller();
@@ -60,6 +61,7 @@
return marshaller;
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(123);
@@ -67,6 +69,7 @@
return emp;
}
+ @Override
public Object getReadControlObject() {
Employee emp = new Employee(123);
@@ -78,6 +81,7 @@
return emp;
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
super.objectToXMLDocumentTest(testDocument);
assertNotNull(this.attachmentMarshaller.getLocalName());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataSelfTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataSelfTestCases.java
index 06c7609..63a8325 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataSelfTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/BinaryDataSelfTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,12 +40,14 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee(123);
emp.setPhoto(new byte[] { 0, 1, 2, 3});
return emp;
}
+ @Override
public Object getReadControlObject() {
Employee emp = new Employee(123);
byte[] bytes = new byte[] { 0, 1, 2, 3};
@@ -58,6 +60,7 @@
return emp;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataByteObjectArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataByteObjectArrayTestCases.java
index 878f03c..274efca 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataByteObjectArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataByteObjectArrayTestCases.java
@@ -44,6 +44,7 @@
setProject(new BinaryDataByteObjectArrayProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
EmployeeWithByteObjectArray emp = EmployeeWithByteObjectArray.example1();
String s = "THISISATEXTSTRINGFORTHISDATAHANDLER";
@@ -58,12 +59,13 @@
return emp;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
attachmentUnmarshaller = new MyAttachmentUnmarshaller();
DataHandler data = new DataHandler("THISISATEXTSTRINGFORTHISDATAHANDLER", "text");
- attachmentUnmarshaller.attachments.put(attachmentUnmarshaller.ATTACHMENT_TEST_ID, data);
+ attachmentUnmarshaller.attachments.put(MyAttachmentUnmarshaller.ATTACHMENT_TEST_ID, data);
xmlUnmarshaller.setAttachmentUnmarshaller(attachmentUnmarshaller);
}
@@ -75,6 +77,7 @@
return marshaller;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameEmptyNSRNillableTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameEmptyNSRNillableTestCases.java
index 7c79f9b..5762b1b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameEmptyNSRNillableTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameEmptyNSRNillableTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,16 +66,18 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
return Employee.example1();
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller attachmentUnmarshaller = new MyAttachmentUnmarshaller();
byte[] bytes = MyAttachmentUnmarshaller.PHOTO_BASE64.getBytes();
- attachmentUnmarshaller.attachments.put(attachmentUnmarshaller.ATTACHMENT_TEST_ID, bytes);
+ attachmentUnmarshaller.attachments.put(MyAttachmentUnmarshaller.ATTACHMENT_TEST_ID, bytes);
xmlUnmarshaller.setAttachmentUnmarshaller(attachmentUnmarshaller);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameEmptyNSRTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameEmptyNSRTestCases.java
index 39dd8a3..8b74107 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameEmptyNSRTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameEmptyNSRTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,16 +60,18 @@
setProject(new BinaryDataIdentifiedByNameProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
return Employee.example1();
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller attachmentUnmarshaller = new MyAttachmentUnmarshaller();
byte[] bytes = MyAttachmentUnmarshaller.PHOTO_BASE64.getBytes();
- attachmentUnmarshaller.attachments.put(attachmentUnmarshaller.ATTACHMENT_TEST_ID, bytes);
+ attachmentUnmarshaller.attachments.put(MyAttachmentUnmarshaller.ATTACHMENT_TEST_ID, bytes);
xmlUnmarshaller.setAttachmentUnmarshaller(attachmentUnmarshaller);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameNullNSRTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameNullNSRTestCases.java
index fbc0a8e..6708e0f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameNullNSRTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameNullNSRTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,16 +66,18 @@
setProject(new BinaryDataIdentifiedByNameProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
return Employee.example1();
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller attachmentUnmarshaller = new MyAttachmentUnmarshaller();
byte[] bytes = MyAttachmentUnmarshaller.PHOTO_BASE64.getBytes();
- attachmentUnmarshaller.attachments.put(attachmentUnmarshaller.ATTACHMENT_TEST_ID, bytes);
+ attachmentUnmarshaller.attachments.put(MyAttachmentUnmarshaller.ATTACHMENT_TEST_ID, bytes);
xmlUnmarshaller.setAttachmentUnmarshaller(attachmentUnmarshaller);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameNullTestCases.java
index 4ce4512..5b4241d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,12 +34,14 @@
setProject(new BinaryDataIdentifiedByNameProject(null));
}
+ @Override
protected Object getControlObject() {
Employee emp = Employee.example1();
emp.setPhoto(null);
return emp;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
xmlMarshaller.setAttachmentMarshaller(new MyAttachmentMarshaller());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameXOPonNSRTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameXOPonNSRTestCases.java
index b53f8b9..5b59b43 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameXOPonNSRTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydata/identifiedbyname/BinaryDataIdentifiedByNameXOPonNSRTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -63,6 +63,7 @@
setProject(new BinaryDataIdentifiedByNameProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
Employee emp = Employee.example1();
String s = "THISISATEXTSTRINGFORTHISDATAHANDLER";
@@ -72,12 +73,13 @@
return emp;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
attachmentUnmarshaller = new MyAttachmentUnmarshaller();
DataHandler data = new DataHandler("THISISATEXTSTRINGFORTHISDATAHANDLER", "text");
- attachmentUnmarshaller.attachments.put(attachmentUnmarshaller.ATTACHMENT_TEST_ID, data);
+ attachmentUnmarshaller.attachments.put(MyAttachmentUnmarshaller.ATTACHMENT_TEST_ID, data);
xmlUnmarshaller.setAttachmentUnmarshaller(attachmentUnmarshaller);
}
@@ -89,6 +91,7 @@
return marshaller;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentMarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentMarshaller.java
index 2747dd0..8294673 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentMarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentMarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
public boolean returnNull = false;
private String localName = null;
+ @Override
public String addSwaRefAttachment(DataHandler data) {
if(returnNull) {
return null;
@@ -38,6 +39,7 @@
return id;
}
+ @Override
public String addSwaRefAttachment(byte[] data, int offset, int length) {
if(returnNull) {
return null;
@@ -47,6 +49,7 @@
return id;
}
+ @Override
public String addMtomAttachment(byte[] bytes, int start, int offset, String mimeType, String elementName, String namespaceURI) {
if(returnNull) {
return null;
@@ -58,6 +61,7 @@
return id;
}
+ @Override
public String addMtomAttachment(DataHandler data, String elementName, String namespaceURI) {
if(returnNull) {
return null;
@@ -69,6 +73,7 @@
return id;
}
+ @Override
public boolean isXOPPackage() {
return true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentMarshallerDataHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentMarshallerDataHandler.java
index 75c83af..808a872 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentMarshallerDataHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentMarshallerDataHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,6 +15,7 @@
package org.eclipse.persistence.testing.oxm.mappings.binarydatacollection;
public class MyAttachmentMarshallerDataHandler extends MyAttachmentMarshaller{
+ @Override
public String addSwaRefAttachment(byte[] data, int offset, int length) {
return null;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentUnmarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentUnmarshaller.java
index eb425e2..6916b4d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentUnmarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/MyAttachmentUnmarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
attachments = new HashMap();
}
+ @Override
public byte[] getAttachmentAsByteArray(String cid) {
Object obj = attachments.get(cid);
if(obj instanceof byte[]){
@@ -58,6 +59,7 @@
}
+ @Override
public DataHandler getAttachmentAsDataHandler(String cid) {
this.getAttachmentAsDataHandlerWasCalled = true;
Object obj = attachments.get(cid);
@@ -67,6 +69,7 @@
return null;
}
+ @Override
public boolean isXOPPackage() {
// force attachment usage
return true;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayProject.java
index 8d6a1cb..9a97467 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,18 +68,22 @@
public class MyConverter implements Converter{
+ @Override
public Object convertDataValueToObjectValue(Object dataValue, Session session) {
return dataValue;
}
+ @Override
public Object convertObjectValueToDataValue(Object objectValue, Session session) {
return objectValue;
}
+ @Override
public void initialize(DatabaseMapping mapping, Session session) {
}
+ @Override
public boolean isMutable() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayTestCases.java
index cea1185..b7b6117 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionByteObjectArrayTestCases.java
@@ -40,6 +40,7 @@
setProject(new BinaryDataCollectionByteObjectArrayProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
EmployeeWithByteArrayObject employee = null;
@@ -62,6 +63,7 @@
return employee;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentMarshaller marshaller = new MyAttachmentMarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionDataHandlerProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionDataHandlerProject.java
index 43033112..0b641a3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionDataHandlerProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionDataHandlerProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
super(namespaceResolver);
}
+ @Override
protected XMLDescriptor getEmployeeDescriptor(NamespaceResolver aNSResolver) {
XMLDescriptor descriptor = new XMLDescriptor();
descriptor.setJavaClass(EmployeeWithByteArrayObject.class);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionDataHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionDataHandlerTestCases.java
index 163df29..6ae7bb6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionDataHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionDataHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new BinaryDataCollectionDataHandlerProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
EmployeeWithByteArrayObject employee = new EmployeeWithByteArrayObject();
@@ -59,6 +60,7 @@
return employee;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller handler = new MyAttachmentUnmarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionForcedInlineBinaryTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionForcedInlineBinaryTestCases.java
index 90c6d5c..23fb5f4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionForcedInlineBinaryTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionForcedInlineBinaryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
setProject(new BinaryDataCollectionWithGroupingElementIdentifiedByNameProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
Employee employee = null;
@@ -78,6 +79,7 @@
return employee;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentMarshaller marshaller = new MyAttachmentMarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameEmptyNSRTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameEmptyNSRTestCases.java
index 5cc1454..28104b5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameEmptyNSRTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameEmptyNSRTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,10 +58,12 @@
setProject(new BinaryDataCollectionWithGroupingElementIdentifiedByNameProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
return Employee.example1();
}
+ @Override
public void setUp() throws Exception {
super.setUp();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameNullNSRTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameNullNSRTestCases.java
index f6c6bb8..f262aa7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameNullNSRTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameNullNSRTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,10 +51,12 @@
setProject(new BinaryDataCollectionWithGroupingElementIdentifiedByNameProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
return Employee.example1();
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller handler = new MyAttachmentUnmarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameXOPonNSRTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameXOPonNSRTestCases.java
index 2afc071..29aa188 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameXOPonNSRTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementIdentifiedByNameXOPonNSRTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
setProject(new BinaryDataCollectionWithGroupingElementIdentifiedByNameProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
Employee employee = null;
@@ -80,6 +81,7 @@
return employee;
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller handler = new MyAttachmentUnmarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementNillableEmptyNSRTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementNillableEmptyNSRTestCases.java
index a10884c..e42a748 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementNillableEmptyNSRTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/identifiedbyname/withgroupingelement/BinaryDataCollectionWithGroupingElementNillableEmptyNSRTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,6 +64,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Vector photos = new Vector();
photos.addElement(MyAttachmentUnmarshaller.PHOTO_BASE64.getBytes());
@@ -72,6 +73,7 @@
return new Employee(123, photos);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/reuse/BinaryDataCollectionReuseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/reuse/BinaryDataCollectionReuseTestCases.java
index 79de679..126880f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/reuse/BinaryDataCollectionReuseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/binarydatacollection/reuse/BinaryDataCollectionReuseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,10 +42,12 @@
setProject(new BinaryDataCollectionReuseProject(namespaceResolver));
}
+ @Override
protected Object getControlObject() {
return Employee.example1();
}
+ @Override
public void setUp() throws Exception {
super.setUp();
MyAttachmentUnmarshaller handler = new MyAttachmentUnmarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingComplexValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingComplexValueTestCases.java
index cfcbb3d..c2cbc94 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingComplexValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingComplexValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -45,6 +46,7 @@
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project project = super.getNewProject(originalProject, classLoader);
// project.getDatasourceLogin().setPlatform(new SAXPlatform());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingNonStringValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingNonStringValueTestCases.java
index f1b096c..da9f706 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingNonStringValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingNonStringValueTestCases.java
@@ -30,6 +30,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -42,6 +43,7 @@
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project project = super.getNewProject(originalProject, classLoader);
//project.getDatasourceLogin().setPlatform(new SAXPlatform());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingSimpleValueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingSimpleValueTestCases.java
index 9efd050..c0fb908 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingSimpleValueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/XMLChoiceMappingSimpleValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -42,6 +43,7 @@
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project project = super.getNewProject(originalProject, classLoader);
//project.getDatasourceLogin().setPlatform(new SAXPlatform());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/converter/ConverterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/converter/ConverterTestCases.java
index 88700ba..703a4b6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/converter/ConverterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/converter/ConverterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -49,6 +50,7 @@
return employee;
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project project = new EmployeeProject();
project.setDatasourceLogin(new XMLLogin());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/converter/WrapperConverter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/converter/WrapperConverter.java
index 1cc3120..d00e57a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/converter/WrapperConverter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/converter/WrapperConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,20 +20,24 @@
public class WrapperConverter implements Converter {
+ @Override
public void initialize(DatabaseMapping mapping, Session session) {
}
+ @Override
public Object convertDataValueToObjectValue(Object dataValue, Session session) {
Wrapper wrapper = new Wrapper();
wrapper.setValue(dataValue);
return wrapper;
}
+ @Override
public Object convertObjectValueToDataValue(Object objectValue, Session session) {
Wrapper wrapper = (Wrapper) objectValue;
return wrapper.getValue();
}
+ @Override
public boolean isMutable() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/ref/XMLChoiceWithReferenceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/ref/XMLChoiceWithReferenceTestCases.java
index 607b3dd..c42a4f8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/ref/XMLChoiceWithReferenceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choice/ref/XMLChoiceWithReferenceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new XMLChoiceWithReferenceProject());
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.employees = new ArrayList<Employee>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingEmptyTestCases.java
index fe808c9..49ec1c6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -42,6 +43,7 @@
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project project = super.getNewProject(originalProject, classLoader);
//project.getDatasourceLogin().setPlatform(new SAXPlatform());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingMixedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingMixedTestCases.java
index 51be6fb..d0c9437 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingMixedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionMappingMixedTestCases.java
@@ -39,6 +39,7 @@
}
+ @Override
public Object getReadControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -59,6 +60,7 @@
return employee;
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -82,6 +84,7 @@
return employee;
}
+ @Override
public Object getJSONReadControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -103,6 +106,7 @@
return employee;
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project project = super.getNewProject(originalProject, classLoader);
//project.getDatasourceLogin().setPlatform(new SAXPlatform());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionWithGroupingElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionWithGroupingElementTestCases.java
index 2efc5ef..6801660 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionWithGroupingElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/XMLChoiceCollectionWithGroupingElementTestCases.java
@@ -37,6 +37,7 @@
setProject(new EmployeeWithGroupingElementProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -56,6 +57,7 @@
}
+ @Override
public Object getJSONReadControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -74,6 +76,7 @@
return employee;
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project project = super.getNewProject(originalProject, classLoader);
//project.getDatasourceLogin().setPlatform(new SAXPlatform());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/converter/ConverterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/converter/ConverterTestCases.java
index 47e7ec8..c3c5021 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/converter/ConverterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/converter/ConverterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -50,6 +51,7 @@
return employee;
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project project = super.getNewProject(originalProject, classLoader);
//project.setDatasourceLogin(new XMLLogin());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/converter/WrapperConverter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/converter/WrapperConverter.java
index fef299a..741e8fc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/converter/WrapperConverter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/converter/WrapperConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,20 +20,24 @@
public class WrapperConverter implements Converter {
+ @Override
public void initialize(DatabaseMapping mapping, Session session) {
}
+ @Override
public Object convertDataValueToObjectValue(Object dataValue, Session session) {
Wrapper wrapper = new Wrapper();
wrapper.setValue(dataValue);
return wrapper;
}
+ @Override
public Object convertObjectValueToDataValue(Object objectValue, Session session) {
Wrapper wrapper = (Wrapper) objectValue;
return wrapper.getValue();
}
+ @Override
public boolean isMutable() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithInvalidRefTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithInvalidRefTestCases.java
index 0c7e5a6..8c28278 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithInvalidRefTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithInvalidRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setProject(new XMLChoiceWithReferenceProject());
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.employees = new ArrayList<Employee>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithReferenceOrderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithReferenceOrderTestCases.java
index 2005259..b6ea0d5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithReferenceOrderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithReferenceOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new XMLChoiceWithReferenceProject());
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.employees = new ArrayList<Employee>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithReferenceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithReferenceTestCases.java
index 6ffc537..e798a5f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithReferenceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/ref/XMLChoiceWithReferenceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new XMLChoiceWithReferenceProject());
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.employees = new ArrayList<Employee>();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/reuse/ChoiceCollectionReuseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/reuse/ChoiceCollectionReuseTestCases.java
index a8feddd..35946d1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/reuse/ChoiceCollectionReuseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/choicecollection/reuse/ChoiceCollectionReuseTestCases.java
@@ -32,6 +32,7 @@
setProject(new EmployeeProject());
}
+ @Override
public Object getReadControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -52,6 +53,7 @@
return employee;
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.name = "Jane Doe";
@@ -75,6 +77,7 @@
return employee;
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project project = super.getNewProject(originalProject, classLoader);
project.getDatasourceLogin().setPlatform(new SAXPlatform());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/collectionreference/reuse/CollectionReferenceReuseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/collectionreference/reuse/CollectionReferenceReuseTestCases.java
index 2a4116d..894146f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/collectionreference/reuse/CollectionReferenceReuseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/collectionreference/reuse/CollectionReferenceReuseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/errortests/CompositeCollectionErrorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/errortests/CompositeCollectionErrorTestCases.java
index 1042e5a..f9fe045 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/errortests/CompositeCollectionErrorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/errortests/CompositeCollectionErrorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import java.util.Vector;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.eclipse.persistence.exceptions.DescriptorException;
import org.eclipse.persistence.exceptions.IntegrityException;
@@ -40,15 +42,15 @@
for (int i = 0; i < caughtExceptions.size(); i++) {
Exception nextException = (Exception)caughtExceptions.elementAt(i);
if (nextException instanceof DescriptorException) {
- this.assertTrue("An incorrect Descriptor exception occurred.", ((DescriptorException)nextException).getErrorCode() == DescriptorException.FIELD_NAME_NOT_SET_IN_MAPPING);
+ assertTrue("An incorrect Descriptor exception occurred.", ((DescriptorException)nextException).getErrorCode() == DescriptorException.FIELD_NAME_NOT_SET_IN_MAPPING);
foundException = true;
}
}
- this.assertTrue("The appropriate Descriptor exception was not encountered", foundException);
+ assertTrue("The appropriate Descriptor exception was not encountered", foundException);
return;
} catch (XMLMarshalException marshalException) {
- this.assertTrue("An unexcepted XMLMarshalException occurred", !(metadata == Metadata.JAVA));
+ assertTrue("An unexcepted XMLMarshalException occurred", !(metadata == Metadata.JAVA));
return;
} catch (Exception e) {
fail("An unexcepted exception occurred");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionEmptyCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionEmptyCollectionTestCases.java
index 71b2b4a..754e5b3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionEmptyCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionEmptyCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setProject(new CompositeCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionNullElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionNullElementTestCases.java
index 0124122..c57d101 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionNullElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionNullElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setProject(new CompositeCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionSingleElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionSingleElementTestCases.java
index 3679bd5..a71800a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionSingleElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionSingleElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setProject(new CompositeCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByNameTestCases.java
index 023d994..ed92362 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setProject(new CompositeCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionEmptyCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionEmptyCollectionTestCases.java
index 2337f78..ed2dbda 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionEmptyCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionEmptyCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(new CompositeCollectionWithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
@@ -55,10 +56,12 @@
return employee;
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
//do nothing
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
//do nothing
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionNullElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionNullElementTestCases.java
index 13747e3..b606159 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionNullElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionNullElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setProject(new CompositeCollectionWithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
@@ -62,6 +63,7 @@
* A null collection will always be read in as empty
* Don't initialize this collection to null.
*/
+ @Override
public Object getReadControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionSingleElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionSingleElementTestCases.java
index 9ab8bf5..88ef746 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionSingleElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionSingleElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setProject(new CompositeCollectionWithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByNameTestCases.java
index bcd8369..6ea832f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setProject(new CompositeCollectionWithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingByNamespaceNoRefClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingByNamespaceNoRefClassTestCases.java
index 2aa194a..3f41faa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingByNamespaceNoRefClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingByNamespaceNoRefClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,13 +57,14 @@
QName qname = new QName("www.example.com/some-dir/mailing.xsd", "addressType");
- ((XMLField)((XMLCompositeCollectionMapping)p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddresses")).getField()).setLeafElementType(qname);
+ ((XMLField) p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddresses").getField()).setLeafElementType(qname);
((XMLDescriptor)p.getDescriptor(Employee.class)).getNonNullNamespaceResolver().put("xsi", javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI);
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByNamespaceTestCases.java
index 85c0952..7cebaf3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setProject(new CompositeCollectionWithGroupingElementIdentifiedByNamespaceProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingTextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingTextTestCases.java
index 8de3307..f36bc40 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingTextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withgroupingelement/CompositeCollectionWithGroupingTextTestCases.java
@@ -45,12 +45,13 @@
((XMLCompositeCollectionMapping)p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddresses")).setReferenceClass(null);
((XMLCompositeCollectionMapping)p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddresses")).setReferenceClassName(null);
- ((XMLField)((XMLCompositeCollectionMapping)p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddresses")).getField()).setIsTypedTextField(true);
+ ((XMLField) p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddresses").getField()).setIsTypedTextField(true);
((XMLDescriptor)p.getDescriptor(Employee.class)).getNonNullNamespaceResolver().put("xsi", javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI);
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByNamespaceTestCases.java
index 0450731..fdc32ca 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbynamespace/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setProject(new CompositeCollectionWithoutGroupingElementIdentifiedByNamespaceProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyposition/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByPositionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyposition/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByPositionTestCases.java
index e7b50e8..767c627 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyposition/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByPositionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyposition/withgroupingelement/CompositeCollectionWithGroupingElementIdentifiedByPositionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
setProject(new CompositeCollectionWithGroupingElementIdentifiedByPositionProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyposition/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByPositionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyposition/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByPositionTestCases.java
index 4c21f28..2c500ac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyposition/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByPositionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyposition/withoutgroupingelement/CompositeCollectionWithoutGroupingElementIdentifiedByPositionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new CompositeCollectionWithoutGroupingElementIdentifiedByPositionProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/keepaselement/CompositeCollectionKeepUnknownAsElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/keepaselement/CompositeCollectionKeepUnknownAsElementTestCases.java
index 6589401..837fad5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/keepaselement/CompositeCollectionKeepUnknownAsElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/keepaselement/CompositeCollectionKeepUnknownAsElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/compositecollection/keepaselement/keepaselement.xml");
}
+ @Override
public Object getControlObject() {
Doc myDoc = new Doc();
Elem myElem = new Elem();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/map/CompositeCollectionMapNullChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/map/CompositeCollectionMapNullChildTestCases.java
index e91f2a2..f5128ce 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/map/CompositeCollectionMapNullChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/map/CompositeCollectionMapNullChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new CompositeCollectionMapProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
@@ -53,6 +54,7 @@
return employee;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream(XML_WRITE_RESOURCE);
Document writeControlDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/map/CompositeCollectionMapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/map/CompositeCollectionMapTestCases.java
index c148671..ed5cc0b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/map/CompositeCollectionMapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/map/CompositeCollectionMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(new CompositeCollectionMapProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/mappingxpathcollision/MappingXpathCollisionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/mappingxpathcollision/MappingXpathCollisionTestCases.java
index 1c220b5..329197a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/mappingxpathcollision/MappingXpathCollisionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/mappingxpathcollision/MappingXpathCollisionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new MappingXpathCollisionProject());
}
+ @Override
protected Object getControlObject() {
EmployeeWithUserID employee = new EmployeeWithUserID();
employee.setUserID("empUserID");
@@ -41,6 +42,7 @@
junit.textui.TestRunner.main(arguments);
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/mappings/compositecollection/identifiedbyname/EmployeeWithUserIDWrite.xml");
Document doc = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nested/CompositeCollectionNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nested/CompositeCollectionNestedTestCases.java
index 698ce1d..9005091 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nested/CompositeCollectionNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nested/CompositeCollectionNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
setProject(new CompositeCollectionNestedProject());
}
+ @Override
protected Object getControlObject() {
Project project = new Project();
project.setName(CONTROL_PROJECT_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionAbsentNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionAbsentNodeTestCases.java
index 6157f7c..369d81e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionAbsentNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionAbsentNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
return Metadata.JAVA;
}
+ @Override
public Object getWriteControlObject() {
Employee anEmployee = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionIsSetNodeNullPolicyTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionIsSetNodeNullPolicyTrueTestCases.java
index 5b2dcc5..1dc0116 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionIsSetNodeNullPolicyTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionIsSetNodeNullPolicyTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionNillableNodeNullPolicyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionNillableNodeNullPolicyTestCases.java
index c2fc830..8ec0a31 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionNillableNodeNullPolicyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionNillableNodeNullPolicyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionOptionalNodeNullPolicyElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionOptionalNodeNullPolicyElementTestCases.java
index 5f5c205..800e66d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionOptionalNodeNullPolicyElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/nillable/CompositeCollectionOptionalNodeNullPolicyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/reuse/CompositeCollectionReuseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/reuse/CompositeCollectionReuseTestCases.java
index f5e3cbd..69ec3b6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/reuse/CompositeCollectionReuseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/reuse/CompositeCollectionReuseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/compositecollection/reuse/reuse.xml");
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
emp.setID(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/setmethod/SetMethodTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/setmethod/SetMethodTestCases.java
index e131776..832441f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/setmethod/SetMethodTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositecollection/setmethod/SetMethodTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.oxm.mappings.compositecollection.setmethod;
+import junit.framework.TestCase;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;
public class SetMethodTestCases extends XMLMappingTestCases {
@@ -27,6 +28,7 @@
setProject(new CustomerProject());
}
+ @Override
protected Object getControlObject() {
Customer customer = new Customer();
@@ -41,9 +43,10 @@
return customer;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
Customer testCustomer = (Customer)testObject;
- this.assertEquals(2, testCustomer.getCollectionSizeWhenSetPhoneNumbersWasCalled());
+ assertEquals(2, testCustomer.getCollectionSizeWhenSetPhoneNumbersWasCalled());
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/CompositeObjectMappingTestSuite.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/CompositeObjectMappingTestSuite.java
index 9c8ded3..e6affc8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/CompositeObjectMappingTestSuite.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/CompositeObjectMappingTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -150,6 +150,7 @@
junit.textui.TestRunner.main(arguments);
}
+ @Override
public String getName() {
String nameSoFar = super.getName();
return nameSoFar + Boolean.getBoolean("useDeploymentXML");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/errortests/CompositeObjectErrorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/errortests/CompositeObjectErrorTestCases.java
index 477688a..0aae74c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/errortests/CompositeObjectErrorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/errortests/CompositeObjectErrorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import java.util.Vector;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.eclipse.persistence.exceptions.DescriptorException;
import org.eclipse.persistence.exceptions.IntegrityException;
@@ -40,15 +42,15 @@
for (int i = 0; i < caughtExceptions.size(); i++) {
Exception nextException = (Exception)caughtExceptions.elementAt(i);
if (nextException instanceof DescriptorException) {
- this.assertTrue("An incorrect Descriptor exception occurred.", ((DescriptorException)nextException).getErrorCode() == DescriptorException.FIELD_NAME_NOT_SET_IN_MAPPING);
+ assertTrue("An incorrect Descriptor exception occurred.", ((DescriptorException)nextException).getErrorCode() == DescriptorException.FIELD_NAME_NOT_SET_IN_MAPPING);
foundException = true;
}
}
- this.assertTrue("The appropriate Descriptor exception was not encountered", foundException);
+ assertTrue("The appropriate Descriptor exception was not encountered", foundException);
return;
} catch (XMLMarshalException marshalException) {
- this.assertTrue("An unexcepted XMLMarshalException occurred", !(metadata == Metadata.JAVA));
+ assertTrue("An unexcepted XMLMarshalException occurred", !(metadata == Metadata.JAVA));
return;
} catch (Exception e) {
fail("An unexcepted exception occurred");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameNoRefClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameNoRefClassTestCases.java
index 9842cd6..c268bac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameNoRefClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameNoRefClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,11 +50,12 @@
QName qname = new QName("", "mailingAddressType");//set this to schemaContext
- ((XMLField)((XMLCompositeObjectMapping)p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddress")).getField()).setLeafElementType(qname);
+ ((XMLField) p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddress").getField()).setLeafElementType(qname);
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameTestCases.java
index b296e67..23903e6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setProject(new CompositeObjectIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameTextChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameTextChildTestCases.java
index 899e8e6..aac91cc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameTextChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyname/CompositeObjectIdentifiedByNameTextChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new CompositeObjectIdentifiedByNameTextProject());
}
+ @Override
protected Object getControlObject() {
EmployeeWithObjects employee = new EmployeeWithObjects();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbynamespace/CompositeObjectIdentifiedByNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbynamespace/CompositeObjectIdentifiedByNamespaceTestCases.java
index 6c8a30a..d217a96 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbynamespace/CompositeObjectIdentifiedByNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbynamespace/CompositeObjectIdentifiedByNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(new CompositeObjectIdentifiedByNamespaceProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbynamespace/CompositeObjectNoReferenceClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbynamespace/CompositeObjectNoReferenceClassTestCases.java
index c970989..8a9e007 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbynamespace/CompositeObjectNoReferenceClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbynamespace/CompositeObjectNoReferenceClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,10 +49,11 @@
QName qname = new QName("www.example.com/some-dir/mailing.xsd", "addressType");
- ((XMLField)((XMLCompositeObjectMapping)p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddress")).getField()).setLeafElementType(qname);
+ ((XMLField) p.getDescriptor(Employee.class).getMappingForAttributeName("mailingAddress").getField()).setLeafElementType(qname);
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyposition/CompositeObjectIdentifiedByPositionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyposition/CompositeObjectIdentifiedByPositionTestCases.java
index 6a4f669..a249df0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyposition/CompositeObjectIdentifiedByPositionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/identifiedbyposition/CompositeObjectIdentifiedByPositionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(new CompositeObjectIdentifiedByPositionProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/keepaselement/CompositeObjectKeepUnknownAsElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/keepaselement/CompositeObjectKeepUnknownAsElementTestCases.java
index efb11c6..db482b9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/keepaselement/CompositeObjectKeepUnknownAsElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/keepaselement/CompositeObjectKeepUnknownAsElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/compositeobject/keepaselement/particlesA002.xml");
}
+ @Override
public Object getControlObject() {
Doc myDoc = new Doc();
Elem myElem = new Elem();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nested/CompositeObjectNestedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nested/CompositeObjectNestedTestCases.java
index 168ad65..78b561a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nested/CompositeObjectNestedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nested/CompositeObjectNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(new CompositeObjectNestedProject());
}
+ @Override
protected Object getControlObject() {
Project project = new Project();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNodeNullPolicyFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNodeNullPolicyFalseTestCases.java
index 3b73585..49c1405 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNodeNullPolicyFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNodeNullPolicyFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNodeNullPolicyTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNodeNullPolicyTrueTestCases.java
index 78c64af..3086d01 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNodeNullPolicyTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNodeNullPolicyTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentFalseIsSetFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentFalseIsSetFalseTestCases.java
index 1571336..03742f2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentFalseIsSetFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentFalseIsSetFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setProject(aProject);
}
+ @Override
public Object getWriteControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
@@ -65,6 +66,7 @@
return aTeam;
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentFalseIsSetTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentFalseIsSetTrueTestCases.java
index 2616d9b..07a6a14 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentFalseIsSetTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentFalseIsSetTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
}
// Override round trip for o->x marshal
+ @Override
public Object getWriteControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
@@ -62,6 +63,7 @@
return aTeam;
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentTrueTestCases.java
index 847097f..092a1ea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicyAbsentIsSetAbsentTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyFalseIsSetFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyFalseIsSetFalseTestCases.java
index 0a92b8c..2d4da8d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyFalseIsSetFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyFalseIsSetFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
// Override round trip for x->o unmarshal
+ @Override
public Object getReadControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
@@ -66,6 +67,7 @@
return aTeam;
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyFalseIsSetTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyFalseIsSetTrueTestCases.java
index bd51cdc..e67d710 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyFalseIsSetTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyFalseIsSetTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
}
// Override round trip for x->o unmarshal
+ @Override
public Object getReadControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
@@ -66,6 +67,7 @@
return aTeam;
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyTrueIsSetFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyTrueIsSetFalseTestCases.java
index 73fd4d1..017e4fc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyTrueIsSetFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyTrueIsSetFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,11 +67,13 @@
}
// Marshal
+ @Override
protected Document getWriteControlDocument() throws Exception {
return writeControlDocument;
}
// Override unmarshal
+ @Override
public Object getReadControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
@@ -81,6 +83,7 @@
}
// Marshal
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyTrueIsSetTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyTrueIsSetTrueTestCases.java
index 17a42b1..b6bb005 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyTrueIsSetTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetEmptyTrueIsSetTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNillableIsSetFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNillableIsSetFalseTestCases.java
index 09de2b8..66eceea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNillableIsSetFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNillableIsSetFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNillableIsSetTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNillableIsSetTrueTestCases.java
index 8b999a4..083fc98 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNillableIsSetTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNillableIsSetTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNonNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNonNullTestCases.java
index 11db0f7..8772aec 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNonNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNonNullTextNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNonNullTextNodeTestCases.java
index 9e7d62d..d99bb9e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNonNullTextNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectIsSetNullPolicySetNonNullTextNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,6 +60,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team2 aTeam = new Team2();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNillableNodeNullPolicyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNillableNodeNullPolicyTestCases.java
index dba25e7..88ddc15 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNillableNodeNullPolicyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNillableNodeNullPolicyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicyAbsentIsSetAbsentFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicyAbsentIsSetAbsentFalseTestCases.java
index 5fde768..4299b10 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicyAbsentIsSetAbsentFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicyAbsentIsSetAbsentFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicyAbsentIsSetAbsentTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicyAbsentIsSetAbsentTrueTestCases.java
index a974a1f..41e046b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicyAbsentIsSetAbsentTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicyAbsentIsSetAbsentTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyFalseIsSetFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyFalseIsSetFalseTestCases.java
index ce93124..76b00fd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyFalseIsSetFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyFalseIsSetFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,6 +71,7 @@
}
// Override round trip for x->o unmarshal
+ @Override
public Object getReadControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
@@ -80,6 +81,7 @@
return aTeam;
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyFalseIsSetTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyFalseIsSetTrueTestCases.java
index 118aa71..0f82430 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyFalseIsSetTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyFalseIsSetTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
}
// Override round trip for x->o unmarshal
+ @Override
public Object getReadControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
@@ -66,6 +67,7 @@
return aTeam;
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyTrueIsSetFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyTrueIsSetFalseTestCases.java
index f749af3..51dce82 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyTrueIsSetFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyTrueIsSetFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyTrueIsSetTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyTrueIsSetTrueTestCases.java
index 676c558..06290d6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyTrueIsSetTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetEmptyTrueIsSetTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetNonNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetNonNullTestCases.java
index ba562fa..39a713f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetNonNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectNullPolicySetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectOptionalNodeNullPolicyElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectOptionalNodeNullPolicyElementTestCases.java
index 1e51fe8..e142739 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectOptionalNodeNullPolicyElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nillable/CompositeObjectOptionalNodeNullPolicyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Team aTeam = new Team();
aTeam.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectEmptyObjectTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectEmptyObjectTests.java
index da58acc..729796f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectEmptyObjectTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectEmptyObjectTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(new CompositeObjectNullTestsProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectNullElementsTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectNullElementsTests.java
index 2f1556a..1146393 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectNullElementsTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectNullElementsTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setProject(new CompositeObjectNullTestsProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectNullObjectTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectNullObjectTests.java
index 976fbc6..64e1ace 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectNullObjectTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/nulltests/CompositeObjectNullObjectTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(new CompositeObjectNullTestsProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeListOnTargetTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeListOnTargetTestCases.java
index dbbc0b0..dbb235c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeListOnTargetTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeListOnTargetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new AttributeListOnTargetTestProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeListOnTargetTestProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeListOnTargetTestProject.java
index 10990b3..96bb58c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeListOnTargetTestProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeListOnTargetTestProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
super();
}
+ @Override
public XMLDescriptor getAddressDescriptor() {
XMLDescriptor xmlDescriptor = super.getAddressDescriptor();
XMLCompositeDirectCollectionMapping collectionMapping = new XMLCompositeDirectCollectionMapping();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeOnTargetTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeOnTargetTestCases.java
index 7f9592d..ffbc0ad 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeOnTargetTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributeOnTargetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setProject(new AttributeOnTargetProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributesOnTargetTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributesOnTargetTestCases.java
index 8227e31..5b2a8d6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributesOnTargetTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/AttributesOnTargetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new AttributesOnTargetProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = 1;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/CompositeObjectSelfTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/CompositeObjectSelfTestCases.java
index f432592..9312bfc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/CompositeObjectSelfTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/CompositeObjectSelfTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Calendar start = Calendar.getInstance();
start.clear();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/CompositeObjectTwoSelfMappingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/CompositeObjectTwoSelfMappingsTestCases.java
index cc03473..8e89fdf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/CompositeObjectTwoSelfMappingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/CompositeObjectTwoSelfMappingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(new TwoSelfMappingsProject());
}
+ @Override
protected Object getControlObject() {
Calendar start = Calendar.getInstance();
start.clear();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/SelfWithOtherCompositeProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/SelfWithOtherCompositeProject.java
index e93e07b..50125e3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/SelfWithOtherCompositeProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/SelfWithOtherCompositeProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
addDescriptor(getAddressDescriptor());
}
+ @Override
protected XMLDescriptor getEmployeeDescriptor() {
XMLDescriptor descriptor = super.getEmployeeDescriptor();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/SelfWithOtherCompositeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/SelfWithOtherCompositeTestCases.java
index 4f009b2..414ff70 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/SelfWithOtherCompositeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/SelfWithOtherCompositeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(new SelfWithOtherCompositeProject());
}
+ @Override
protected Object getControlObject() {
Calendar start = Calendar.getInstance();
start.clear();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/TwoSelfMappingsProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/TwoSelfMappingsProject.java
index 23e4544..b2118dc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/TwoSelfMappingsProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/TwoSelfMappingsProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
addDescriptor(getAddressDescriptor());
}
+ @Override
protected XMLDescriptor getEmployeeDescriptor() {
XMLDescriptor descriptor = super.getEmployeeDescriptor();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/CompositeObjectSelfConverterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/CompositeObjectSelfConverterTestCases.java
index 77ee817..fe9f094 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/CompositeObjectSelfConverterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/CompositeObjectSelfConverterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
setProject(new MyProject());
}
+ @Override
protected Object getControlObject() {
MyObject myObj = new MyObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/CompositeObjectSelfConverterTestSuite.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/CompositeObjectSelfConverterTestSuite.java
index 184c2b2..3539820 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/CompositeObjectSelfConverterTestSuite.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/CompositeObjectSelfConverterTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
junit.textui.TestRunner.main(arguments);
}
+ @Override
public String getName() {
String nameSoFar = super.getName();
return nameSoFar + Boolean.getBoolean("useDeploymentXML");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/ValueConverter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/ValueConverter.java
index 54fe829..3fd255a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/ValueConverter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/converter/ValueConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,9 +20,11 @@
public class ValueConverter implements Converter {
+ @Override
public void initialize(DatabaseMapping mapping, Session session) {
}
+ @Override
public Object convertObjectValueToDataValue(Object objectValue, Session session) {
String[] stringArray = (String[]) objectValue;
IntermediateValue intermediateValue = new IntermediateValue();
@@ -33,6 +35,7 @@
return intermediateValue;
}
+ @Override
public Object convertDataValueToObjectValue(Object dataValue, Session session) {
IntermediateValue intermediateValue = (IntermediateValue) dataValue;
String[] stringArray = new String[intermediateValue.getPartB().size() + 1];
@@ -43,6 +46,7 @@
return stringArray;
}
+ @Override
public boolean isMutable() {
return true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/defaultnamespace/SelfMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/defaultnamespace/SelfMappingTestCases.java
index 47b67f4..8b1aa36 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/defaultnamespace/SelfMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/defaultnamespace/SelfMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(new SelfMappingTestProject());
}
+ @Override
protected Object getControlObject() {
AddressLines lines = new AddressLines();
lines.addressLine1 = "101 Main Street";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/CompositeObjectSelfComplexXsiTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/CompositeObjectSelfComplexXsiTypeTestCases.java
index 3aa620d..c19bed5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/CompositeObjectSelfComplexXsiTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/CompositeObjectSelfComplexXsiTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(p);
}
+ @Override
public Object getControlObject() {
Root theRoot = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/CompositeObjectSelfSimpleXsiTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/CompositeObjectSelfSimpleXsiTypeTestCases.java
index 98231f3..1651691 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/CompositeObjectSelfSimpleXsiTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/CompositeObjectSelfSimpleXsiTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Root theRoot = new Root();
theRoot.setTheObject(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/SelfNoRefClassKeepAsElementNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/SelfNoRefClassKeepAsElementNSTestCases.java
index cc240fb..8c173ec 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/SelfNoRefClassKeepAsElementNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/SelfNoRefClassKeepAsElementNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Root theRoot = new Root();
try{
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/SelfNoRefClassKeepAsElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/SelfNoRefClassKeepAsElementTestCases.java
index 38386c2..1e29e97 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/SelfNoRefClassKeepAsElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/norefclass/SelfNoRefClassKeepAsElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Root theRoot = new Root();
try{
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/ComplexPLSQLTypeWrapper.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/ComplexPLSQLTypeWrapper.java
index 02d157c..2544e4f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/ComplexPLSQLTypeWrapper.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/ComplexPLSQLTypeWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
super(wrappedType);
}
+ @Override
public ComplexDatabaseType getWrappedType() {
return (ComplexDatabaseType)wrappedDatabaseType;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/JDBCTypeWrapper.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/JDBCTypeWrapper.java
index 1320c38..b597e93 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/JDBCTypeWrapper.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/JDBCTypeWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
super(wrappedType);
}
+ @Override
public JDBCType getWrappedType() {
return (JDBCType)wrappedDatabaseType;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/JDBCTypes.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/JDBCTypes.java
index d8adeea..9cd7558 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/JDBCTypes.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/JDBCTypes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -97,10 +97,12 @@
return typeName;
}
+ @Override
public boolean isComplexDatabaseType() {
return false;
}
+ @Override
public boolean isJDBCType() {
return true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/OraclePLSQLTypes.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/OraclePLSQLTypes.java
index 42ede89..2d95167 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/OraclePLSQLTypes.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/OraclePLSQLTypes.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
this.typeName = typeName;
}
+ @Override
public boolean isComplexDatabaseType() {
return false;
}
@@ -43,6 +44,7 @@
return typeName;
}
+ @Override
public boolean isJDBCType() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/PLSQLCallModelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/PLSQLCallModelTestCases.java
index 689592b..06faf93 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/PLSQLCallModelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/PLSQLCallModelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new PLSQLCallModelTestProject());
}
+ @Override
protected Object getControlObject() {
PLSQLrecord r1 = new PLSQLrecord();
r1.setRecordName("EMPLOYEE RECORD");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/PLSQLrecord.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/PLSQLrecord.java
index d9fbc8d..1d891f8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/PLSQLrecord.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/PLSQLrecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,10 +32,12 @@
super();
}
+ @Override
public boolean isComplexDatabaseType() {
return true;
}
+ @Override
public boolean isJDBCType() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/SimplePLSQLTypeWrapper.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/SimplePLSQLTypeWrapper.java
index 1f926a0..ed979d4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/SimplePLSQLTypeWrapper.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/self/plsqlcallmodel/SimplePLSQLTypeWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
super(wrappedType);
}
+ @Override
public OraclePLSQLType getWrappedType() {
return (OraclePLSQLType)wrappedDatabaseType;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/singleelement/CompositeObjectSingleElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/singleelement/CompositeObjectSingleElementTestCases.java
index 6fffead..2c4b989 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/singleelement/CompositeObjectSingleElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/compositeobject/singleelement/CompositeObjectSingleElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new CompositeObjectSingleElementProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_EMPLOYEE_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/arraylist/DirectCollectionArrayListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/arraylist/DirectCollectionArrayListTestCases.java
index 9b80857..3371af6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/arraylist/DirectCollectionArrayListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/arraylist/DirectCollectionArrayListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new DirectCollectionArrayListProject());
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/arraylist/xmlattribute/DirectCollectionArrayListXMLAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/arraylist/xmlattribute/DirectCollectionArrayListXMLAttributeTestCases.java
index 4538e3e..03180b4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/arraylist/xmlattribute/DirectCollectionArrayListXMLAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/arraylist/xmlattribute/DirectCollectionArrayListXMLAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectCollectionArrayListXMLAttributeProject());
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/converter/DirectCollectionObjectTypeConverterTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/converter/DirectCollectionObjectTypeConverterTestCases.java
index 5e58a61..9f118c2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/converter/DirectCollectionObjectTypeConverterTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/converter/DirectCollectionObjectTypeConverterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(new DirectCollectionObjectTypeConverterProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/errortests/DirectCollectionErrorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/errortests/DirectCollectionErrorTestCases.java
index 1a0bb27..8940637 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/errortests/DirectCollectionErrorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/errortests/DirectCollectionErrorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import java.util.Vector;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.eclipse.persistence.exceptions.DescriptorException;
import org.eclipse.persistence.exceptions.IntegrityException;
@@ -40,14 +42,14 @@
for (int i = 0; i < caughtExceptions.size(); i++) {
Exception nextException = (Exception)caughtExceptions.elementAt(i);
if (nextException instanceof DescriptorException) {
- this.assertTrue("An incorrect Descriptor exception occurred.", ((DescriptorException)nextException).getErrorCode() == DescriptorException.FIELD_NAME_NOT_SET_IN_MAPPING);
+ assertTrue("An incorrect Descriptor exception occurred.", ((DescriptorException)nextException).getErrorCode() == DescriptorException.FIELD_NAME_NOT_SET_IN_MAPPING);
foundException = true;
}
}
- this.assertTrue("The appropriate Descriptor exception was not encountered", foundException);
+ assertTrue("The appropriate Descriptor exception was not encountered", foundException);
return;
} catch (XMLMarshalException marshalException) {
- this.assertTrue("An unexcepted XMLMarshalException occurred", !(metadata == Metadata.JAVA));
+ assertTrue("An unexcepted XMLMarshalException occurred", !(metadata == Metadata.JAVA));
return;
} catch (Exception e) {
fail("An unexcepted exception occurred");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameEmptyTestCases.java
index 627fe08..d3bd13c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases.java
index f3f43f3..86be54a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameIntegerTestCases.java
@@ -34,6 +34,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByNameIntegerProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameNullItemTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameNullItemTestCases.java
index 8fb1ad2..c6c0914 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameNullItemTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameNullItemTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
@@ -52,6 +53,7 @@
return employee;
}
+ @Override
public Document getWriteControlDocument() throws Exception{
InputStream inputStream = ClassLoader.getSystemResourceAsStream(XML_WRITE_CONTROL_RESOURCE);
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
@@ -66,6 +68,7 @@
/*
* Nulls are read in as empty collections.
*/
+ @Override
public Object getReadControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
@@ -77,6 +80,7 @@
return employee;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
// DO NOTHING
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameNullTestCases.java
index 3c3fc5a..1ac0398 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = null;
@@ -42,6 +43,7 @@
/*
* Nulls are read in as empty collections.
*/
+ @Override
public Object getReadControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameTestCases.java
index 47ede99..3ffdefa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerSingleNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerSingleNodeTestCases.java
index bc7beba..8350116 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerSingleNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementIntegerSingleNodeTestCases.java
@@ -36,6 +36,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementListWithUnionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementListWithUnionTestCases.java
index 3b3524f..628b27e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementListWithUnionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementListWithUnionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSchemaTypeSingleNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSchemaTypeSingleNodeTestCases.java
index 9a956f6..0749d64 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSchemaTypeSingleNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSchemaTypeSingleNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSchemaTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSchemaTypeTestCases.java
index fe3b8dd..d00cca0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSchemaTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSchemaTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSingleElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSingleElementTestCases.java
index e9110d7..a8c6269 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSingleElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementSingleElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementWithCommentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementWithCommentTestCases.java
index 4440f13..964e6b7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementWithCommentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementWithCommentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
@@ -47,6 +48,7 @@
return employee;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
String xmlResource = "org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withgroupingelement/DirectCollectionWithGroupingElementWithCommentWriting.xml";
InputStream inputStream = ClassLoader.getSystemResourceAsStream(xmlResource);
@@ -60,10 +62,12 @@
return writeControlDocument;
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
// DO NOTHING BECAUSE UNMARSHALLER HANDLER CAN NOT READ COMMENTS
}
+ @Override
public void testObjectToContentHandler() throws Exception {
// DO NOTHING BECAUSE CONTENT HANDLER CAN NOT READ COMMENTS
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameEmptyTestCases.java
index 3f57165..64dcb24 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectCollectionWithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCases.java
index 3c59acb..1e59389 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerTestCases.java
@@ -33,6 +33,7 @@
setProject(new DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameNullItemTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameNullItemTestCases.java
index 4154721..f2832c2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameNullItemTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameNullItemTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setProject(new DirectCollectionWithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
@@ -54,6 +55,7 @@
return employee;
}
+ @Override
public Document getWriteControlDocument() throws Exception{
InputStream inputStream = ClassLoader.getSystemResourceAsStream(XML_WRITE_CONTROL_RESOURCE);
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
@@ -68,6 +70,7 @@
/*
* On the read the null collection will come in as empty
*/
+ @Override
public Object getReadControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
@@ -78,6 +81,7 @@
return employee;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
// DO NOTHING BECAUSE CONTENT HANDLER CAN NOT READ COMMENTS
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameNullTestCases.java
index cae128f..fc85d86 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectCollectionWithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = null;
@@ -43,6 +44,7 @@
/*
* On the read the null collection will come in as empty
*/
+ @Override
public Object getReadControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameTestCases.java
index a86dcd9..55b3e5b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new DirectCollectionWithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases.java
index f1f27d9..42261dc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithCommentsTestCases.java
@@ -37,6 +37,7 @@
setProject(new DirectCollectionWithoutGroupingElementIdentifiedByNameIntegerProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
@@ -49,6 +50,7 @@
return employee;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
String xmlResource = "org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementIntegerWithCommentWriting.xml";
@@ -63,6 +65,7 @@
return writeControlDocument;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
// DO NOTHING BECAUSE CONTENT HANDLER CAN NOT READ COMMENTS
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementListWithUnionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementListWithUnionTestCases.java
index f195ba9..55006f4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementListWithUnionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementListWithUnionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSchemaTypeSingleNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSchemaTypeSingleNodeTestCases.java
index e27e4ef..e392546 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSchemaTypeSingleNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSchemaTypeSingleNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
Calendar cal1 = Calendar.getInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSchemaTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSchemaTypeTestCases.java
index dcceee2..d195e7d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSchemaTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSchemaTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
Calendar cal1 = Calendar.getInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSingleElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSingleElementTestCases.java
index 64f83d2..fd6524a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSingleElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSingleElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectCollectionWithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSingleNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSingleNodeTestCases.java
index deabaee..e88343f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSingleNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyname/withoutgroupingelement/DirectCollectionWithoutGroupingElementSingleNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionEmptyTestCases.java
index 0e76951..00f4833 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByPositionProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionNullTestCases.java
index a8c30c3..8cc4b9a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByPositionProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = null;
@@ -50,6 +51,7 @@
/*
* Null collection is treated as empty on a read
*/
+ @Override
public Object getReadControlObject() {
Vector responsibilities2 = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionTestCases.java
index ea48f1e..10984dc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/identifiedbyposition/withgroupingelement/DirectCollectionWithGroupingElementIdentifiedByPositionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setProject(new DirectCollectionWithGroupingElementIdentifiedByPositionProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/listoflists/XMLDirectCollectionOfListsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/listoflists/XMLDirectCollectionOfListsTestCases.java
index bf31473..6f445a4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/listoflists/XMLDirectCollectionOfListsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/listoflists/XMLDirectCollectionOfListsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new RootProject());
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionIsSetNodeNullPolicyTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionIsSetNodeNullPolicyTrueTestCases.java
index 27943d2..0676a6e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionIsSetNodeNullPolicyTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionIsSetNodeNullPolicyTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableAndEmptyNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableAndEmptyNodeTestCases.java
index 10b7b3b..c142690 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableAndEmptyNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableAndEmptyNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableNodeNullPolicyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableNodeNullPolicyTestCases.java
index 1b3df4f..3a30303 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableNodeNullPolicyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionNillableNodeNullPolicyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyAttributeTestCases.java
index 7297b83..ee5b7ac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
@@ -63,6 +64,7 @@
return anEmployee;
}
+ @Override
public Object getReadControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyElementTestCases.java
index ef0cc32..1a27bdf 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/nillable/DirectCollectionOptionalNodeNullPolicyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
@@ -64,6 +65,7 @@
return anEmployee;
}
+ @Override
public Object getReadControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/reuse/DirectCollectionReuseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/reuse/DirectCollectionReuseTestCases.java
index 32205e3..c7648e3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/reuse/DirectCollectionReuseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/reuse/DirectCollectionReuseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(new DirectCollectionReuseProject());
}
+ @Override
protected Object getControlObject() {
List responsibilities = new LinkedList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/DirectCollectionSingleNodeNillableTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/DirectCollectionSingleNodeNillableTestCases.java
index 5ff83dd..88f8549 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/DirectCollectionSingleNodeNillableTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/DirectCollectionSingleNodeNillableTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
@@ -54,6 +55,7 @@
return employee;
}
+ @Override
public Object getReadControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/DirectCollectionSingleNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/DirectCollectionSingleNodeTestCases.java
index 6262d0e..78bfd83 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/DirectCollectionSingleNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/DirectCollectionSingleNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setProject(new DirectCollectionSingleNodeProject());
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/xmlattribute/DirectCollectionSingleNodeXMLAttributeMethodAccessingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/xmlattribute/DirectCollectionSingleNodeXMLAttributeMethodAccessingTestCases.java
index 2ed5683..7f5b92f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/xmlattribute/DirectCollectionSingleNodeXMLAttributeMethodAccessingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/xmlattribute/DirectCollectionSingleNodeXMLAttributeMethodAccessingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
TestRunner.main(arguments);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
assertEquals(1, ((Employee)testObject).getIdSetCounter());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/xmlattribute/DirectCollectionSingleNodeXMLAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/xmlattribute/DirectCollectionSingleNodeXMLAttributeTestCases.java
index 9fb1e60..535908e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/xmlattribute/DirectCollectionSingleNodeXMLAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/singlenode/xmlattribute/DirectCollectionSingleNodeXMLAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectCollectionSingleNodeXMLAttributeProject());
}
+ @Override
protected Object getControlObject() {
ArrayList responsibilities = new ArrayList();
responsibilities.add(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameIntegerTestCases.java
index 7809c5c..3da24d3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameIntegerTestCases.java
@@ -34,6 +34,7 @@
setProject(new WithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameTestCases.java
index 77edbb6..03444a7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withgroupingelement/WithGroupingElementIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(new WithGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameIntegerTestCases.java
index 2eaa123..1c189ff 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameIntegerTestCases.java
@@ -33,6 +33,7 @@
setProject(new WithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameTestCases.java
index 59bee27..5b1d8a3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/typeattribute/identifiedbyname/withoutgroupingelement/WithoutGroupingElementIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new WithoutGroupingElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Vector responsibilities = new Vector();
responsibilities.addElement(CONTROL_RESPONSIBILITY1);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/SimpleUnionNoConversionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/SimpleUnionNoConversionTestCases.java
index 6d3ede2..d35ffd9b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/SimpleUnionNoConversionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/SimpleUnionNoConversionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setProject(new SimpleUnionProject());
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
person.addItem(CONTROL_ITEM);
@@ -47,6 +48,7 @@
return person;
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
try {
xmlUnmarshaller.unmarshal(ClassLoader.getSystemResource(XML_RESOURCE));
@@ -57,6 +59,7 @@
fail("no error occurred...expected XMLConversionException");
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
try {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -71,6 +74,7 @@
fail("no error occurred...expected XMLConversionException");
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
try {
xmlUnmarshaller.unmarshal(getControlDocument());
@@ -81,6 +85,7 @@
fail("no error occurred...expected XMLConversionException");
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
try {
@@ -101,6 +106,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
try {
@@ -133,6 +139,7 @@
}
*/
+ @Override
public void testUnmarshallerHandler() throws Exception {
try {
super.testUnmarshallerHandler();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/SimpleUnionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/SimpleUnionTestCases.java
index 6356942..7395344 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/SimpleUnionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/SimpleUnionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new SimpleUnionProject());
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
BigInteger item = new BigInteger(CONTROL_ITEM);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionDateTimeToDateTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionDateTimeToDateTestCases.java
index a40d3bd..571232e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionDateTimeToDateTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionDateTimeToDateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeNotSetTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeNotSetTestCases.java
index c5eb1b9..59eb71e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeNotSetTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeNotSetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeNotSet.xml");
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
person.addItem("10");
@@ -34,6 +35,7 @@
return person;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
String xmlResource = "org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeNotSetWriting.xml";
InputStream inputStream = ClassLoader.getSystemResourceAsStream(xmlResource);
@@ -47,6 +49,7 @@
return writeControlDocument;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
xmlMarshaller.marshal(getWriteControlObject(), builder);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeTestCases.java
index 945ecca..0a0302d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/UnionWithTypeAttributeTestCases.java
@@ -48,6 +48,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
person.addItem(CONTROL_ITEM);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/xmlattribute/SimpleUnionPositionalXMLAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/xmlattribute/SimpleUnionPositionalXMLAttributeTestCases.java
index b3de2c2..1c13e78 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/xmlattribute/SimpleUnionPositionalXMLAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/xmlattribute/SimpleUnionPositionalXMLAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new SimpleUnionXMLAttributeProject());
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
BigInteger item = new BigInteger(CONTROL_ITEM);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/xmlattribute/SimpleUnionXMLAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/xmlattribute/SimpleUnionXMLAttributeTestCases.java
index 5f38884..ec6cd49 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/xmlattribute/SimpleUnionXMLAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directcollection/union/xmlattribute/SimpleUnionXMLAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new SimpleUnionXMLAttributeProject());
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
BigInteger item = new BigInteger(CONTROL_ITEM);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/cdata/DirectToFieldCDATATestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/cdata/DirectToFieldCDATATestCases.java
index d8442e3..7b5fb30 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/cdata/DirectToFieldCDATATestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/cdata/DirectToFieldCDATATestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectToFieldCDATAProject());
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.firstName = CONTROL_FIRST_NAME;
@@ -41,6 +42,7 @@
return emp;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
//CDATA not supported by content handlers
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/ConverterAbsentElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/ConverterAbsentElementTestCases.java
index 3ee8e45..3d7d172 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/ConverterAbsentElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/ConverterAbsentElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,11 +27,13 @@
setProject(aProject);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
MyConverter.HIT_CONVERTER = false;
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.firstName = "Bill";
@@ -40,6 +42,7 @@
return emp;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception{
super.xmlToObjectTest(testObject);
assertFalse("Converter was hit" , MyConverter.HIT_CONVERTER);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/ConverterEmptyElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/ConverterEmptyElementTestCases.java
index 43aa21c..40be23e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/ConverterEmptyElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/ConverterEmptyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,11 +35,13 @@
setProject(aProject);
}
+ @Override
public void setUp() throws Exception{
super.setUp();
MyConverter.HIT_CONVERTER = false;
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.firstName = "Bill";
@@ -49,6 +51,7 @@
return emp;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception{
super.xmlToObjectTest(testObject);
assertTrue(MyConverter.HIT_CONVERTER);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/MyConverter.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/MyConverter.java
index b006b4d..73ba1e4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/MyConverter.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/converter/MyConverter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,18 +25,22 @@
public MyConverter(){
}
+ @Override
public Object convertDataValueToObjectValue(Object fieldValue, Session session) {
HIT_CONVERTER = true;
return fieldValue;
}
- public Object convertObjectValueToDataValue(Object objectValue,Session session) {
+ @Override
+ public Object convertObjectValueToDataValue(Object objectValue, Session session) {
return objectValue;
}
+ @Override
public void initialize(DatabaseMapping mapping, Session session) {
}
+ @Override
public boolean isMutable() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/EmptyAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/EmptyAttributeTestCases.java
index 3f55b18..70c28ac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/EmptyAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/EmptyAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(new DefaultNullValueAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
// We currently have different behavior when using XMLProjectReader
@@ -51,6 +52,7 @@
return employee;
}
+ @Override
public Object getWriteControlObject() {
Employee employee = new Employee();
// We currently have different behavior when using XMLProjectReader
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/MissingAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/MissingAttributeTestCases.java
index a522b2e..fbe399d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/MissingAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/MissingAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new DefaultNullValueAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
// We currently have different behavior when using XMLProjectReader
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/NotMissingAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/NotMissingAttributeTestCases.java
index 3165510..0e46184 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/NotMissingAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlattribute/NotMissingAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new DefaultNullValueAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/EmptyElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/EmptyElementTestCases.java
index d649383..fac72f7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/EmptyElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/EmptyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
// idMapping.getNullPolicy().setMarshalNullRepresentation(XMLNullRepresentationType.EMPTY_NODE);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
// We currently have different behavior when using XMLProjectReader
@@ -72,6 +73,7 @@
return employee;
}
+ @Override
public Object getWriteControlObject() {
Employee employee = new Employee();
// We currently have different behavior when using XMLProjectReader
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/MissingElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/MissingElementTestCases.java
index 8fe4021..7863812 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/MissingElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/MissingElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new DefaultNullValueElementProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
// We currently have different behavior when using XMLProjectReader
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/NotMissingElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/NotMissingElementTestCases.java
index b0e7226..0a3e7ab 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/NotMissingElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/defaultnullvalue/xmlelement/NotMissingElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new DefaultNullValueElementProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleNanTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleNanTestCases.java
index c0f7fce..e7725e5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleNanTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleNanTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new DirectToFieldDoubleProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleNegativeInfinityTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleNegativeInfinityTestCases.java
index ab676c1..624722e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleNegativeInfinityTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleNegativeInfinityTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new DirectToFieldDoubleProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoublePositiveInfinityTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoublePositiveInfinityTestCases.java
index a3898f4..7b15d69 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoublePositiveInfinityTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoublePositiveInfinityTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new DirectToFieldDoubleProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleTestCases.java
index 9c4e1d7..69103e2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/doubletest/DirectToFieldDoubleTestCases.java
@@ -30,6 +30,7 @@
setProject(new DirectToFieldDoubleProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/errortests/DirectToFieldErrorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/errortests/DirectToFieldErrorTestCases.java
index b3a3b1f..9acf7e6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/errortests/DirectToFieldErrorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/errortests/DirectToFieldErrorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import java.util.Vector;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.eclipse.persistence.exceptions.DescriptorException;
import org.eclipse.persistence.exceptions.IntegrityException;
@@ -40,14 +42,14 @@
for (int i = 0; i < caughtExceptions.size(); i++) {
Exception nextException = (Exception)caughtExceptions.elementAt(i);
if (nextException instanceof DescriptorException) {
- this.assertTrue("An incorrect Descriptor exception occurred.", ((DescriptorException)nextException).getErrorCode() == DescriptorException.FIELD_NAME_NOT_SET_IN_MAPPING);
+ assertTrue("An incorrect Descriptor exception occurred.", ((DescriptorException)nextException).getErrorCode() == DescriptorException.FIELD_NAME_NOT_SET_IN_MAPPING);
foundException = true;
}
}
- this.assertTrue("The appropriate Descriptor exception was not encountered", foundException);
+ assertTrue("The appropriate Descriptor exception was not encountered", foundException);
return;
} catch (XMLMarshalException marshalException) {
- this.assertTrue("An unexcepted XMLMarshalException occurred", !(metadata == Metadata.JAVA));
+ assertTrue("An unexcepted XMLMarshalException occurred", !(metadata == Metadata.JAVA));
return;
} catch (Exception e) {
fail("An unexcepted exception occurred");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatNanTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatNanTestCases.java
index 5b385b1..ad91943 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatNanTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatNanTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new DirectToFieldFloatProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatNegativeInfinityTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatNegativeInfinityTestCases.java
index c7df1ad..ab278cd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatNegativeInfinityTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatNegativeInfinityTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new DirectToFieldFloatProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatPositiveInfinityTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatPositiveInfinityTestCases.java
index 0433dcf..d37236b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatPositiveInfinityTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatPositiveInfinityTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new DirectToFieldFloatProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatTestCases.java
index 3c054f3..9febe22 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/floattest/DirectToFieldFloatTestCases.java
@@ -30,6 +30,7 @@
setProject(new DirectToFieldFloatProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarDateTestIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarDateTestIdentifiedByNameTestCases.java
index 55e60f0..f0c913f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarDateTestIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarDateTestIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new CalendarTestIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
CONTROL_BIRTH_DATE = Calendar.getInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarTestIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarTestIdentifiedByNameTestCases.java
index a637f7a..e47099b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarTestIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarTestIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new CalendarTestIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
CONTROL_BIRTH_DATE = Calendar.getInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarTimeTestIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarTimeTestIdentifiedByNameTestCases.java
index aaf82cf..a4a0061 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarTimeTestIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/calendartest/CalendarTimeTestIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new CalendarTestIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
CONTROL_BIRTH_DATE = Calendar.getInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameEmptyTestCases.java
index 54c4a90..bbb0c0f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new DirectToXMLAttributeIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameNullTestCases.java
index 5861cd7..abef72c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.eclipse.persistence.platform.xml.SAXDocumentBuilder;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;
@@ -35,6 +37,7 @@
setProject(new DirectToXMLAttributeIdentifiedByNameProject());
}
+ @Override
public void setUp() {
try {
super.setUp();
@@ -46,10 +49,11 @@
removeEmptyTextNodes(comparisonControlDocument);
} catch (Exception e) {
e.printStackTrace();
- this.fail("An exception occurred during setup");
+ fail("An exception occurred during setup");
}
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
@@ -59,10 +63,12 @@
return employee;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
return comparisonControlDocument;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
xmlMarshaller.marshal(getWriteControlObject(), builder);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameSpecialCharactersTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameSpecialCharactersTestCases.java
index 528e8cf..882f35c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameSpecialCharactersTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameSpecialCharactersTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
super(name);
}
+ @Override
public void setUp() {
DirectToXMLAttributeIdentifiedByNameProject project = new DirectToXMLAttributeIdentifiedByNameProject();
XMLContext xmlContext = new XMLContext(project);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameTestCases.java
index 63f8394..ad9e386 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlattribute/DirectToXMLAttributeIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectToXMLAttributeIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameEmptyTestCases.java
index 9623017..cb59414 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.eclipse.persistence.platform.xml.SAXDocumentBuilder;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;
@@ -36,6 +38,7 @@
setProject(new DirectToXMLElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
@@ -44,6 +47,7 @@
return employee;
}
+ @Override
public void setUp() {
try {
super.setUp();
@@ -56,14 +60,16 @@
} catch (Exception e) {
e.printStackTrace();
- this.fail("An exception occurred during setup");
+ fail("An exception occurred during setup");
}
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
return controlDocumentWrite;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
xmlMarshaller.marshal(getWriteControlObject(), builder);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameMissingTextXPathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameMissingTextXPathTestCases.java
index 525502a..81e24b0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameMissingTextXPathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameMissingTextXPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setProject(project);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameNegativeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameNegativeTestCases.java
index 2428d15..df7df30 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameNegativeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameNegativeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(new DirectToXMLElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
@@ -43,6 +44,7 @@
return employee;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream(WRITE_RESOURCE);
controlDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameNullTestCases.java
index 0afcb7d..caa0075 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.eclipse.persistence.platform.xml.SAXDocumentBuilder;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;
@@ -35,6 +37,7 @@
setProject(new DirectToXMLElementIdentifiedByNameProject());
}
+ @Override
public void setUp() {
try {
super.setUp();
@@ -46,14 +49,16 @@
removeEmptyTextNodes(comparisonControlDocument);
} catch (Exception e) {
e.printStackTrace();
- this.fail("An exception occurred during setup");
+ fail("An exception occurred during setup");
}
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
return comparisonControlDocument;
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
@@ -63,6 +68,7 @@
return employee;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
xmlMarshaller.marshal(getWriteControlObject(), builder);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameSpecialCharactersTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameSpecialCharactersTestCases.java
index 990f907..917a856 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameSpecialCharactersTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameSpecialCharactersTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
super(name);
}
+ @Override
public void setUp() {
DirectToXMLElementIdentifiedByNameProject project = new DirectToXMLElementIdentifiedByNameProject();
XMLContext xmlContext = new XMLContext(project);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameTestCases.java
index cbd4b28..5bf5b02 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new DirectToXMLElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameWithCommentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameWithCommentTestCases.java
index a07ce47..428987a8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameWithCommentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementIdentifiedByNameWithCommentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(new DirectToXMLElementIdentifiedByNameProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
@@ -45,6 +46,7 @@
return employee;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
String xmlResource = "org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyname/xmlelement/DirectToXMLElementWithCommentWriting.xml";
InputStream inputStream = ClassLoader.getSystemResourceAsStream(xmlResource);
@@ -58,6 +60,7 @@
return writeControlDocument;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
xmlMarshaller.marshal(getWriteControlObject(), builder);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbynamespace/xmlattribute/DirectToXMLAttributeIdentifiedByNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbynamespace/xmlattribute/DirectToXMLAttributeIdentifiedByNamespaceTestCases.java
index c5951fb..31c06a9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbynamespace/xmlattribute/DirectToXMLAttributeIdentifiedByNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbynamespace/xmlattribute/DirectToXMLAttributeIdentifiedByNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new DirectToXMLAttributeIdentifiedByNamespaceProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setFirstName(CONTROL_FIRST_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbynamespace/xmlelement/DirectToXMLElementIdentifiedByNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbynamespace/xmlelement/DirectToXMLElementIdentifiedByNamespaceTestCases.java
index 7a504c0..6e18cb6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbynamespace/xmlelement/DirectToXMLElementIdentifiedByNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbynamespace/xmlelement/DirectToXMLElementIdentifiedByNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new DirectToXMLElementIdentifiedByNamespaceProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setFirstName(CONTROL_FIRST_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPosition2TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPosition2TestCases.java
index 03a0259..8526cbb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPosition2TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPosition2TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DirectToXMLElementIdentifiedByPositionProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPositionNullElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPositionNullElementTestCases.java
index ad9c395..115209a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPositionNullElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPositionNullElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new DirectToXMLElementIdentifiedByPositionProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPositionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPositionTestCases.java
index f7dbb0b..7d04968 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPositionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/identifiedbyposition/xmlelement/DirectToXMLElementIdentifiedByPositionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new DirectToXMLElementIdentifiedByPositionProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/leafelement/DirectWithLeafElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/leafelement/DirectWithLeafElementTestCases.java
index d3d91b8..1f35cc2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/leafelement/DirectWithLeafElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/leafelement/DirectWithLeafElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
TestRunner.main(arguments);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
@@ -65,6 +66,7 @@
return employee;
}
+ @Override
public Project getNewProject(Project originalProject, ClassLoader classLoader) {
Project newProject = super.getNewProject(originalProject, classLoader);
ClassDescriptor desc = newProject.getDescriptor(Employee.class);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNodeNullPolicyFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNodeNullPolicyFalseTestCases.java
index 1502d3f..d6f3ef3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNodeNullPolicyFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNodeNullPolicyFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNodeNullPolicyTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNodeNullPolicyTrueTestCases.java
index a1a9627..7c277c0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNodeNullPolicyTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNodeNullPolicyTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeAbsentIsSetAbsentFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeAbsentIsSetAbsentFalseTestCases.java
index db92615..b6dfdc7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeAbsentIsSetAbsentFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeAbsentIsSetAbsentFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeAbsentIsSetAbsentTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeAbsentIsSetAbsentTrueTestCases.java
index fc2e054..4bd8011 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeAbsentIsSetAbsentTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeAbsentIsSetAbsentTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
@@ -57,10 +58,15 @@
}
+ @Override
public void testObjectToXMLDocument() throws Exception {}
+ @Override
public void testObjectToXMLStringWriter() throws Exception {}
+ @Override
public void testObjectToContentHandler() throws Exception {}
+ @Override
public void testXMLToObjectFromURL() throws Exception {}
+ @Override
public void testUnmarshallerHandler() throws Exception {}
// public void testXMLToObjectFromInputStream() throws Exception {}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetEmptyFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetEmptyFalseTestCases.java
index 23ce976..7954809 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetEmptyFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetEmptyFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetEmptyTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetEmptyTrueTestCases.java
index d0afd1e..004888d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetEmptyTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetEmptyTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
@@ -56,6 +57,7 @@
}
//This method should be removed when bug 416854 is fixed
+ @Override
public Object getJSONReadControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetNonNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetNonNullTestCases.java
index b5bd68b..cbc2c04 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetNonNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyAttributeSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseTestCases.java
index d6afc60..fd3aa5e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseWithParamsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseWithParamsTestCases.java
index 17976ce..1716849 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseWithParamsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentFalseWithParamsTestCases.java
@@ -61,6 +61,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
EmployeeIsSetParams anEmployee = new EmployeeIsSetParams();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentTrueTestCases.java
index 3f97b68..451d9bb 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementAbsentIsSetAbsentTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetEmptyFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetEmptyFalseTestCases.java
index e8a297d..e058a1a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetEmptyFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetEmptyFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetEmptyTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetEmptyTrueTestCases.java
index 23c61d7..7033746 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetEmptyTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetEmptyTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNillableIsSetFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNillableIsSetFalseTestCases.java
index a0aa080..3bf00ee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNillableIsSetFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNillableIsSetFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNillableIsSetTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNillableIsSetTrueTestCases.java
index 3c8dac2..584d1f5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNillableIsSetTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNillableIsSetTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNonNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNonNullTestCases.java
index 1d0d659..37883cd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNonNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetNullPolicyElementSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetDefaultTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetDefaultTestCases.java
index 3029eac..7d1882b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetDefaultTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetDefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNOPTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNOPTestCases.java
index 6554aa5..5c73e55 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNOPTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNOPTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNonNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNonNullTestCases.java
index 0eded12..71a40a5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNonNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNullTestCases.java
index b7a81fe..19baf99 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetOtherEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetOtherEmptyTestCases.java
index a9d374a..5ab6b17 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetOtherEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementDefaultSetOtherEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,6 +60,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetDefaultNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetDefaultNullTestCases.java
index d1399d8..427f62e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetDefaultNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetDefaultNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,6 +66,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetNOPTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetNOPTestCases.java
index 5fd03fc..2e6e2a3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetNOPTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetNOPTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetNonNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetNonNullTestCases.java
index 8a57995..4a9f423 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetNonNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetOtherEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetOtherEmptyTestCases.java
index 4022541..d7f0f5a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetOtherEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectIsSetOptionalNodeNullPolicyNonNillableElementNonDefaultSetOtherEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -60,6 +60,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNillableNodeNullPolicyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNillableNodeNullPolicyTestCases.java
index f506690..8fb2d97 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNillableNodeNullPolicyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNillableNodeNullPolicyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeAbsentIsSetAbsentFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeAbsentIsSetAbsentFalseTestCases.java
index 50b74ab..4e9b61b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeAbsentIsSetAbsentFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeAbsentIsSetAbsentFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeAbsentIsSetAbsentTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeAbsentIsSetAbsentTrueTestCases.java
index 00f8205..0340bf6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeAbsentIsSetAbsentTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeAbsentIsSetAbsentTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetEmptyFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetEmptyFalseTestCases.java
index 84ef9e0..0ec2043 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetEmptyFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetEmptyFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(null);
@@ -51,6 +52,7 @@
return anEmployee;
}
+ @Override
public Object getJSONReadControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(null);
@@ -59,6 +61,7 @@
return anEmployee;
}
+ @Override
public Object getReadControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(0);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetEmptyTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetEmptyTrueTestCases.java
index 19aa13a..76e4862 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetEmptyTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetEmptyTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetNillableNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetNillableNullTestCases.java
index 9a657fa..b73bd36 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetNillableNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetNillableNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetNonNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetNonNullTestCases.java
index 8e932b3..677e1f6 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetNonNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyAttributeSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementAbsentIsSetAbsentFalseTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementAbsentIsSetAbsentFalseTestCases.java
index 93ab50d..4d0cac8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementAbsentIsSetAbsentFalseTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementAbsentIsSetAbsentFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementAbsentIsSetAbsentTrueTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementAbsentIsSetAbsentTrueTestCases.java
index d4aa7bb..cb0da4a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementAbsentIsSetAbsentTrueTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementAbsentIsSetAbsentTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetEmptyTestCases.java
index e6e74b0..dbf25b8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(null);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNillableFalseTextTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNillableFalseTextTestCases.java
index d668c98..627ae52 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNillableFalseTextTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNillableFalseTextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setControlJSON(JSON_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNillableTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNillableTestCases.java
index adef048..0994d26 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNillableTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNillableTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNonNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNonNullTestCases.java
index fa0639e..62816e1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNonNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectNullPolicyElementSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectOptionalNodeNullPolicyAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectOptionalNodeNullPolicyAttributeTestCases.java
index e0fb9cb..4320a99 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectOptionalNodeNullPolicyAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectOptionalNodeNullPolicyAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectOptionalNodeNullPolicyElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectOptionalNodeNullPolicyElementTestCases.java
index 5ed4649..a766a5e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectOptionalNodeNullPolicyElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/DirectOptionalNodeNullPolicyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(aProject);
}
+ @Override
protected Object getControlObject() {
Employee anEmployee = new Employee();
anEmployee.setId(123);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/EmployeeIsSetParams.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/EmployeeIsSetParams.java
index 052e3b0..3e9e336 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/EmployeeIsSetParams.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/nillable/EmployeeIsSetParams.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,14 +57,17 @@
}
}
+ @Override
public String getFirstName() {
return firstName;
}
+ @Override
public Integer getId() {
return id;
}
+ @Override
public String getLastName() {
return lastName;
}
@@ -88,16 +91,19 @@
return isSetFirstName;
}*/
+ @Override
public void setFirstName(String firstName) {
// no unset for now
isSetFirstName = true;
this.firstName = firstName;
}
+ @Override
public void setId(Integer id) {
this.id = id;
}
+ @Override
public void setLastName(String lastName) {
this.lastName = lastName;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeBase64TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeBase64TestCases.java
index c1df0e8..a8ae986 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeBase64TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeBase64TestCases.java
@@ -39,6 +39,7 @@
setProject(project);
}
+ @Override
protected Object getControlObject() {
ByteHolder byteHolder = new ByteHolder();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeHexTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeHexTestCases.java
index aa0fae5..de22a84 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeHexTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeHexTestCases.java
@@ -38,6 +38,7 @@
setProject(project);
}
+ @Override
protected Object getControlObject() {
ByteHolder byteHolder = new ByteHolder();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeQNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeQNameTestCases.java
index 9f6fbb4..90ddff0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeQNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/schematype/SchemaTypeQNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setProject(project);
}
+ @Override
protected Object getControlObject() {
QNameHolder qnameHolder = new QNameHolder();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlattribute/DirectToXMLAttributeNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlattribute/DirectToXMLAttributeNullTestCases.java
index eeda3f5..7b9bf59 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlattribute/DirectToXMLAttributeNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlattribute/DirectToXMLAttributeNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new DirectToXMLAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
return employee;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlattribute/DirectToXMLAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlattribute/DirectToXMLAttributeTestCases.java
index 90a5692..799004a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlattribute/DirectToXMLAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlattribute/DirectToXMLAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new DirectToXMLAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelement/DirectToXMLElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelement/DirectToXMLElementTestCases.java
index 33531d3..507f894 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelement/DirectToXMLElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelement/DirectToXMLElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new DirectToXMLElementProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelement/EmptyElementEmptyStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelement/EmptyElementEmptyStringTestCases.java
index e0d8f20..afffb6b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelement/EmptyElementEmptyStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelement/EmptyElementEmptyStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setShouldRemoveEmptyTextNodesFromControlDoc(false);
}
+ @Override
protected Object getControlObject() {
EmptyElementEmptyStringEmployee employee = new EmptyElementEmptyStringEmployee();
employee.setID(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelementwithwhitespace/DirectToXMLElementWithWhitespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelementwithwhitespace/DirectToXMLElementWithWhitespaceTestCases.java
index a1e6142..9afe87d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelementwithwhitespace/DirectToXMLElementWithWhitespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/singleattribute/xmlelementwithwhitespace/DirectToXMLElementWithWhitespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.eclipse.persistence.platform.xml.SAXDocumentBuilder;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;
@@ -34,12 +36,14 @@
setProject(new DirectToXMLElementWithWhitespaceProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setID(CONTROL_ID);
return employee;
}
+ @Override
public void setUp() {
try {
super.setUp();
@@ -51,14 +55,16 @@
removeEmptyTextNodes(comparisonControlDocument);
} catch (Exception e) {
e.printStackTrace();
- this.fail("An exception occurred during setup");
+ fail("An exception occurred during setup");
}
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
return comparisonControlDocument;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
xmlMarshaller.marshal(getWriteControlObject(), builder);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeCustomAddTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeCustomAddTestCases.java
index 8b67974..0ead7fa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeCustomAddTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeCustomAddTestCases.java
@@ -28,6 +28,7 @@
setProject(new TypeAttributeCustomAddProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDateTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDateTestCases.java
index ea99500..081e8dc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDateTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
CONTROL_ID.set(Calendar.DAY_OF_MONTH, 2);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDateTimeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDateTimeTestCases.java
index 8d9318f..05456c5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDateTimeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDateTimeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
CONTROL_ID.set(Calendar.MILLISECOND, 0);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDoubleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDoubleTestCases.java
index 95c9433..1a05055 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDoubleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeDoubleTestCases.java
@@ -28,6 +28,7 @@
setProject(new TypeAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeFloatTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeFloatTestCases.java
index fa78bf3..2b783af 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeFloatTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeFloatTestCases.java
@@ -28,6 +28,7 @@
setProject(new TypeAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeIntegerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeIntegerTestCases.java
index 3c9357d..24b6c71 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeIntegerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeIntegerTestCases.java
@@ -28,6 +28,7 @@
setProject(new TypeAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNonXsiPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNonXsiPrefixTestCases.java
index 0295d29..8e7455e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNonXsiPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNonXsiPrefixTestCases.java
@@ -28,6 +28,7 @@
setProject(new TypeAttributeNonXsiPrefixProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNullTestCases.java
index 059f5e6..b21b923 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeNullTestCases.java
@@ -27,6 +27,7 @@
setProject(new TypeAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
Identifier id = new Identifier();
@@ -38,6 +39,7 @@
return employee;
}
+ @Override
public Object getReadControlObject() {
Employee employee = new Employee();
String id = new String("123#AAA");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeStringTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeStringTestCases.java
index 613bcca..abae9bd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeStringTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new TypeAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeTimeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeTimeTestCases.java
index e217889..17f97c4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeTimeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeTimeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
CONTROL_ID.set(Calendar.MILLISECOND, 0);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnChildTestCases.java
index c90b7d8..64c5da1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnChildTestCases.java
@@ -28,6 +28,7 @@
setProject(new TypeAttributeUserTypeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnParentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnParentTestCases.java
index b98b408..8b8c699 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnParentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/typeattribute/TypeAttributeUserTypeNamespaceOnParentTestCases.java
@@ -28,6 +28,7 @@
setProject(new TypeAttributeUserTypeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setIdentifier(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/SimpleUnionNoConversionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/SimpleUnionNoConversionTestCases.java
index 8c1bb44..f9fc04f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/SimpleUnionNoConversionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/SimpleUnionNoConversionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
setProject(new SimpleUnionProject());
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
person.setAge(CONTROL_AGE);
@@ -47,6 +48,7 @@
return person;
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
try {
xmlUnmarshaller.unmarshal(ClassLoader.getSystemResourceAsStream(XML_RESOURCE));
@@ -57,6 +59,7 @@
fail("no error occurred...expected XMLConversionException");
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
try {
InputStream instream = ClassLoader.getSystemResourceAsStream(XML_RESOURCE);
@@ -71,6 +74,7 @@
fail("no error occurred...expected XMLConversionException");
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
try {
Object testObject = xmlUnmarshaller.unmarshal(ClassLoader.getSystemResource(XML_RESOURCE));
@@ -92,6 +96,7 @@
fail("no error occurred...expected XMLConversionException");
}
*/
+ @Override
public void testUnmarshallerHandler() throws Exception {
try {
super.testUnmarshallerHandler();
@@ -102,6 +107,7 @@
fail("no error occurred...expected XMLConversionException");
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
try {
@@ -122,6 +128,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
try {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/SimpleUnionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/SimpleUnionTestCases.java
index 8d65ee6..03ea8a1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/SimpleUnionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/SimpleUnionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new SimpleUnionProject());
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
person.setAge(new BigInteger(CONTROL_AGE));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionDateTimeToDateTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionDateTimeToDateTestCases.java
index ae2ab51..9d29381 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionDateTimeToDateTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionDateTimeToDateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
person.setAge(new BigInteger(CONTROL_AGE));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeNotSetTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeNotSetTestCases.java
index 03585b0..bfbb936 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeNotSetTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeNotSetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeNotSet.xml");
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
person.setAge("10");
@@ -34,6 +35,7 @@
return person;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
String xmlResource = "org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeNotSetWriting.xml";
InputStream inputStream = ClassLoader.getSystemResourceAsStream(xmlResource);
@@ -47,6 +49,7 @@
return writeControlDocument;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
xmlMarshaller.marshal(getWriteControlObject(), builder);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeTestCases.java
index 6a3038f..5024235 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/UnionWithTypeAttributeTestCases.java
@@ -49,6 +49,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
person.setAge(CONTROL_AGE);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/xmlattribute/SimpleUnionXMLAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/xmlattribute/SimpleUnionXMLAttributeTestCases.java
index e98fa08..8b839ee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/xmlattribute/SimpleUnionXMLAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/directtofield/union/xmlattribute/SimpleUnionXMLAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new SimpleUnionXMLAttributeProject());
}
+ @Override
protected Object getControlObject() {
Person person = new Person();
person.setAge(new BigInteger(CONTROL_AGE));
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/KeyBasedMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/KeyBasedMappingTestCases.java
index dcd9c0d..e019246 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/KeyBasedMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/KeyBasedMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
super(name);
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
log("**objectToXMLDocumentTest**");
log("Expected:");
@@ -67,10 +68,12 @@
assertXMLIdentical(getWriteControlDocument(), testDocument);
}
+ @Override
protected void setProject(Project project) {
this.project = project;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
xmlMarshaller.marshal(getWriteControlObject(), builder);
@@ -84,11 +87,13 @@
assertXMLIdentical(controlDocument, testDocument);
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
Document testDocument = xmlMarshaller.objectToXML(getWriteControlObject());
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
StringWriter writer = new StringWriter();
xmlMarshaller.marshal(getWriteControlObject(), writer);
@@ -100,6 +105,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setNamespaceAware(true);
@@ -113,6 +119,7 @@
xmlToObjectTest(xmlUnmarshallerHandler.getResult());
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
Object testObject = xmlUnmarshaller.unmarshal(instream);
@@ -120,12 +127,14 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(resourceName);
Object testObject = xmlUnmarshaller.unmarshal(url);
xmlToObjectTest(testObject);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**xmlToObjectTest**");
log("Expected:");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/attributekey/CompositeAttributeKeysTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/attributekey/CompositeAttributeKeysTestCases.java
index e401a05..6ba09f1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/attributekey/CompositeAttributeKeysTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/attributekey/CompositeAttributeKeysTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeAttributeKeysProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList(4);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyEmptyTestCases.java
index f2e467b..abe8cb3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeElementKeyProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList(4);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyNSTestCases.java
index 8df9565..5fd15f0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeElementKeyNSProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList(4);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeySingleNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeySingleNodeTestCases.java
index 2bca830..dc0536a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeySingleNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeySingleNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeElementKeySingleNodeProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList(4);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyTestCases.java
index e89f958..4f30870 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeElementKeyProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList(4);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingEmptyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingEmptyTestCases.java
index 077063f..e2a554f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingEmptyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingEmptyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeElementKeyWithGroupingProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList(4);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingNSTestCases.java
index 9c33259..a9005a8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeElementKeyWithGroupingNSProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList(4);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingSingleNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingSingleNodeTestCases.java
index 4f0752c..30b0e0b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingSingleNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingSingleNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeElementKeyWithGroupingSingleNodeProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList(4);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingTestCases.java
index 2e72a34..1dc47ea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/elementkey/CompositeElementKeyWithGroupingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeElementKeyWithGroupingProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList(4);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/nestedattributekey/NestedAttributeKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/nestedattributekey/NestedAttributeKeyTestCases.java
index 6c718d5..e0ace8b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/nestedattributekey/NestedAttributeKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/compositekey/nestedattributekey/NestedAttributeKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new NestedAttributeKeyProject());
}
+ @Override
public Object getControlObject() {
ArrayList addresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/attributekey/SingleAttributeKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/attributekey/SingleAttributeKeyTestCases.java
index 30853bb..ff349fe 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/attributekey/SingleAttributeKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/attributekey/SingleAttributeKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new SingleAttributeKeyProject());
}
+ @Override
public Object getControlObject() {
ArrayList addresses = new ArrayList();
@@ -67,6 +68,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
ArrayList empAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementKeyTestCases.java
index 0f45d04..581e003 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new SingleElementKeyProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList();
@@ -67,6 +68,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
ArrayList empAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementKeyWithGroupingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementKeyWithGroupingTestCases.java
index 4426e18..ce3227b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementKeyWithGroupingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementKeyWithGroupingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new SingleElementKeyWithGroupingProject());
}
+ @Override
protected Object getControlObject() {
ArrayList addresses = new ArrayList();
@@ -68,6 +69,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
ArrayList empAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementNullReferenceClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementNullReferenceClassTestCases.java
index 650c0d0..5e54e8f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementNullReferenceClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/SingleElementNullReferenceClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@
try{
super.getXMLContext(p);
}catch(IntegrityException e){
- Exception internalException = (Exception)((IntegrityException)e).getIntegrityChecker().getCaughtExceptions().get(0);
+ Exception internalException = (Exception) e.getIntegrityChecker().getCaughtExceptions().get(0);
if (internalException instanceof DescriptorException) {
assertTrue("An incorrect DescriptorException exception occurred.", ((DescriptorException)internalException).getErrorCode() == DescriptorException.REFERENCE_CLASS_NOT_SPECIFIED);
return;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/maptests/SingleElementKeyUsingMapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/maptests/SingleElementKeyUsingMapTestCases.java
index 71a0cb5..c17590f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/maptests/SingleElementKeyUsingMapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/elementkey/maptests/SingleElementKeyUsingMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -123,14 +123,17 @@
writeControlObj.addresses = rootAddresses;
}
+ @Override
public Object getControlObject() {
return controlObj;
}
+ @Override
public Object getWriteControlObject() {
return writeControlObj;
}
+ @Override
public void objectToXMLDocumentTest(Document testDocument) throws Exception {
log("**objectToXMLDocumentTest**");
log("Expected:");
@@ -146,6 +149,7 @@
assertTrue(controlIds.getLength() == testIds.getLength());
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
xmlMarshaller.marshal(getWriteControlObject(), builder);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/nestedattributekey/NestedAttributeKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/nestedattributekey/NestedAttributeKeyTestCases.java
index 81b57e9..8f871e3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/nestedattributekey/NestedAttributeKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/nestedattributekey/NestedAttributeKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new NestedAttributeKeyProject());
}
+ @Override
public Object getControlObject() {
ArrayList addresses = new ArrayList();
@@ -67,6 +68,7 @@
root.addresses = addresses;
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
ArrayList empAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/nonstringkeytype/NonStringKeyTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/nonstringkeytype/NonStringKeyTypeTestCases.java
index 013ef26..fee4151 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/nonstringkeytype/NonStringKeyTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/multipletargets/singlekey/nonstringkeytype/NonStringKeyTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new NonStringKeyTypeProject());
}
+ @Override
public Object getControlObject() {
ArrayList addresses = new ArrayList();
Address address = new Address();
@@ -60,6 +61,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
ArrayList empAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/attributekey/CompositeAttributeKeysTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/attributekey/CompositeAttributeKeysTestCases.java
index e9370c0..b88f9a4 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/attributekey/CompositeAttributeKeysTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/attributekey/CompositeAttributeKeysTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeAttributeKeysProject());
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.id = CONTROL_ADD_ID_3;
@@ -48,6 +49,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/elementkey/CompositeElementKeysMissingIdTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/elementkey/CompositeElementKeysMissingIdTestCases.java
index f56e690..73d130e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/elementkey/CompositeElementKeysMissingIdTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/elementkey/CompositeElementKeysMissingIdTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new CompositeElementKeysProject());
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.id = CONTROL_ADD_ID_2;
@@ -52,6 +53,7 @@
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
@@ -98,6 +100,7 @@
return root;
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception{
try{
super.testXMLToObjectFromInputStream();
@@ -108,6 +111,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testUnmarshallerHandler() throws Exception{
try{
super.testUnmarshallerHandler();
@@ -118,6 +122,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testXMLToObjectFromNode() throws Exception{
try{
super.testXMLToObjectFromNode();
@@ -128,6 +133,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testXMLToObjectFromURL() throws Exception{
try{
super.testXMLToObjectFromURL();
@@ -138,6 +144,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception{
try{
super.testXMLToObjectFromXMLEventReader();
@@ -148,6 +155,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception{
try{
super.testXMLToObjectFromXMLStreamReader();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/elementkey/CompositeElementKeysTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/elementkey/CompositeElementKeysTestCases.java
index c7ca350..7aff5f3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/elementkey/CompositeElementKeysTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/elementkey/CompositeElementKeysTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeElementKeysProject());
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.id = CONTROL_ADD_ID_2;
@@ -49,6 +50,7 @@
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/mixedkey/CompositeMixedKeysTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/mixedkey/CompositeMixedKeysTestCases.java
index 3ae3a52..6fb5eee 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/mixedkey/CompositeMixedKeysTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/mixedkey/CompositeMixedKeysTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeMixedKeysProject());
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.id = CONTROL_ADD_ID_3;
@@ -48,6 +49,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/nestedattributekey/NestedAttributeKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/nestedattributekey/NestedAttributeKeyTestCases.java
index 1b036e8..460edc0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/nestedattributekey/NestedAttributeKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/nestedattributekey/NestedAttributeKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new NestedAttributeKeyProject());
}
+ @Override
public Object getControlObject() {
ArrayList addresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/nonstringkeytype/CompositeNonStringKeyTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/nonstringkeytype/CompositeNonStringKeyTypeTestCases.java
index 3f8f61b..a7fbd0e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/nonstringkeytype/CompositeNonStringKeyTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/compositekey/nonstringkeytype/CompositeNonStringKeyTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new CompositeNonStringKeyTypeProject());
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.id = INT_CONTROL_ADD_ID_2;
@@ -49,6 +50,7 @@
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeEmptyKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeEmptyKeyTestCases.java
index 28ef7a2..7e3924f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeEmptyKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeEmptyKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new SingleAttributeKeyProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = "222";
@@ -39,6 +40,7 @@
return root;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream(XML_WRITE_RESOURCE);
Document doc = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeInvalidKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeInvalidKeyTestCases.java
index d3fa5ad..37dce76 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeInvalidKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeInvalidKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new SingleAttributeKeyProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = "222";
@@ -39,6 +40,7 @@
return root;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream(XML_WRITE_RESOURCE);
Document doc = parser.parse(inputStream);
@@ -47,6 +49,7 @@
return doc;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
Address address = new Address();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeKeyTestCases.java
index 33587bf..c9fa93e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new SingleAttributeKeyProject());
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.id = CONTROL_ADD_ID_1;
@@ -48,6 +49,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeNullKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeNullKeyTestCases.java
index 1dfc0f1..aa1d92a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeNullKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/SingleAttributeNullKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setProject(new SingleAttributeKeyProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = "222";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/threadsafety/ReferenceUnmarshaller.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/threadsafety/ReferenceUnmarshaller.java
index 29229ec..6ae62ff 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/threadsafety/ReferenceUnmarshaller.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/attributekey/threadsafety/ReferenceUnmarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
this.controlStreet = controlStreet;
}
+ @Override
public void run() {
for(int i = 0; i < 2000; i++) {
StringReader reader = new StringReader(resource);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementEmptyKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementEmptyKeyTestCases.java
index 307b452..e8eb763 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementEmptyKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementEmptyKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new SingleElementKeyProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = "222";
@@ -39,6 +40,7 @@
return root;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream(XML_WRITE_RESOURCE);
Document doc = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementInvalidKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementInvalidKeyTestCases.java
index 30deaa4..814d3ef 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementInvalidKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementInvalidKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new SingleElementKeyProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = "222";
@@ -41,6 +42,7 @@
return root;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream(XML_WRITE_RESOURCE);
Document doc = parser.parse(inputStream);
@@ -49,6 +51,7 @@
return doc;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
Address address = new Address();
@@ -88,6 +91,7 @@
return root;
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception{
try{
super.testXMLToObjectFromInputStream();
@@ -98,6 +102,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testUnmarshallerHandler() throws Exception{
try{
super.testUnmarshallerHandler();
@@ -108,6 +113,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testXMLToObjectFromNode() throws Exception{
try{
super.testXMLToObjectFromNode();
@@ -118,6 +124,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testXMLToObjectFromURL() throws Exception{
try{
super.testXMLToObjectFromURL();
@@ -128,6 +135,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception{
try{
super.testXMLToObjectFromXMLEventReader();
@@ -138,6 +146,7 @@
fail("An error should have occurred.");
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception{
try{
super.testXMLToObjectFromXMLStreamReader();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementKeyTestCases.java
index 5d8c165..3e3bb99 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new SingleElementKeyProject());
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.id = CONTROL_ADD_ID_2;
@@ -48,6 +49,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementNullKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementNullKeyTestCases.java
index 597a0a2..cc5fa69 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementNullKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementNullKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setProject(new SingleElementKeyProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.id = CONTROL_ID;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementNullReferenceClassTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementNullReferenceClassTestCases.java
index cb3b088..bcd55af 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementNullReferenceClassTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/elementkey/SingleElementNullReferenceClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@
try{
super.getXMLContext(p);
}catch(IntegrityException e){
- Exception internalException = (Exception)((IntegrityException)e).getIntegrityChecker().getCaughtExceptions().get(0);
+ Exception internalException = (Exception) e.getIntegrityChecker().getCaughtExceptions().get(0);
if (internalException instanceof DescriptorException) {
assertTrue("An incorrect DescriptorException exception occurred.", ((DescriptorException)internalException).getErrorCode() == DescriptorException.REFERENCE_CLASS_NOT_SPECIFIED);
return;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/multiplesource/MultipleSourceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/multiplesource/MultipleSourceTestCases.java
index 5593cfc..7cd5b03 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/multiplesource/MultipleSourceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/multiplesource/MultipleSourceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new MultipleSourceProject());
}
+ @Override
protected Object getControlObject() {
java.util.Vector addresses = new Vector();
Vector employees = new Vector();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nestedattributekey/NestedAttributeKeyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nestedattributekey/NestedAttributeKeyTestCases.java
index a1a6848..a2f9324 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nestedattributekey/NestedAttributeKeyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nestedattributekey/NestedAttributeKeyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new NestedAttributeKeyProject());
}
+ @Override
public Object getControlObject() {
ArrayList addresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nonstringkeytype/Address.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nonstringkeytype/Address.java
index 18c4dfc..abd672b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nonstringkeytype/Address.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nonstringkeytype/Address.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public String country;
public String zip;
+ @Override
public Object getKey() {
return id;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nonstringkeytype/NonStringKeyTypeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nonstringkeytype/NonStringKeyTypeTestCases.java
index 9c507ea..fb1b029 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nonstringkeytype/NonStringKeyTypeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/keybased/singletarget/singlekey/nonstringkeytype/NonStringKeyTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new NonStringKeyTypeProject());
}
+ @Override
protected Object getControlObject() {
Address address = new Address();
address.id = INT_CONTROL_ADD_ID_1;
@@ -46,6 +47,7 @@
return root;
}
+ @Override
public Object getWriteControlObject() {
ArrayList rootAddresses = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/ChildAndGeneratedPrefixClashTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/ChildAndGeneratedPrefixClashTestCases.java
index b254e67..4b25d43 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/ChildAndGeneratedPrefixClashTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/ChildAndGeneratedPrefixClashTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
//xmlMarshaller.setShouldWriteExtraNamespaces(true);
}
+ @Override
protected Object getControlObject() {
Root theRoot = new Root();
@@ -77,9 +78,11 @@
return theRoot;
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
}
+ @Override
public void testObjectToXMLEventWriter() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/DefaultNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/DefaultNamespaceTestCases.java
index 59ec70c..eb2412c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/DefaultNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/DefaultNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new DefaultNamespaceProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setId(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/ExtraNamespacesBug6004272TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/ExtraNamespacesBug6004272TestCases.java
index 0e9ed45..1e186b8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/ExtraNamespacesBug6004272TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/ExtraNamespacesBug6004272TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
//xmlMarshaller.setShouldWriteExtraNamespaces(true);
}
+ @Override
protected Object getControlObject() {
Root theRoot = new Root();
@@ -165,6 +166,7 @@
return theRoot ;
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/GloballyDefinedNodesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/GloballyDefinedNodesTestCases.java
index 4f4ebad..98f85e7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/GloballyDefinedNodesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/GloballyDefinedNodesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new GloballyDefinedNodesProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setId(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/LocallyDefinedNodesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/LocallyDefinedNodesTestCases.java
index ede25da..f6db345 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/LocallyDefinedNodesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/LocallyDefinedNodesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new LocallyDefinedNodesProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setId(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/NoNamespacesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/NoNamespacesTestCases.java
index be44071..c50a333 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/NoNamespacesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/NoNamespacesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
setProject(new NoNamespacesProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setId(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/DefaultNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/DefaultNamespaceTestCases.java
index f05382c..23bd144 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/DefaultNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/DefaultNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new DefaultNamespaceProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setId(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/DefaultNamespaceXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/DefaultNamespaceXMLRootTestCases.java
index 9621e82..6338808 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/DefaultNamespaceXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/DefaultNamespaceXMLRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(new DefaultNamespaceProject());
}
+ @Override
public Object getWriteControlObject() {
XMLRoot root = new XMLRoot();
root.setLocalName("employee");
@@ -40,6 +41,7 @@
return root;
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
employee.setId(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/GloballyDefinedNodesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/GloballyDefinedNodesTestCases.java
index 97cb44b..5987ca2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/GloballyDefinedNodesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/GloballyDefinedNodesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new GloballyDefinedNodesProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setId(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/LocallyDefinedNodesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/LocallyDefinedNodesTestCases.java
index 5023143..8f6a3a7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/LocallyDefinedNodesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/LocallyDefinedNodesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new LocallyDefinedNodesProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setId(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/NoNamespacesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/NoNamespacesTestCases.java
index 5d81dcb..ab86cf5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/NoNamespacesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/namespaces/identifiedbyname/NoNamespacesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
setProject(new NoNamespacesProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setId(CONTROL_ID);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/AttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/AttributeTestCases.java
index 34b22c8..e038529 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/AttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/AttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(EMPLOYEE_PROJECT);
}
+ @Override
public Object getControlObject() {
Employee controlEmployee = new Employee();
controlEmployee.setId(CONTROL_EMPLOYEE_ID);
@@ -52,6 +53,7 @@
return controlEmployee;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
Employee testEmployee = (Employee) testObject;
assertEquals(1, testEmployee.getSettings().size());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Comparer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Comparer.java
index 6ef326b..7a8cead 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Comparer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Comparer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,7 +65,7 @@
return false;
}
try {
- if(!Comparer.equals((List<Setting>) control.getChildren(), (List<Setting>)test.getChildren())) {
+ if(!Comparer.equals(control.getChildren(), test.getChildren())) {
return false;
}
} catch(ClassCastException e) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Dependent.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Dependent.java
index 7be913e..254e3bd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Dependent.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Dependent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,6 +50,7 @@
this.lastName = lastName;
}
+ @Override
public List<Setting> getSettings() {
return settings;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Employee.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Employee.java
index 978c494..60187f5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Employee.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -100,6 +100,7 @@
this.address = address;
}
+ @Override
public List<Setting> getSettings() {
return settings;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/GroupingElementDistinctTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/GroupingElementDistinctTestCases.java
index c0a91ae..d5f583b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/GroupingElementDistinctTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/GroupingElementDistinctTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(EMPLOYEE_PROJECT);
}
+ @Override
public Object getControlObject() {
SequencedObject controlEmployee = new Employee();
@@ -65,6 +66,7 @@
return controlEmployee;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
Employee testEmployee = (Employee) testObject;
assertEquals(2, testEmployee.getSettings().size());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/GroupingElementSharedTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/GroupingElementSharedTestCases.java
index 5235657..27129fa 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/GroupingElementSharedTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/GroupingElementSharedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(EMPLOYEE_PROJECT);
}
+ @Override
public Object getControlObject() {
SequencedObject controlEmployee = new Employee();
@@ -61,6 +62,7 @@
return controlEmployee;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
Employee testEmployee = (Employee) testObject;
assertEquals(1, testEmployee.getSettings().size());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MappingsTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MappingsTestCases.java
index f4abe99..026e4f7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MappingsTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MappingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
setProject(EMPLOYEE_PROJECT);
}
+ @Override
public Object getControlObject() {
Document document;
try {
@@ -194,6 +195,7 @@
return dependent;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
Employee testEmployee = (Employee) testObject;
// assertEquals(10, testEmployee.getSettings().size());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextFirstTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextFirstTestCases.java
index b49aca8..3ec02ca 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextFirstTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextFirstTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(EMPLOYEE_PROJECT);
}
+ @Override
public PhoneNumber getControlObject() {
if(null != controlPhoneNumber) {
return controlPhoneNumber;
@@ -69,6 +70,7 @@
return controlPhoneNumber;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
PhoneNumber testPhoneNumber = (PhoneNumber) testObject;
assertEquals(getControlObject().getSettings().size(), testPhoneNumber.getSettings().size());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextLastTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextLastTestCases.java
index a43650b..ead4d68 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextLastTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextLastTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(EMPLOYEE_PROJECT);
}
+ @Override
public PhoneNumber getControlObject() {
if(null != controlPhoneNumber) {
return controlPhoneNumber;
@@ -69,6 +70,7 @@
return controlPhoneNumber;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
PhoneNumber testPhoneNumber = (PhoneNumber) testObject;
assertEquals(getControlObject().getSettings().size(), testPhoneNumber.getSettings().size());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextMiddleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextMiddleTestCases.java
index b5d4adf..dd79d5b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextMiddleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/MixedTextMiddleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setProject(EMPLOYEE_PROJECT);
}
+ @Override
public PhoneNumber getControlObject() {
if(null != controlPhoneNumber) {
return controlPhoneNumber;
@@ -69,6 +70,7 @@
return controlPhoneNumber;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
PhoneNumber testPhoneNumber = (PhoneNumber) testObject;
assertEquals(getControlObject().getSettings().size(), testPhoneNumber.getSettings().size());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/PhoneNumber.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/PhoneNumber.java
index 9c5da20..5e09a2a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/PhoneNumber.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/PhoneNumber.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
this.extension = extension;
}
+ @Override
public List<Setting> getSettings() {
// TODO Auto-generated method stub
return settings;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/SimpleAnyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/SimpleAnyTestCases.java
index e71326b..7a313cd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/SimpleAnyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/sequenced/SimpleAnyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(EMPLOYEE_PROJECT);
}
+ @Override
public Object getControlObject() {
Employee controlEmployee = new Employee();
@@ -49,6 +50,7 @@
return controlEmployee;
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
Employee testEmployee = (Employee) testObject;
assertEquals(1, testEmployee.getSettings().size());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/serializedobject/SerializedObjectMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/serializedobject/SerializedObjectMappingTestCases.java
index 86e9573..318800e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/serializedobject/SerializedObjectMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/serializedobject/SerializedObjectMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/serializedobject/employee1.xml");
}
+ @Override
public Object getControlObject() {
Employee emp = new Employee();
SerializableAddress hexAddress = new SerializableAddress();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childcollection/ChildCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childcollection/ChildCollectionTestCases.java
index 43dc219..f259d15 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childcollection/ChildCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childcollection/ChildCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childcollection/Employee.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childcollection/Employee.java
index 5e09302..43de9b2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childcollection/Employee.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childcollection/Employee.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,15 +58,15 @@
Vector phoneNumbers = employeeObject.getPhones();
- if (!(((Phone)(phoneNumbers.elementAt(0))).equals(phones.elementAt(0)))) {
+ if (!(phoneNumbers.elementAt(0).equals(phones.elementAt(0)))) {
return false;
}
- if (!(((Phone)(phoneNumbers.elementAt(1))).equals(phones.elementAt(1)))) {
+ if (!(phoneNumbers.elementAt(1).equals(phones.elementAt(1)))) {
return false;
}
- if (!(((Phone)(phoneNumbers.elementAt(2))).equals(phones.elementAt(2)))) {
+ if (!(phoneNumbers.elementAt(2).equals(phones.elementAt(2)))) {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childelement/ChildElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childelement/ChildElementTestCases.java
index 9850008..714338c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childelement/ChildElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/childelement/ChildElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/documentpreservation/DocumentPreservationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/documentpreservation/DocumentPreservationTestCases.java
index 603a870..a25f3a5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/documentpreservation/DocumentPreservationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/documentpreservation/DocumentPreservationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,6 +64,7 @@
platform = Platform.DOC_PRES;
}
+ @Override
protected Object getControlObject() {
Object result;
@@ -101,12 +102,12 @@
}
StringWriter stringWriter = new StringWriter();
XMLProjectWriter writer = new XMLProjectWriter();
- writer.write(new EmployeeProject(), stringWriter);
+ XMLProjectWriter.write(new EmployeeProject(), stringWriter);
StringReader reader = new StringReader(stringWriter.toString());
XMLProjectReader projectReader = new XMLProjectReader();
- Project newProject = projectReader.read(reader);
+ Project newProject = XMLProjectReader.read(reader);
XMLContext newContext = new XMLContext(newProject);
@@ -116,6 +117,7 @@
}
}
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream stream = ClassLoader.getSystemResourceAsStream(XML_CONTROL_RESOURCE);
Object testObject = getXMLContext().createUnmarshaller().unmarshal(stream);
@@ -128,17 +130,20 @@
xmlToObjectTest(testObject);
}
*/
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(XML_CONTROL_RESOURCE);
Object testObject = getXMLContext().createUnmarshaller().unmarshal(url);
xmlToObjectTest(testObject);
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
Document testDocument = getXMLContext().createMarshaller().objectToXML(getWriteControlObject());
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
StringWriter writer = new StringWriter();
XMLMarshaller marshaller = getXMLContext().createMarshaller();
@@ -165,6 +170,7 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToOutputStream() throws Exception {
ByteArrayOutputStream stream = new ByteArrayOutputStream();
XMLMarshaller marshaller = getXMLContext().createMarshaller();
@@ -175,6 +181,7 @@
Document testDocument = parser.parse(is);
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToOutputStreamASCIIEncoding() throws Exception {
ByteArrayOutputStream stream = new ByteArrayOutputStream();
XMLMarshaller marshaller = getXMLContext().createMarshaller();
@@ -187,12 +194,15 @@
objectToXMLDocumentTest(testDocument);
}
+ @Override
public void testObjectToXMLStreamWriter() throws Exception {
}
+ @Override
public void testObjectToXMLEventWriter() throws Exception {
}
+ @Override
public void testUnmarshallerHandler() throws Exception {
SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setNamespaceAware(true);
@@ -209,6 +219,7 @@
xmlToObjectTest(xmlUnmarshallerHandler.getResult());
}
+ @Override
public void testObjectToContentHandler() throws Exception {
// DO NOTHING BECAUSE CONTENT HANDLER CAN NOT READ COMMENTS
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/inheritance/InheritanceRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/inheritance/InheritanceRootTestCases.java
index 001bb59..af6a759 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/inheritance/InheritanceRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/inheritance/InheritanceRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
XMLRoot theRoot = new XMLRoot();
theRoot.setLocalName("person");
@@ -49,6 +50,7 @@
return theRoot;
}
+ @Override
public Object getReadControlObject() {
Employee employee = new Employee();
employee.setFirstName(CONTROL_EMPLOYEE_FIRST_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementNullTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementNullTestCases.java
index 50f0d89..14f80a0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementNullTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
return employee;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementTestCases.java
index c5ab5daa..61d1fdd 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementWithCommentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementWithCommentTestCases.java
index 6f46152..4fe981f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementWithCommentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/RootElementWithCommentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
setProject(p);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setMarried(true);
@@ -50,6 +51,7 @@
return employee;
}
+ @Override
protected Document getWriteControlDocument() throws Exception {
String xmlResource = "org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/SimpleRootElementWithCommentTestWriting.xml";
InputStream inputStream = ClassLoader.getSystemResourceAsStream(xmlResource);
@@ -63,6 +65,7 @@
return writeControlDocument;
}
+ @Override
public void testObjectToContentHandler() throws Exception {
// DO NOTHING BECAUSE CONTENT HANDLER CAN NOT READ COMMENTS
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/positional/PositionalRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/positional/PositionalRootElementTestCases.java
index 0dd443c..97154ac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/positional/PositionalRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/rootelement/positional/PositionalRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setProject(new PositionalRootElementProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/childelement/TypeTranslatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/childelement/TypeTranslatorTestCases.java
index af2ddc0..38c0a08 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/childelement/TypeTranslatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/childelement/TypeTranslatorTestCases.java
@@ -34,6 +34,7 @@
setProject(new EmployeeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/rootelement/TypeTranslatorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/rootelement/TypeTranslatorTestCases.java
index 5618e75..d6e8b49 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/rootelement/TypeTranslatorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/simpletypes/typetranslator/rootelement/TypeTranslatorTestCases.java
@@ -31,6 +31,7 @@
setProject(new ByteHolderProject());
}
+ @Override
protected Object getControlObject() {
ByteHolder byteHolder = new ByteHolder();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/EndTimeTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/EndTimeTransformer.java
index 0ec218e..371b95a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/EndTimeTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/EndTimeTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
public class EndTimeTransformer extends FieldTransformerAdapter
{
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session)
{
Employee emp = (Employee)instance;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/NormalHoursAttributeTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/NormalHoursAttributeTransformer.java
index 0427bd6..3b5594c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/NormalHoursAttributeTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/NormalHoursAttributeTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
*/
public class NormalHoursAttributeTransformer extends AttributeTransformerAdapter
{
+ @Override
public Object buildAttributeValue(Record record, Object instance, Session session)
{
String[] hours = new String[2];
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/StartTimeTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/StartTimeTransformer.java
index 38e1fc1..147dc33 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/StartTimeTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/StartTimeTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
public class StartTimeTransformer extends FieldTransformerAdapter
{
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session)
{
Employee emp = (Employee)instance;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingAnyCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingAnyCollectionTestCases.java
index 627fd12..50bd76a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingAnyCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingAnyCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new TransformationMappingTestProject());
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingAnyObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingAnyObjectTestCases.java
index a9a2218..6d6d831 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingAnyObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingAnyObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new TransformationMappingTestProject());
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingCompositeCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingCompositeCollectionTestCases.java
index a935551..543ac3e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingCompositeCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingCompositeCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new TransformationMappingTestProject());
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingCompositeObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingCompositeObjectTestCases.java
index 5e01284..57179ca 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingCompositeObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingCompositeObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
setProject(new TransformationMappingTestProject());
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingErrorTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingErrorTestCases.java
index f42cc68..0a20d24 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingErrorTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingErrorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
XMLContext context;
XMLUnmarshaller unmarshaller;
+ @Override
public void setUp() {
context = new XMLContext("TransformationMappingSession");
marshaller = context.createMarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingPrefixTestCases.java
index 703dc70..501ef9e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/TransformationMappingPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
setWriteControlDocument("org/eclipse/persistence/testing/oxm/mappings/transformation/employee1.xml");
}
+ @Override
public Object getControlObject()
{
Employee emp = new Employee();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementNSTestCases.java
index 3f9991d..891c4ba 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setProject(new ElementNSProject());
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.setElement(CONTROL_ELEMENT);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementNSTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementNSTransformer.java
index 4f7a41d..9777cc9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementNSTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementNSTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
private XMLField intermediateField;
private XMLField endField;
+ @Override
public void initialize(AbstractTransformationMapping mapping) {
NamespaceResolver nsResolver = new NamespaceResolver();
nsResolver.put("ns", "urn:element");
@@ -47,6 +48,7 @@
endField.setNamespaceResolver(nsResolver);
}
+ @Override
public Object buildAttributeValue(Record record, Object object, Session session) {
if(null == record) {
return null;
@@ -64,6 +66,7 @@
}
}
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session) {
Root root = (Root) instance;
if(fieldName.endsWith(root.getElement())) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementTestCases.java
index d5dace6..95715a9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
setProject(new ElementProject());
}
+ @Override
protected Object getControlObject() {
Root root = new Root();
root.setElement(CONTROL_ELEMENT);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementTransformer.java
index 70b9e49..ac59f14 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/transformation/element/ElementTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,9 +27,11 @@
private static String XML_INTERMEDIATE = "INTERMEDIATE";
private static String XML_END = "END";
+ @Override
public void initialize(AbstractTransformationMapping mapping) {
}
+ @Override
public Object buildAttributeValue(Record record, Object object, Session session) {
if(null == record) {
return null;
@@ -46,6 +48,7 @@
}
}
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session) {
Root root = (Root) instance;
if(fieldName.equals(root.getElement())) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/typeddirect/TypedDirectMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/typeddirect/TypedDirectMappingTestCases.java
index 0db61f6..35beca8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/typeddirect/TypedDirectMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/typeddirect/TypedDirectMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -87,6 +87,7 @@
setProject(new TypedDirectMappingTestProject());
}
+ @Override
public Object getControlObject() {
try {
String base64 = "123456789";
@@ -198,6 +199,7 @@
return doc;
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentAttributeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentAttributeTestCases.java
index 3e53b37..077a597 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentAttributeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
setProject(new XMLFragmentAttributeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.firstName = "Jane";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentElementTestCases.java
index 3b28c6d..b83b4a5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
setProject(new XMLFragmentElementProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.firstName = "Jane";
@@ -63,21 +64,27 @@
try {
xmlMarshaller.marshal(obj, new ContentHandler() {
+ @Override
public void setDocumentLocator(Locator locator) {
}
+ @Override
public void startDocument() throws SAXException {
}
+ @Override
public void endDocument() throws SAXException {
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
if(atts.getLength() > 0) {
for(int i = 0; i < atts.getLength(); i++) {
@@ -88,18 +95,23 @@
}
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException {
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void processingInstruction(String target, String data) throws SAXException {
}
+ @Override
public void skippedEntity(String name) throws SAXException {
}
});
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentTextNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentTextNodeTestCases.java
index f9780f9..fad2925 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentTextNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragment/XMLFragmentTextNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setProject(new XMLFragmentTextNodeProject());
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.firstName = "Jane";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementDiffPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementDiffPrefixTestCases.java
index 2970602..6198709 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementDiffPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementDiffPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setControlDocument(XML_RESOURCE_DIFF_PFX);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.firstName = "Jane";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementDiffURITestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementDiffURITestCases.java
index 6992fb0..3e48069 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementDiffURITestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementDiffURITestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
setControlDocument(XML_RESOURCE_DIFF_URI);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.firstName = "Jane";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementTestCases.java
index 9093c14..2384a08 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
setControlDocument(XML_RESOURCE);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.firstName = "Jane";
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNSTestCases.java
index 6205fc5..d0d6e96 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
/**
* Should be overridden in subclasses
*/
+ @Override
protected Object getControlObject() {
return null;
}
@@ -62,6 +63,7 @@
return testDocument;
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
Object objectToWrite = getWriteControlObject();
XMLDescriptor desc = null;
@@ -84,6 +86,7 @@
assertXMLIdentical(getWriteControlDocument(), docToCompare);
}
+ @Override
public void testObjectToContentHandler() throws Exception {
SAXDocumentBuilder builder = new SAXDocumentBuilder();
Object objectToWrite = getWriteControlObject();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespaces2TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespaces2TestCases.java
index f61c2d5..f473f79 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespaces2TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespaces2TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/element_namespaces2.xml");
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
employee.firstName = "Jane";
@@ -62,6 +63,7 @@
TestRunner.main(arguments);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
@@ -80,6 +82,7 @@
assertEquals("http://www.example.com/test-uri", nsDecl.getValue());
}
+ @Override
public Document getWriteControlDocument() throws Exception {
java.io.InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/element_namespaces_write2.xml");
Document writeControlDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespaces3TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespaces3TestCases.java
index 47887dd..f21e397 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespaces3TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespaces3TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/element_namespaces3.xml");
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
employee.firstName = "Jane";
@@ -62,6 +63,7 @@
TestRunner.main(arguments);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
@@ -80,6 +82,7 @@
assertEquals("http://www.example.com/test-uri", nsDecl.getValue());
}
+ @Override
public Document getWriteControlDocument() throws Exception {
java.io.InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/element_namespaces_write3.xml");
Document writeControlDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespacesTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespacesTestCases.java
index 996779b..f05ef78 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespacesTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/XMLFragmentCollectionNamespacesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
setControlDocument("org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/element_namespaces.xml");
}
+ @Override
public Object getControlObject() {
Employee employee = new Employee();
employee.firstName = "Jane";
@@ -64,6 +65,7 @@
TestRunner.main(arguments);
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
super.xmlToObjectTest(testObject);
@@ -82,6 +84,7 @@
assertEquals("http://www.example.com/test-uri", nsDecl.getValue());
}
+ @Override
public Document getWriteControlDocument() throws Exception {
java.io.InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/mappings/xmlfragmentcollection/element_namespaces_write.xml");
Document writeControlDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformAdvancedXPathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformAdvancedXPathTestCases.java
index 67fcebe..ebbb519 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformAdvancedXPathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformAdvancedXPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() {
xmlPlatform = XMLPlatformFactory.getInstance().getXMLPlatform();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformCreateDocumentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformCreateDocumentTestCases.java
index 19bdb14..92a4a6a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformCreateDocumentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformCreateDocumentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,6 +15,8 @@
package org.eclipse.persistence.testing.oxm.platform;
import java.io.InputStream;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.platform.xml.XMLPlatform;
import org.eclipse.persistence.platform.xml.XMLPlatformFactory;
import org.eclipse.persistence.platform.xml.XMLPlatformException;
@@ -51,10 +53,10 @@
log(systemDocument);
log(controlDocument);
- this.assertEquals(controlDocType.getName(), systemDocType.getName());
- this.assertEquals(controlDocType.getNamespaceURI(), systemDocType.getNamespaceURI());
- this.assertEquals(controlDocType.getPublicId(), systemDocType.getPublicId());
- this.assertEquals(controlDocType.getSystemId(), systemDocType.getSystemId());
+ assertEquals(controlDocType.getName(), systemDocType.getName());
+ assertEquals(controlDocType.getNamespaceURI(), systemDocType.getNamespaceURI());
+ assertEquals(controlDocType.getPublicId(), systemDocType.getPublicId());
+ assertEquals(controlDocType.getSystemId(), systemDocType.getSystemId());
assertXMLIdentical(controlDocument, systemDocument);
@@ -103,10 +105,10 @@
log(publicDocument);
log(controlDocument);
- this.assertEquals(controlDocType.getName(), publicDocType.getName());
- this.assertEquals(controlDocType.getNamespaceURI(), publicDocType.getNamespaceURI());
- this.assertEquals(controlDocType.getPublicId(), publicDocType.getPublicId());
- this.assertEquals(controlDocType.getSystemId(), publicDocType.getSystemId());
+ assertEquals(controlDocType.getName(), publicDocType.getName());
+ assertEquals(controlDocType.getNamespaceURI(), publicDocType.getNamespaceURI());
+ assertEquals(controlDocType.getPublicId(), publicDocType.getPublicId());
+ assertEquals(controlDocType.getSystemId(), publicDocType.getSystemId());
assertXMLIdentical(controlDocument, publicDocument);
}
@@ -121,10 +123,10 @@
log(publicDocument);
log(controlDocument);
- this.assertEquals(controlDocType.getName(), publicDocType.getName());
- this.assertEquals(controlDocType.getNamespaceURI(), publicDocType.getNamespaceURI());
- this.assertEquals(controlDocType.getPublicId(), publicDocType.getPublicId());
- this.assertEquals(controlDocType.getSystemId(), publicDocType.getSystemId());
+ assertEquals(controlDocType.getName(), publicDocType.getName());
+ assertEquals(controlDocType.getNamespaceURI(), publicDocType.getNamespaceURI());
+ assertEquals(controlDocType.getPublicId(), publicDocType.getPublicId());
+ assertEquals(controlDocType.getSystemId(), publicDocType.getSystemId());
assertXMLIdentical(controlDocument, publicDocument);
@@ -227,6 +229,7 @@
}
public class MyEntityResolver implements EntityResolver {
+ @Override
public InputSource resolveEntity(String string, String string2) {
try {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/platform/manual.dtd");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformNamespaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformNamespaceTestCases.java
index 5cbfdab..9360302 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformNamespaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.oxm.platform;
+import junit.framework.TestCase;
import org.eclipse.persistence.platform.xml.XMLPlatform;
import org.eclipse.persistence.platform.xml.XMLPlatformFactory;
import org.eclipse.persistence.platform.xml.XMLPlatformException;
@@ -55,7 +56,7 @@
log("\nnamespace returned was: " + namespace);
- this.assertEquals("Incorrect namespace returned.",namespace,namespaceURI);
+ assertEquals("Incorrect namespace returned.",namespace,namespaceURI);
}
@@ -80,7 +81,7 @@
String namespace = xmlPlatform.resolveNamespacePrefix(secondElement, prefix);
log("\nnamespace returned was: " + namespace);
- this.assertEquals("Incorrect namespace returned.",namespace,namespaceURI);
+ assertEquals("Incorrect namespace returned.",namespace,namespaceURI);
}
@@ -103,6 +104,6 @@
String namespace = xmlPlatform.resolveNamespacePrefix(secondElement, prefix);
log("\nnamespace returned was: " + namespace);
- this.assertNull("Namespace should have been null but wasn't.", namespace);
+ assertNull("Namespace should have been null but wasn't.", namespace);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformValidateDocumentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformValidateDocumentTestCases.java
index 7b0d81f..0e75350 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformValidateDocumentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformValidateDocumentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public void setUp() {
xmlPlatform = XMLPlatformFactory.getInstance().getXMLPlatform();
xmlParser = xmlPlatform.newXMLParser();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformWhitespaceNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformWhitespaceNodeTestCases.java
index 4eb0330..3aca1ec 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformWhitespaceNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/PlatformWhitespaceNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,6 +16,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
+import junit.framework.TestCase;
import org.eclipse.persistence.platform.xml.XMLPlatform;
import org.eclipse.persistence.platform.xml.XMLPlatformFactory;
import org.eclipse.persistence.testing.oxm.OXTestCase;
@@ -42,7 +43,7 @@
Text textNode = createTextNode("this-is-not-whitespace");
boolean isWhiteSpaceNode = xmlPlatform.isWhitespaceNode(textNode);
- this.assertFalse(isWhiteSpaceNode);
+ assertFalse(isWhiteSpaceNode);
}
public void testWhitespaceNodeNull() throws Exception{
@@ -50,7 +51,7 @@
Text textNode = createTextNode(null);
boolean isWhiteSpaceNode = xmlPlatform.isWhitespaceNode(textNode);
- this.assertFalse(isWhiteSpaceNode);
+ assertFalse(isWhiteSpaceNode);
}
public void testWhitespaceNodeTrue() throws Exception{
@@ -58,7 +59,7 @@
Text textNode = createTextNode(" ");
boolean isWhiteSpaceNode = xmlPlatform.isWhitespaceNode(textNode);
- this.assertTrue(isWhiteSpaceNode);
+ assertTrue(isWhiteSpaceNode);
}
public void testWhitespaceNodeEmptyTrue() throws Exception{
@@ -66,6 +67,6 @@
Text textNode = createTextNode("");
boolean isWhiteSpaceNode = xmlPlatform.isWhitespaceNode(textNode);
- this.assertTrue(isWhiteSpaceNode);
+ assertTrue(isWhiteSpaceNode);
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/XMLComparerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/XMLComparerTestCases.java
index 7c953f7..9e081d9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/XMLComparerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/platform/XMLComparerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
xmlComparer = new XMLComparer();
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/reader/DOMReaderTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/reader/DOMReaderTestCases.java
index 841564d..c80fb87 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/reader/DOMReaderTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/reader/DOMReaderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,32 +64,43 @@
DOMReader domReader = new DOMReader();
domReader.setContentHandler(new ContentHandler() {
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
if(uri == null) {
throw new SAXException();
}
}
+ @Override
public void startDocument() throws SAXException {
}
+ @Override
public void skippedEntity(String name) throws SAXException {
}
+ @Override
public void setDocumentLocator(Locator locator) {
}
+ @Override
public void processingInstruction(String target, String data) throws SAXException {
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException {
if(uri == null) {
throw new SAXException();
}
}
+ @Override
public void endDocument() throws SAXException {
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
}
});
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/reader/TestContentHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/reader/TestContentHandler.java
index e0d9f3f..dfb3750 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/reader/TestContentHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/reader/TestContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,43 +31,54 @@
return events;
}
+ @Override
public void setDocumentLocator(Locator locator) {
}
+ @Override
public void startDocument() throws SAXException {
events.add(new StartDocumentEvent());
}
+ @Override
public void endDocument() throws SAXException {
events.add(new EndDocumentEvent());
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
events.add(new StartPrefixMappingEvent(prefix, uri));
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
events.add(new EndPrefixMappingEvent(prefix));
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
events.add(new StartElementEvent(uri, localName, qName));
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException {
events.add(new EndElementEvent(uri, localName, qName));
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
events.add(new CharactersEvent(new String(ch, start, length)));
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void processingInstruction(String target, String data) throws SAXException {
}
+ @Override
public void skippedEntity(String name) throws SAXException {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/CompositeCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/CompositeCollectionMappingTestCases.java
index 729a212..527f692 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/CompositeCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/CompositeCollectionMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
super("Tests Read-Only Direct Mappings");
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setIgnoringElementContentWhitespace(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/CompositeObjectMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/CompositeObjectMappingTestCases.java
index 7e16d51..36995bc 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/CompositeObjectMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/CompositeObjectMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super("Tests Read-Only Direct Mappings");
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setIgnoringElementContentWhitespace(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/DirectCollectionMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/DirectCollectionMappingTestCases.java
index 7e928d9..b74456f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/DirectCollectionMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/DirectCollectionMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super("Tests Read-Only Direct Mappings");
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setIgnoringElementContentWhitespace(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/DirectMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/DirectMappingTestCases.java
index 54e8173..791327a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/DirectMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/DirectMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super("Tests Read-Only Direct Mappings");
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setIgnoringElementContentWhitespace(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/NormalHours2Transformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/NormalHours2Transformer.java
index 502dc4d..63dcfc2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/NormalHours2Transformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/NormalHours2Transformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,9 +24,11 @@
public class NormalHours2Transformer implements FieldTransformer, AttributeTransformer
{
+ @Override
public void initialize(AbstractTransformationMapping mapping)
{
}
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session)
{
if(fieldName.equals("normal-hours/start-time/text()"))
@@ -35,6 +37,7 @@
}
return ((Employee)instance).normalHours2.elementAt(1);
}
+ @Override
public Object buildAttributeValue(Record record, Object instance, Session session)
{
Vector normalHours = new Vector(2);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/NormalHoursTransformer.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/NormalHoursTransformer.java
index d2b8f6d..53ae355 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/NormalHoursTransformer.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/NormalHoursTransformer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,9 +23,11 @@
public class NormalHoursTransformer implements AttributeTransformer, FieldTransformer
{
+ @Override
public void initialize(AbstractTransformationMapping mapping)
{
}
+ @Override
public Object buildFieldValue(Object instance, String fieldName, Session session)
{
if(fieldName.equals("normal-hours/start-time"))
@@ -34,6 +36,7 @@
}
return ((Employee)instance).normalHours2.elementAt(1);
}
+ @Override
public Object buildAttributeValue(Record record, Object instance, Session session)
{
Vector normalHours = new Vector(2);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/TransformationMappingTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/TransformationMappingTestCases.java
index d02bb62..d2e099a 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/TransformationMappingTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/readonly/TransformationMappingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super("Tests Read-Only Direct Mappings");
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setIgnoringElementContentWhitespace(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/CustomErrorHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/CustomErrorHandler.java
index 0cd2316..e2dc5c7 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/CustomErrorHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/CustomErrorHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,9 +20,11 @@
public class CustomErrorHandler extends DefaultHandler {
private boolean ignoredError = false;
+ @Override
public void warning(SAXParseException ex) throws SAXException {
System.out.println("Warning Raised: " + ex.getMessage());
}
+ @Override
public void error(SAXParseException ex) throws SAXException {
String message = ex.getMessage();
System.out.println("Error with message " + message + " being handled...");
@@ -35,6 +37,7 @@
throw ex;
}
}
+ @Override
public void fatalError(SAXParseException ex) throws SAXException {
System.out.println("Fatal Error Raised: " + ex.getMessage());
String message = ex.getMessage();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/SchemaReferenceErrorHandlerTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/SchemaReferenceErrorHandlerTests.java
index fcebebb..4cb41ae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/SchemaReferenceErrorHandlerTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/SchemaReferenceErrorHandlerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
public SchemaReferenceErrorHandlerTests(String name) {
super(name);
}
+ @Override
public void setUp() throws Exception {
java.net.URL schemaUrl = ClassLoader.getSystemClassLoader().getResource("org/eclipse/persistence/testing/oxm/schemareference/employee.xsd");
schemaRef = new XMLSchemaURLReference(schemaUrl);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaCPReferenceTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaCPReferenceTests.java
index 65a142b..d0f6dd8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaCPReferenceTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaCPReferenceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
schemaRef = new XMLSchemaClassPathReference("org/eclipse/persistence/testing/oxm/schemareference/employee.xsd");
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaFileReferenceTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaFileReferenceTests.java
index ae6a9fc..2408525 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaFileReferenceTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaFileReferenceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
public XMLSchemaFileReferenceTests(String name) {
super(name);
}
+ @Override
public void setUp() throws Exception {
java.net.URL schemaURL = ClassLoader.getSystemClassLoader().getResource("org/eclipse/persistence/testing/oxm/schemareference/employee.xsd");
schemaFile = new java.io.File(schemaURL.getFile());
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaURLReferenceTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaURLReferenceTests.java
index 7852d3f..5b84a3c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaURLReferenceTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/XMLSchemaURLReferenceTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
schemaUrl = ClassLoader.getSystemClassLoader().getResource("org/eclipse/persistence/testing/oxm/schemareference/employee.xsd");
schemaRef = new XMLSchemaURLReference(schemaUrl);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/unmarshal/EmployeeWithDefaultRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/unmarshal/EmployeeWithDefaultRootElementTestCases.java
index e5fd7ed..ff2ce2e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/unmarshal/EmployeeWithDefaultRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/unmarshal/EmployeeWithDefaultRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.oxm.schemareference.unmarshal;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.oxm.XMLRoot;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;
@@ -36,6 +37,7 @@
TestRunner.main(arguments);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
@@ -48,17 +50,21 @@
}
// THIS TEST DOES NOT APPLY
+ @Override
public void testObjectToXMLDocument() throws Exception {
}
// THIS TEST DOES NOT APPLY
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
}
// THIS TEST DOES NOT APPLY
+ @Override
public void testObjectToContentHandler() throws Exception {
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**testXMLDocumentToObject**");
log("Expected:");
@@ -69,8 +75,8 @@
XMLRoot controlObj = (XMLRoot) getReadControlObject();
XMLRoot testObj = (XMLRoot) testObject;
- this.assertEquals(controlObj.getLocalName(), testObj.getLocalName());
- this.assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
- this.assertEquals(controlObj.getObject(), testObj.getObject());
+ assertEquals(controlObj.getLocalName(), testObj.getLocalName());
+ assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
+ assertEquals(controlObj.getObject(), testObj.getObject());
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/unmarshal/EmployeeWithoutDefaultRootElementTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/unmarshal/EmployeeWithoutDefaultRootElementTestCases.java
index 81d0152..68cd4ae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/unmarshal/EmployeeWithoutDefaultRootElementTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/schemareference/unmarshal/EmployeeWithoutDefaultRootElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.oxm.schemareference.unmarshal;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.oxm.XMLRoot;
import org.eclipse.persistence.testing.oxm.mappings.XMLMappingTestCases;
@@ -36,6 +37,7 @@
TestRunner.main(arguments);
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
employee.setName(CONTROL_EMPLOYEE_NAME);
@@ -48,17 +50,21 @@
}
// THIS TEST DOES NOT APPLY
+ @Override
public void testObjectToXMLDocument() throws Exception {
}
// THIS TEST DOES NOT APPLY
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
}
// THIS TEST DOES NOT APPLY
+ @Override
public void testObjectToContentHandler() throws Exception {
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**testXMLDocumentToObject**");
log("Expected:");
@@ -69,8 +75,8 @@
XMLRoot controlObj = (XMLRoot) getReadControlObject();
XMLRoot testObj = (XMLRoot) testObject;
- this.assertEquals(controlObj.getLocalName(), testObj.getLocalName());
- this.assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
- this.assertEquals(controlObj.getObject(), testObj.getObject());
+ assertEquals(controlObj.getLocalName(), testObj.getLocalName());
+ assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
+ assertEquals(controlObj.getObject(), testObj.getObject());
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/InvalidContentHandler2.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/InvalidContentHandler2.java
index 401e27a..563d3c0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/InvalidContentHandler2.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/InvalidContentHandler2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,39 +24,51 @@
private InvalidContentHandler2() {
}
+ @Override
public void setUnmarshalRecord(UnmarshalRecord unmarshalRecord) {
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void endDocument() throws SAXException {
}
+ @Override
public void endElement(String uri, String localName, String name) throws SAXException {
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void processingInstruction(String target, String data) throws SAXException {
}
+ @Override
public void setDocumentLocator(Locator locator) {
}
+ @Override
public void skippedEntity(String name) throws SAXException {
}
+ @Override
public void startDocument() throws SAXException {
}
+ @Override
public void startElement(String uri, String localName, String name, Attributes atts) throws SAXException {
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/MyUnmappedContentHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/MyUnmappedContentHandler.java
index 67611d0..45f9180 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/MyUnmappedContentHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/MyUnmappedContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,39 +27,51 @@
INSTANCE_COUNTER++;
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void endDocument() throws SAXException {
}
+ @Override
public void endElement(String uri, String localName, String name) throws SAXException {
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
}
+ @Override
public void processingInstruction(String target, String data) throws SAXException {
}
+ @Override
public void setDocumentLocator(Locator locator) {
}
+ @Override
public void skippedEntity(String name) throws SAXException {
}
+ @Override
public void startDocument() throws SAXException {
}
+ @Override
public void startElement(String uri, String localName, String name, Attributes atts) throws SAXException {
}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {
}
+ @Override
public void setUnmarshalRecord(UnmarshalRecord unmarshalRecord) {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildTestCases.java
index de48324..4ff2bed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
junit.textui.TestRunner.main(new String[] { "-c", "org.eclipse.persistence.testing.oxm.unmapped.UnmappedChildTestCases" });
}
+ @Override
public void setUp() {
MyUnmappedContentHandler.INSTANCE_COUNTER = 0;
EmployeeProject employeeProject = new EmployeeProject();
@@ -75,6 +76,7 @@
fail("An exception should have occurred but didn't.");
}
+ @Override
public void tearDown() {
MyUnmappedContentHandler.INSTANCE_COUNTER = 0;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildWithAnyCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildWithAnyCollectionTestCases.java
index 77886d1..5a49460 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildWithAnyCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildWithAnyCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
super(name);
}
+ @Override
public void setUp() {
MyUnmappedContentHandler.INSTANCE_COUNTER = 0;
}
@@ -66,6 +67,7 @@
assertEquals(0, MyUnmappedContentHandler.INSTANCE_COUNTER);
}
+ @Override
public void tearDown() {
MyUnmappedContentHandler.INSTANCE_COUNTER = 0;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildWithAnyTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildWithAnyTestCases.java
index 9d3b2ae..60b336b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildWithAnyTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedChildWithAnyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
super(name);
}
+ @Override
public void setUp() {
MyUnmappedContentHandler.INSTANCE_COUNTER = 0;
}
@@ -48,6 +49,7 @@
assertEquals(2, MyUnmappedContentHandler.INSTANCE_COUNTER);
}
+ @Override
public void tearDown() {
MyUnmappedContentHandler.INSTANCE_COUNTER = 0;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedRootTestCases.java
index 3e7f9ed..b79a7b3 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/unmapped/UnmappedRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
junit.textui.TestRunner.main(new String[] { "-c", "org.eclipse.persistence.testing.oxm.unmapped.UnmappedRootTestCases" });
}
+ @Override
public void setUp() {
MyUnmappedContentHandler.INSTANCE_COUNTER = 0;
EmployeeProject employeeProject = new EmployeeProject();
@@ -72,6 +73,7 @@
fail("An exception should have occurred but didn't.");
}
+ @Override
public void tearDown() {
MyUnmappedContentHandler.INSTANCE_COUNTER = 0;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/anymappingtests/XMLBinderAnyCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/anymappingtests/XMLBinderAnyCollectionTestCases.java
index db91613..9d357a0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/anymappingtests/XMLBinderAnyCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/anymappingtests/XMLBinderAnyCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
super.useLogging = true;
}
+ @Override
public void setUp() throws Exception {
context = this.getXMLContext(new AnyCollectionWithGroupingElementProject());
marshaller = context.createMarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/anymappingtests/XMLBinderAnyObjectTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/anymappingtests/XMLBinderAnyObjectTestCases.java
index 698786c..9ba582f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/anymappingtests/XMLBinderAnyObjectTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/anymappingtests/XMLBinderAnyObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
super.useLogging = true;
}
+ @Override
public void setUp() throws Exception {
context = this.getXMLContext(new AnyObjectWithoutGroupingElementProject());
marshaller = context.createMarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/basictests/XMLBinderBasicTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/basictests/XMLBinderBasicTestCases.java
index 9bf9ae5..5fce375 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/basictests/XMLBinderBasicTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/basictests/XMLBinderBasicTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
context = this.getXMLContext(new BasicBinderTestsProject());
marshaller = context.createMarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/keybasedmappingtests/XMLBinderKeyBasedMappingTests.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/keybasedmappingtests/XMLBinderKeyBasedMappingTests.java
index f93c031..a443474 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/keybasedmappingtests/XMLBinderKeyBasedMappingTests.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlbinder/keybasedmappingtests/XMLBinderKeyBasedMappingTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,6 +47,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
context = this.getXMLContext(new SingleElementKeyProject());
marshaller = context.createMarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlcontext/byxpath/ByXPathNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlcontext/byxpath/ByXPathNSTestCases.java
index 53ae5ea..31c99d2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlcontext/byxpath/ByXPathNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlcontext/byxpath/ByXPathNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
namespaceResolver.put("a", "urn:customer");
}
+ @Override
public void setUp() {
xmlContext = getXMLContext(new CustomerNSProject());
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlcontext/byxpath/ByXPathTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlcontext/byxpath/ByXPathTestCases.java
index 4eee554..dc2cdae 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlcontext/byxpath/ByXPathTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlcontext/byxpath/ByXPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
super(name);
}
+ @Override
public void setUp() {
xmlContext = getXMLContext(new CustomerProject());
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/Base64TestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/Base64TestCases.java
index 6d7de5b..fe8f212 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/Base64TestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/Base64TestCases.java
@@ -28,6 +28,7 @@
super(name);
}
+ @Override
public void setUp() {
xcm = XMLConversionManager.getDefaultXMLManager();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/BooleanTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/BooleanTestCases.java
index 57e0544..08e4fed 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/BooleanTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/BooleanTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,6 +26,7 @@
super(name);
}
+ @Override
public void setUp() {
xmlConversionManager = XMLConversionManager.getDefaultXMLManager();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DateAndTimeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DateAndTimeTestCases.java
index 84789d3..ab1d77c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DateAndTimeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DateAndTimeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,6 +24,7 @@
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
+import junit.framework.TestCase;
import org.eclipse.persistence.exceptions.ConversionException;
import org.eclipse.persistence.exceptions.XMLConversionException;
import org.eclipse.persistence.internal.oxm.XMLConversionManager;
@@ -129,6 +130,7 @@
this.CONTROL_G_YEAR_MONTH = cal.getTimeInMillis();
}
+ @Override
public void setUp() {
xcm = XMLConversionManager.getDefaultXMLManager();
}
@@ -136,49 +138,49 @@
public void testUtilDateToUtilDate() {
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_1MS);
java.util.Date test = (java.util.Date)xcm.convertObject(control, java.util.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_default_null() {
java.util.Date utilDate = null;
String control = null;
String test = (String)xcm.convertObject(utilDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_default_0ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21T07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_default_1ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_1MS);
String control = "1975-02-21T07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_default_10ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_10MS);
String control = "1975-02-21T07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_default_100ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_100MS);
String control = "1975-02-21T07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_date_null() {
java.util.Date utilDate = null;
String control = null;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_dateTime_before_epoch() {
@@ -197,7 +199,7 @@
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
boolean passed = control.equals(test) || zControl.equals(test);
- this.assertTrue(passed);
+ assertTrue(passed);
}
public void testUtilDateToString_dateTime_negative_year() throws Exception{
@@ -218,154 +220,154 @@
java.util.Date utilDate = cal.getTime();
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_date() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21";
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_dateTime_null() {
java.util.Date utilDate = null;
String control = null;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_dateTime_0ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21T07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_dateTime_1ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_1MS);
String control = "1975-02-21T07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_dateTime_10ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_10MS);
String control = "1975-02-21T07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_dateTime_100ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_100MS);
String control = "1975-02-21T07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_time_null() {
java.util.Date utilDate = null;
String control = null;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_time_0ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_0MS);
String control = "07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_time_1ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_1MS);
String control = "07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_time_10ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_10MS);
String control = "07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_time_100ms() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_100MS);
String control = "07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gDay_null() {
java.util.Date utilDate = null;
String control = null;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gDay() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_0MS);
String control = "---21";
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gMonth_null() {
java.util.Date utilDate = null;
String control = null;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gMonth() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_0MS);
String control = "--02";
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gMonthDay_null() {
java.util.Date utilDate = null;
String control = null;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gMonthDay() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_0MS);
String control = "--02-21";
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gYear_null() {
java.util.Date utilDate = null;
String control = null;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gYear() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_0MS);
String control = "1975";
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gYearMonth_null() {
java.util.Date utilDate = null;
String control = null;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_gYearMonth() {
java.util.Date utilDate = new java.util.Date(CONTROL_DATE_TIME_0MS);
String control = "1975-02";
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testUtilDateToString_default_dstTimeZone() {
@@ -374,7 +376,7 @@
xmlConversionManager.setTimeZoneQualified(true);
java.util.Date utilDate = (java.util.Date) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.util.Date.class);
String testString = (String) xmlConversionManager.convertObject(utilDate, String.class);
- this.assertEquals("2003-08-29T03:00:00-04:00", testString);
+ assertEquals("2003-08-29T03:00:00-04:00", testString);
}
public void testUtilDateToString_dateTime_dstTimeZone() {
@@ -383,7 +385,7 @@
xmlConversionManager.setTimeZoneQualified(true);
java.util.Date utilDate = (java.util.Date) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.util.Date.class);
String testString = (String) xmlConversionManager.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals("2003-08-29T03:00:00-04:00", testString);
+ assertEquals("2003-08-29T03:00:00-04:00", testString);
}
public void testUtilDateToString_time_dstTimeZone() {
@@ -392,42 +394,42 @@
xmlConversionManager.setTimeZoneQualified(true);
java.util.Date utilDate = (java.util.Date) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.util.Date.class);
String testString = (String) xmlConversionManager.convertObject(utilDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals("03:00:00-04:00", testString);
+ assertEquals("03:00:00-04:00", testString);
}
public void testStringToUtilDate_default_null() {
String string = null;
java.util.Date control = null;
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_default_0ms() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_0MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_default_1ms() {
String string = " \t 1975-02-21T07:47:15.001 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_1MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_default_10ms() {
String string = " \t 1975-02-21T07:47:15.01 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_10MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_default_100ms() {
String string = " \t 1975-02-21T07:47:15.1 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_100MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_default_negative1() {
@@ -489,21 +491,21 @@
String string = null;
java.util.Date control = null;
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_date() {
String string = " \t 1975-02-21 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_date_negative1() {
String string = "1975-02-21T07:47:15";
java.util.Date control = new java.util.Date(CONTROL_DATE);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_date_negative2() {
@@ -543,42 +545,42 @@
String string = null;
java.util.Date control = null;
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_dateTime() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_0MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_dateTime_0ms() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_0MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_dateTime_1ms() {
String string = " \t 1975-02-21T07:47:15.001 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_1MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_dateTime_10ms() {
String string = " \t 1975-02-21T07:47:15.01 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_10MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_dateTime_100ms() {
String string = " \t 1975-02-21T07:47:15.1 \t ";
java.util.Date control = new java.util.Date(CONTROL_DATE_TIME_100MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_dateTime_negative1() {
@@ -629,42 +631,42 @@
String string = null;
java.util.Date control = null;
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_time() {
String string = " \t 07:47:15 \t ";
java.util.Date control = new java.util.Date(CONTROL_TIME_0MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_time_0ms() {
String string = " \t 07:47:15 \t ";
java.util.Date control = new java.util.Date(CONTROL_TIME_0MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_time_1ms() {
String string = " \t 07:47:15.001 \t ";
java.util.Date control = new java.util.Date(CONTROL_TIME_1MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_time_10ms() {
String string = " \t 07:47:15.01 \t ";
java.util.Date control = new java.util.Date(CONTROL_TIME_10MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_time_100ms() {
String string = " \t 07:47:15.1 \t ";
java.util.Date control = new java.util.Date(CONTROL_TIME_100MS);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_time_negative1() {
@@ -713,14 +715,14 @@
String string = null;
java.util.Date control = null;
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gDay() {
String string = " \t ---21 \t ";
java.util.Date control = new java.util.Date(CONTROL_G_DAY);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gDay_negative1() {
@@ -738,14 +740,14 @@
String string = null;
java.util.Date control = null;
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gMonth() {
String string = " \t --02 \t ";
java.util.Date control = new java.util.Date(CONTROL_G_MONTH);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gMonth_negative1() {
@@ -763,14 +765,14 @@
String string = null;
java.util.Date control = null;
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gMonthDay() {
String string = " \t --02-21 \t ";
java.util.Date control = new java.util.Date(CONTROL_G_MONTH_DAY);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gMonthDay_negative1() {
@@ -788,14 +790,14 @@
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gYear() {
String string = " \t 1975 \t ";
java.util.Date control = new java.util.Date(CONTROL_G_YEAR);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gYear_negative1() {
@@ -813,14 +815,14 @@
String string = null;
java.util.Date control = null;
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gYearMonth() {
String string = " \t 1975-02 \t ";
java.util.Date control = new java.sql.Date(CONTROL_G_YEAR_MONTH);
java.util.Date test = (java.util.Date)xcm.convertObject(string, java.util.Date.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToUtilDate_gYearMonth_negative1() {
@@ -838,175 +840,175 @@
public void testSqlDateToSqlDate() {
java.sql.Date control = new java.sql.Date(CONTROL_DATE);
java.sql.Date test = (java.sql.Date)xcm.convertObject(control, java.sql.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_default_null() {
java.sql.Date sqlDate = null;
String control = null;
String test = (String)xcm.convertObject(sqlDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_default() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21";
String test = (String)xcm.convertObject(sqlDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_date_null() {
java.sql.Date sqlDate = null;
String control = null;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_date() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21";
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_dateTime_null() {
java.sql.Date sqlDate = null;
String control = null;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_dateTime_0ms() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21T07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_dateTime_1ms() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_1MS);
String control = "1975-02-21T07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_dateTime_10ms() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_10MS);
String control = "1975-02-21T07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_dateTime_100ms() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_100MS);
String control = "1975-02-21T07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_time_null() {
java.sql.Date sqlDate = null;
String control = null;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_time_0ms() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_0MS);
String control = "07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_time_1ms() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_1MS);
String control = "07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_time_10ms() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_10MS);
String control = "07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_time_100ms() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_100MS);
String control = "07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gDay_null() {
java.sql.Date sqlDate = null;
String control = null;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gDay() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_0MS);
String control = "---21";
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gMonth_null() {
java.sql.Date sqlDate = null;
String control = null;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gMonth() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_0MS);
String control = "--02";
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gMonthDay_null() {
java.sql.Date sqlDate = null;
String control = null;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gMonthDay() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_0MS);
String control = "--02-21";
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gYear_null() {
java.sql.Date sqlDate = null;
String control = null;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gYear() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_0MS);
String control = "1975";
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gYearMonth_null() {
java.sql.Date sqlDate = null;
String control = null;
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_gYearMonth() {
java.sql.Date sqlDate = new java.sql.Date(CONTROL_DATE_TIME_0MS);
String control = "1975-02";
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlDateToString_dateTime_dstTimeZone() {
@@ -1015,7 +1017,7 @@
xmlConversionManager.setTimeZoneQualified(true);
java.sql.Date sqlDate = (java.sql.Date) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.sql.Date.class, XMLConstants.DATE_TIME_QNAME);
String testString = (String) xmlConversionManager.convertObject(sqlDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals("2003-08-29T03:00:00-04:00", testString);
+ assertEquals("2003-08-29T03:00:00-04:00", testString);
}
public void testSqlDateToString_time_dstTimeZone() {
@@ -1024,28 +1026,28 @@
xmlConversionManager.setTimeZoneQualified(true);
java.sql.Date sqlDate = (java.sql.Date) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.sql.Date.class, XMLConstants.DATE_TIME_QNAME);
String testString = (String) xmlConversionManager.convertObject(sqlDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals("03:00:00-04:00", testString);
+ assertEquals("03:00:00-04:00", testString);
}
public void testStringToSqlDate_default_null() {
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_default() {
String string = " \t 1975-02-21 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_DATE);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_default_negative1() {
String string = "1975-02-21T07:47:15";
java.sql.Date control = new java.sql.Date(CONTROL_DATE);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_default_negative2() {
@@ -1074,21 +1076,21 @@
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_date() {
String string = " \t 1975-02-21 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_DATE);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_date_negative1() {
String string = "1975-02-21T07:47:15";
java.sql.Date control = new java.sql.Date(CONTROL_DATE);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_date_negative2() {
@@ -1117,42 +1119,42 @@
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_dateTime() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_DATE_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_dateTime_0ms() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_DATE_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_dateTime_1ms() {
String string = " \t 1975-02-21T07:47:15.001 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_DATE_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_dateTime_10ms() {
String string = " \t 1975-02-21T07:47:15.01 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_DATE_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_dateTime_100ms() {
String string = " \t 1975-02-21T07:47:15.1 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_DATE_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_dateTime_negative1() {
@@ -1203,42 +1205,42 @@
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_time() {
String string = " \t 07:47:15 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_time_0ms() {
String string = " \t 07:47:15 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_time_1ms() {
String string = " \t 07:47:15.001 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_time_10ms() {
String string = " \t 07:47:15.01 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_time_100ms() {
String string = " \t 07:47:15.1 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_TIME_0MS);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_time_negative1() {
@@ -1278,14 +1280,14 @@
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gDay() {
String string = " \t ---21 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_G_DAY);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gDay_negative1() {
@@ -1303,14 +1305,14 @@
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gMonth() {
String string = " \t --02 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_G_MONTH);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gMonth_negative1() {
@@ -1328,14 +1330,14 @@
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gMonthDay() {
String string = " \t --02-21 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_G_MONTH_DAY);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gMonthDay_negative1() {
@@ -1353,14 +1355,14 @@
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gYear() {
String string = " \t 1975 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_G_YEAR);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gYear_negative1() {
@@ -1378,14 +1380,14 @@
String string = null;
java.sql.Date control = null;
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gYearMonth() {
String string = " \t 1975-02 \t ";
java.sql.Date control = new java.sql.Date(CONTROL_G_YEAR_MONTH);
java.sql.Date test = (java.sql.Date)xcm.convertObject(string, java.sql.Date.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlDate_gYearMonth_negative1() {
@@ -1403,14 +1405,14 @@
public void testSqlTimeToSqlTime() {
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(control, java.sql.Time.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_default_null() {
java.sql.Time sqlTime = null;
String control = null;
String test = (String)xcm.convertObject(sqlTime, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_default() {
@@ -1418,21 +1420,21 @@
String control = "07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class);
boolean passed = control.equals(test) || control.equals(test.replace("+01:00", "Z"));
- this.assertTrue(passed);
+ assertTrue(passed);
}
public void testSqlTimeToString_default_0ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_TIME_0MS);
String control = "07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_default_1ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_TIME_1MS);
String control = "07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public static void assertEquals(String control, String test) {
@@ -1448,182 +1450,182 @@
java.sql.Time sqlTime = new java.sql.Time(CONTROL_TIME_10MS);
String control = "07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_default_100ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_TIME_100MS);
String control = "07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_date_null() {
java.sql.Time sqlTime = null;
String control = null;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_date() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21";
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_dateTime_null() {
java.sql.Time sqlTime = null;
String control = null;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_dateTime() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21T07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_dateTime_0ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21T07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_dateTime_1ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_1MS);
String control = "1975-02-21T07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_dateTime_10ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_10MS);
String control = "1975-02-21T07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_dateTime_100ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_100MS);
String control = "1975-02-21T07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_time_null() {
java.sql.Time sqlTime = null;
String control = null;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_time() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_time_0ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_time_1ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_1MS);
String control = "07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_time_10ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_10MS);
String control = "07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_time_100ms() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_100MS);
String control = "07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gDay_null() {
java.sql.Time sqlTime = null;
String control = null;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gDay() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "---21";
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gMonth_null() {
java.sql.Time sqlTime = null;
String control = null;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gMonth() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "--02";
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gMonthDay_null() {
java.sql.Time sqlTime = null;
String control = null;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gMonthDay() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "--02-21";
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gYear_null() {
java.sql.Time sqlTime = null;
String control = null;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gYear() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "1975";
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gYearMonth_null() {
java.sql.Time sqlTime = null;
String control = null;
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_gYearMonth() {
java.sql.Time sqlTime = new java.sql.Time(CONTROL_DATE_TIME_0MS);
String control = "1975-02";
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimeToString_default_dstTimeZone() {
@@ -1632,7 +1634,7 @@
xmlConversionManager.setTimeZoneQualified(true);
java.sql.Time sqlTime = (java.sql.Time) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.sql.Time.class, XMLConstants.DATE_TIME_QNAME);
String testString = (String) xmlConversionManager.convertObject(sqlTime, String.class);
- this.assertEquals("03:00:00-04:00", testString);
+ assertEquals("03:00:00-04:00", testString);
}
public void testSqlTimeToString_dateTime_dstTimeZone() {
@@ -1641,7 +1643,7 @@
xmlConversionManager.setTimeZoneQualified(true);
java.sql.Time sqlTime = (java.sql.Time) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.sql.Time.class, XMLConstants.DATE_TIME_QNAME);
String testString = (String) xmlConversionManager.convertObject(sqlTime, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals("2003-08-29T03:00:00-04:00", testString);
+ assertEquals("2003-08-29T03:00:00-04:00", testString);
}
public void testSqlTimeToString_time_dstTimeZone() {
@@ -1650,49 +1652,49 @@
xmlConversionManager.setTimeZoneQualified(true);
java.sql.Time sqlTime = (java.sql.Time) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.sql.Time.class, XMLConstants.DATE_TIME_QNAME);
String testString = (String) xmlConversionManager.convertObject(sqlTime, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals("03:00:00-04:00", testString);
+ assertEquals("03:00:00-04:00", testString);
}
public void testStringToSqlTime_default_null() {
String string = null;
java.sql.Time control = null;
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_default() {
String string = " \t 07:47:15 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_default_0ms() {
String string = " \t 07:47:15 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_default_1ms() {
String string = " \t 07:47:15.001 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_default_10ms() {
String string = " \t 07:47:15.01 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_default_100ms() {
String string = " \t 07:47:15.1 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_default_negative1() {
@@ -1732,21 +1734,21 @@
String string = null;
java.sql.Time control = null;
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_date() {
String string = " \t 1975-02-21 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_DATE);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_date_negative1() {
String string = "1975-02-21T07:47:15";
java.sql.Time control = new java.sql.Time(CONTROL_DATE);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_date_negative2() {
@@ -1775,42 +1777,42 @@
String string = null;
java.sql.Time control = null;
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_dateTime() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_DATE_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_dateTime_0ms() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_DATE_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_dateTime_1ms() {
String string = " \t 1975-02-21T07:47:15.001 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_DATE_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_dateTime_10ms() {
String string = " \t 1975-02-21T07:47:15.01 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_DATE_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_dateTime_100ms() {
String string = " \t 1975-02-21T07:47:15.1 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_DATE_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_dateTime_negative1() {
@@ -1859,42 +1861,42 @@
String string = null;
java.sql.Time control = null;
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_time() {
String string = " \t 07:47:15 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_time_0ms() {
String string = " \t 07:47:15 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_time_1ms() {
String string = " \t 07:47:15.001 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_time_10ms() {
String string = " \t 07:47:15.01 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_time_100ms() {
String string = " \t 07:47:15.1 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_TIME_0MS);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_time_negative1() {
@@ -1932,14 +1934,14 @@
String string = null;
java.sql.Time control = null;
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gDay() {
String string = " \t ---21 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_G_DAY);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gDay_negative1() {
@@ -1957,14 +1959,14 @@
String string = null;
java.sql.Time control = null;
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gMonth() {
String string = " \t --02 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_G_MONTH);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gMonth_negative1() {
@@ -1982,14 +1984,14 @@
String string = null;
java.sql.Time control = null;
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gMonthDay() {
String string = " \t --02-21 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_G_MONTH_DAY);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gMonthDay_negative1() {
@@ -2007,14 +2009,14 @@
String string = null;
java.sql.Time control = null;
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gYear() {
String string = " \t 1975 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_G_YEAR);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gYear_negative1() {
@@ -2032,14 +2034,14 @@
String string = null;
java.sql.Time control = null;
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gYearMonth() {
String string = " \t 1975-02 \t ";
java.sql.Time control = new java.sql.Time(CONTROL_G_YEAR_MONTH);
java.sql.Time test = (java.sql.Time)xcm.convertObject(string, java.sql.Time.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToSqlTime_gYearMonth_negative1() {
@@ -2057,42 +2059,42 @@
public void testTimestampToTimestamp() {
Timestamp control = new Timestamp(CONTROL_DATE_TIME_1MS);
Timestamp test = (Timestamp)xcm.convertObject(control, Timestamp.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_default_null() {
java.sql.Timestamp timestamp = null;
String control = null;
String test = (String)xcm.convertObject(timestamp, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_default_0ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21T07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_default_1ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_1MS);
String control = "1975-02-21T07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_default_10ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_10MS);
String control = "1975-02-21T07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_default_100ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_100MS);
String control = "1975-02-21T07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_default_123456789ns() {
@@ -2100,56 +2102,56 @@
timestamp.setNanos(123456789);
String control = "1975-02-21T07:47:15.123456789"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_date_null() {
java.sql.Timestamp timestamp = null;
String control = null;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_date() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21";
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_dateTime_null() {
java.sql.Timestamp timestamp = null;
String control = null;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_dateTime_0ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21T07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_dateTime_1ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_1MS);
String control = "1975-02-21T07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_dateTime_10ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_10MS);
String control = "1975-02-21T07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_dateTime_100ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_100MS);
String control = "1975-02-21T07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_dateTime_123456789ns() {
@@ -2157,7 +2159,7 @@
timestamp.setNanos(123456789);
String control = "1975-02-21T07:47:15.123456789"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_dateTime_negative_year_123456789ns() {
@@ -2181,7 +2183,7 @@
timestamp.setNanos(123456789);
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_dateTime_before_epoch_123456789ns() {
@@ -2201,42 +2203,42 @@
timestamp.setNanos(123456789);
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_time_null() {
java.sql.Timestamp timestamp = null;
String control = null;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_time_0ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
String control = "07:47:15"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_time_1ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_1MS);
String control = "07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_time_10ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_10MS);
String control = "07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_time_100ms() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_100MS);
String control = "07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_time_123456789ns() {
@@ -2244,77 +2246,77 @@
timestamp.setNanos(123456789);
String control = "07:47:15.123456789"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gDay_null() {
java.sql.Timestamp timestamp = null;
String control = null;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gDay() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
String control = "---21";
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gMonth_null() {
java.sql.Timestamp timestamp = null;
String control = null;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gMonth() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
String control = "--02";
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gMonthDay_null() {
java.sql.Timestamp timestamp = null;
String control = null;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gMonthDay() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
String control = "--02-21";
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gYear_null() {
java.sql.Timestamp timestamp = null;
String control = null;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gYear() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
String control = "1975";
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gYearMonth_null() {
java.sql.Timestamp timestamp = null;
String control = null;
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimestampToString_gYearMonth() {
java.sql.Timestamp timestamp = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
String control = "1975-02";
String test = (String)xcm.convertObject(timestamp, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testSqlTimestampToString_default_dstTimeZone() {
@@ -2323,7 +2325,7 @@
xmlConversionManager.setTimeZoneQualified(true);
java.sql.Timestamp sqlTimestamp = (java.sql.Timestamp) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
String testString = (String) xmlConversionManager.convertObject(sqlTimestamp, String.class);
- this.assertEquals("2003-08-29T03:00:00-04:00", testString);
+ assertEquals("2003-08-29T03:00:00-04:00", testString);
}
public void testSqlTimestampToString_dateTime_dstTimeZone() {
@@ -2332,7 +2334,7 @@
xmlConversionManager.setTimeZoneQualified(true);
java.sql.Timestamp sqlTimestamp = (java.sql.Timestamp) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
String testString = (String) xmlConversionManager.convertObject(sqlTimestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals("2003-08-29T03:00:00-04:00", testString);
+ assertEquals("2003-08-29T03:00:00-04:00", testString);
}
public void testSqlTimestampToString_time_dstTimeZone() {
@@ -2341,42 +2343,42 @@
xmlConversionManager.setTimeZoneQualified(true);
java.sql.Timestamp sqlTimestamp = (java.sql.Timestamp) xmlConversionManager.convertObject(CONTROL_DST_INPUT_DATE_TIME, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
String testString = (String) xmlConversionManager.convertObject(sqlTimestamp, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals("03:00:00-04:00", testString);
+ assertEquals("03:00:00-04:00", testString);
}
public void testStringToTimestamp_default_null() {
String string = null;
java.sql.Timestamp control = null;
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_default_0ms() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_default_1ms() {
String string = " \t 1975-02-21T07:47:15.001 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_1MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_default_10ms() {
String string = " \t 1975-02-21T07:47:15.01 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_10MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_default_100ms() {
String string = " \t 1975-02-21T07:47:15.1 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_100MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_default_123456789ms() {
@@ -2384,7 +2386,7 @@
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
control.setNanos(123456789);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_default_negative1() {
@@ -2446,21 +2448,21 @@
String string = null;
java.sql.Timestamp control = null;
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_date() {
String string = " \t 1975-02-21 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_date_negative1() {
String string = "1975-02-21T07:47:15";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_date_negative2() {
@@ -2489,42 +2491,42 @@
String string = null;
java.sql.Timestamp control = null;
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_dateTime() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_dateTime_0ms() {
String string = " \t 1975-02-21T07:47:15 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_dateTime_1ms() {
String string = " \t 1975-02-21T07:47:15.001 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_1MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_dateTime_10ms() {
String string = " \t 1975-02-21T07:47:15.01 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_10MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_dateTime_100ms() {
String string = " \t 1975-02-21T07:47:15.1 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_100MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_dateTime_123456789ms() {
@@ -2532,7 +2534,7 @@
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_DATE_TIME_0MS);
control.setNanos(123456789);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_dateTime_negative1() {
@@ -2581,49 +2583,49 @@
String string = null;
java.sql.Timestamp control = null;
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_time() {
String string = " \t 07:47:15 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_TIME_0MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_time_0ms() {
String string = " \t 07:47:15 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_TIME_0MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_time_1ms() {
String string = " \t 07:47:15.001 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_TIME_1MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_time_10ms() {
String string = " \t 07:47:15.01 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_TIME_10MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_time_100ms() {
String string = " \t 07:47:15.1 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_TIME_100MS);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_time_123456789ms() {
String string = " \t 07:47:15.123456789 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_TIME_0MS);
control.setNanos(123456789);
- java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.TIME_QNAME); this.assertEquals(control, test);
+ java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.TIME_QNAME); assertEquals(control, test);
}
public void testStringToTimestamp_time_negative1() {
@@ -2661,14 +2663,14 @@
String string = null;
java.sql.Timestamp control = null;
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gDay() {
String string = " \t ---21 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_G_DAY);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gDay_negative1() {
@@ -2686,14 +2688,14 @@
String string = null;
java.sql.Timestamp control = null;
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gMonth() {
String string = " \t --02 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_G_MONTH);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gMonth_negative1() {
@@ -2711,14 +2713,14 @@
String string = null;
java.sql.Timestamp control = null;
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gMonthDay() {
String string = " \t --02-21 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_G_MONTH_DAY);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gMonthDay_negative1() {
@@ -2736,14 +2738,14 @@
String string = null;
java.sql.Timestamp control = null;
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gYear() {
String string = " \t 1975 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_G_YEAR);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gYear_negative1() {
@@ -2761,14 +2763,14 @@
String string = null;
java.sql.Timestamp control = null;
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gYearMonth() {
String string = " \t 1975-02 \t ";
java.sql.Timestamp control = new java.sql.Timestamp(CONTROL_G_YEAR_MONTH);
java.sql.Timestamp test = (java.sql.Timestamp)xcm.convertObject(string, java.sql.Timestamp.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToTimestamp_gYearMonth_negative1() {
@@ -2786,14 +2788,14 @@
public void testCalendarToCalendar() {
Calendar control = Calendar.getInstance();
Calendar test = (Calendar)xcm.convertObject(control, Calendar.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_date_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_date() {
@@ -2804,14 +2806,14 @@
calendar.set(Calendar.DATE, 21);
String control = "1975-02-21";
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_dateTime_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_dateTime_0ms() {
@@ -2821,7 +2823,7 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02-21T07:47:15";
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_dateTime_1ms() {
@@ -2831,7 +2833,7 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02-21T07:47:15.001";
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_dateTime_10ms() {
@@ -2841,7 +2843,7 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02-21T07:47:15.01";
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_dateTime_100ms() {
@@ -2851,14 +2853,14 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02-21T07:47:15.1";
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_time_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_time_0ms() {
@@ -2870,7 +2872,7 @@
calendar.set(Calendar.MILLISECOND, 0);
String control = "07:47:15";
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_time_1ms() {
@@ -2882,7 +2884,7 @@
calendar.set(Calendar.MILLISECOND, 1);
String control = "07:47:15.001";
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_time_10ms() {
@@ -2894,7 +2896,7 @@
calendar.set(Calendar.MILLISECOND, 10);
String control = "07:47:15.01";
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_default_time_100ms() {
@@ -2906,14 +2908,14 @@
calendar.set(Calendar.MILLISECOND, 100);
String control = "07:47:15.1";
String test = (String)xcm.convertObject(calendar, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_date_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_date() {
@@ -2923,14 +2925,14 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02-21";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_dateTime_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_dateTime_0ms() {
@@ -2940,7 +2942,7 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02-21T07:47:15";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_dateTime_1ms() {
@@ -2950,7 +2952,7 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02-21T07:47:15.001";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_dateTime_10ms() {
@@ -2960,7 +2962,7 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02-21T07:47:15.01";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_dateTime_100ms() {
@@ -2970,14 +2972,14 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02-21T07:47:15.1";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_time_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_time_0ms() {
@@ -2987,7 +2989,7 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "07:47:15";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_time_1ms() {
@@ -2997,7 +2999,7 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "07:47:15.001";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_time_10ms() {
@@ -3007,7 +3009,7 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "07:47:15.01";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_time_100ms() {
@@ -3017,14 +3019,14 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "07:47:15.1";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gDay_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gDay() {
@@ -3034,14 +3036,14 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "---21";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gMonth_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gMonth() {
@@ -3051,14 +3053,14 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "--02";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gMonthDay_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gMonthDay() {
@@ -3068,14 +3070,14 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "--02-21";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gYear_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gYear() {
@@ -3085,14 +3087,14 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gYearMonth_null() {
Calendar calendar = null;
String control = null;
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testCalendarToString_gYearMonth() {
@@ -3102,14 +3104,14 @@
calendar.clear(Calendar.ZONE_OFFSET);
String control = "1975-02";
String test = (String)xcm.convertObject(calendar, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_default_dateTime_null() {
String string = null;
Calendar control = null;
Calendar test = (Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_default_dateTime() {
@@ -3118,7 +3120,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_0MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_dateTime_0ms() {
@@ -3127,7 +3129,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_0MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_dateTime_1ms() {
@@ -3136,7 +3138,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_1MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_dateTime_10ms() {
@@ -3145,7 +3147,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_10MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_dateTime_100ms() {
@@ -3154,14 +3156,14 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_100MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_date_null() {
String string = null;
Calendar control = null;
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_default_date() {
@@ -3170,14 +3172,14 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_time_null() {
String string = null;
Calendar control = null;
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_default_time() {
@@ -3186,7 +3188,7 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_0MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_time_0ms() {
@@ -3195,7 +3197,7 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_0MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_time_1ms() {
@@ -3204,7 +3206,7 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_1MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_time_10ms() {
@@ -3213,7 +3215,7 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_10MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_default_time_100ms() {
@@ -3222,14 +3224,14 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_100MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_date_null() {
String string = null;
Calendar control = null;
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_date() {
@@ -3238,7 +3240,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.DATE_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_date_negative1() {
@@ -3276,7 +3278,7 @@
String string = null;
Calendar control = null;
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_dateTime() {
@@ -3285,7 +3287,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_0MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.DATE_TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_dateTime_0ms() {
@@ -3294,7 +3296,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_0MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.DATE_TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_dateTime_1ms() {
@@ -3303,7 +3305,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_1MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.DATE_TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_dateTime_10ms() {
@@ -3312,7 +3314,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_10MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.DATE_TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_dateTime_100ms() {
@@ -3321,7 +3323,7 @@
control.clear();
control.setTimeInMillis(CONTROL_DATE_TIME_100MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.DATE_TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_dateTime_negative1() {
@@ -3370,7 +3372,7 @@
String string = null;
Calendar control = null;
Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_time() {
@@ -3379,7 +3381,7 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_0MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_time_0ms() {
@@ -3388,7 +3390,7 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_0MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_time_1ms() {
@@ -3397,7 +3399,7 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_1MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_time_10ms() {
@@ -3406,7 +3408,7 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_10MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_time_100ms() {
@@ -3415,7 +3417,7 @@
control.clear();
control.setTimeInMillis(CONTROL_TIME_100MS);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.TIME_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_time_negative1() {
@@ -3453,7 +3455,7 @@
String string = null;
Calendar control = null;
Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_gDay() {
@@ -3462,7 +3464,7 @@
control.clear();
control.setTimeInMillis(CONTROL_G_DAY);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_DAY_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_gDay_negative1() {
@@ -3480,7 +3482,7 @@
String string = null;
Calendar control = null;
Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_gMonth() {
@@ -3489,7 +3491,7 @@
control.clear();
control.setTimeInMillis(CONTROL_G_MONTH);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_MONTH_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_gMonth_negative1() {
@@ -3507,7 +3509,7 @@
String string = null;
Calendar control = null;
Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_gMonthDay() {
@@ -3516,7 +3518,7 @@
control.clear();
control.setTimeInMillis(CONTROL_G_MONTH_DAY);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_gMonthDay_negative1() {
@@ -3534,7 +3536,7 @@
String string = null;
Calendar control = null;
Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_gYear() {
@@ -3543,7 +3545,7 @@
control.clear();
control.setTimeInMillis(CONTROL_G_YEAR);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_YEAR_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_gYear_negative1() {
@@ -3561,7 +3563,7 @@
String string = null;
Calendar control = null;
Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testStringToCalendar_gYearMonth() {
@@ -3570,7 +3572,7 @@
control.clear();
control.setTimeInMillis(CONTROL_G_YEAR_MONTH);
java.util.Calendar test = (java.util.Calendar)xcm.convertObject(string, java.util.Calendar.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
+ assertTrue(control.getTimeInMillis() == test.getTimeInMillis());
}
public void testStringToCalendar_gYearMonth_negative1() {
@@ -3627,35 +3629,35 @@
public void testExtendedUtilDateToUtilDate() {
java.util.Date control = new ExtendedUtilDate(CONTROL_DATE_TIME_1MS);
java.util.Date test = (java.util.Date)xcm.convertObject(control, java.util.Date.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testExtendedUtilDateToString_default_100ms() {
java.util.Date utilDate = new ExtendedUtilDate(CONTROL_DATE_TIME_100MS);
String control = "1975-02-21T07:47:15.1"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testExtendedUtilDateToString_date() {
java.util.Date utilDate = new ExtendedUtilDate(CONTROL_DATE_TIME_0MS);
String control = "1975-02-21";
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testExtendedUtilDateToString_time_10ms() {
java.util.Date utilDate = new ExtendedUtilDate(CONTROL_DATE_TIME_10MS);
String control = "07:47:15.01"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testExtendedUtilDateToString_dateTime_1ms() {
java.util.Date utilDate = new ExtendedUtilDate(CONTROL_DATE_TIME_1MS);
String control = "1975-02-21T07:47:15.001"+TIMEZONE_OFFSET;
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
private static class ExtendedUtilDate extends java.util.Date {
@@ -3669,14 +3671,14 @@
String control = "0001-01-01";
java.sql.Date sqlDate = java.sql.Date.valueOf(control);
String test = (String)xcm.convertObject(sqlDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateToSQLDate_Date() {
String control = "0001-01-01";
java.sql.Date sqlDate = java.sql.Date.valueOf(control);
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateToSQLDate_DateTime() {
@@ -3684,7 +3686,7 @@
String input = "0001-01-01";
java.sql.Date sqlDate = java.sql.Date.valueOf(input);
String test = (String)xcm.convertObject(sqlDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
// java.sql.Timestamp -> String tests
@@ -3693,7 +3695,7 @@
String input = "0001-01-01 01:01:01";
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf(input);
String test = (String)xcm.convertObject(sqlTimestamp, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateTimeToSQLTimestamp_Date() {
@@ -3701,7 +3703,7 @@
String input = "0001-01-01 01:01:01";
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf(input);
String test = (String)xcm.convertObject(sqlTimestamp, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateTimeToSQLTimestamp_DateTime() {
@@ -3709,7 +3711,7 @@
String input = "0001-01-01 01:01:01.001";
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf(input);
String test = (String)xcm.convertObject(sqlTimestamp, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateTimeToSQLTimestamp_Time() {
@@ -3717,7 +3719,7 @@
String input = "0001-01-01 01:01:01.001";
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf(input);
String test = (String)xcm.convertObject(sqlTimestamp, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateTimeToSQLTimestamp_GDay() {
@@ -3725,7 +3727,7 @@
String input = "0001-01-01 01:01:01.001";
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf(input);
String test = (String)xcm.convertObject(sqlTimestamp, String.class, XMLConstants.G_DAY_QNAME);
- this.assertTrue(test.endsWith(control));
+ assertTrue(test.endsWith(control));
}
public void testPostADDateTimeToSQLTimestamp_GMonth() {
@@ -3733,7 +3735,7 @@
String input = "0001-01-01 01:01:01.001";
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf(input);
String test = (String)xcm.convertObject(sqlTimestamp, String.class, XMLConstants.G_MONTH_QNAME);
- this.assertTrue(test.endsWith(control));
+ assertTrue(test.endsWith(control));
}
public void testPostADDateTimeToSQLTimestamp_GMonthDay() {
@@ -3741,7 +3743,7 @@
String input = "0001-01-01 01:01:01.001";
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf(input);
String test = (String)xcm.convertObject(sqlTimestamp, String.class, XMLConstants.G_MONTH_DAY_QNAME);
- this.assertTrue(test.endsWith(control));
+ assertTrue(test.endsWith(control));
}
public void testPostADDateTimeToSQLTimestamp_GYearMonth() {
@@ -3749,7 +3751,7 @@
String input = "0001-01-01 01:01:01.001";
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf(input);
String test = (String)xcm.convertObject(sqlTimestamp, String.class, XMLConstants.G_YEAR_MONTH_QNAME);
- this.assertTrue(test.endsWith(control));
+ assertTrue(test.endsWith(control));
}
public void testPostADDateTimeToSQLTimestamp_GYear() {
@@ -3757,7 +3759,7 @@
String input = "0001-01-01 01:01:01.001";
java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf(input);
String test = (String)xcm.convertObject(sqlTimestamp, String.class, XMLConstants.G_YEAR_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
// java.util.Date -> String tests
@@ -3772,7 +3774,7 @@
java.util.Date utilDate = cal.getTime();
String test = (String)xcm.convertObject(utilDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateTimeToUtilDateWithHrMinSecMillis() {
@@ -3790,7 +3792,7 @@
java.util.Date utilDate = cal.getTime();
String test = (String)xcm.convertObject(utilDate, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateTimeToUtilDate_Date() {
@@ -3804,7 +3806,7 @@
java.util.Date utilDate = cal.getTime();
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateTimeToUtilDate_DateTime() {
@@ -3822,7 +3824,7 @@
java.util.Date utilDate = cal.getTime();
String test = (String)xcm.convertObject(utilDate, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
// java.sql.Time -> String tests
@@ -3833,7 +3835,7 @@
java.sql.Time sqlTime = java.sql.Time.valueOf(input);
String test = (String)xcm.convertObject(sqlTime, String.class);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testTimeToSQLTime_TIME() {
@@ -3843,7 +3845,7 @@
java.sql.Time sqlTime = java.sql.Time.valueOf(input);
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADTimeToSQLTime_Date() {
@@ -3862,7 +3864,7 @@
java.sql.Time sqlTime = new java.sql.Time(cal.getTimeInMillis());
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADTimeToSQLTime_DateTime() {
@@ -3881,7 +3883,7 @@
java.sql.Time sqlTime = new java.sql.Time(cal.getTimeInMillis());
String test = (String)xcm.convertObject(sqlTime, String.class, XMLConstants.DATE_TIME_QNAME);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
// String -> java.sql.Date tests
@@ -3889,14 +3891,14 @@
String control = "0001-01-01";
java.sql.Date sqlDate = (java.sql.Date) xcm.convertObject(control, java.sql.Date.class);
String test = sqlDate.toString();
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateStringToSQLDate_Date() {
String control = "0001-01-01";
java.sql.Date sqlDate = (java.sql.Date) xcm.convertObject(control, java.sql.Date.class, XMLConstants.DATE_QNAME);
String test = sqlDate.toString();
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
// String -> java.util.Date tests
@@ -3915,7 +3917,7 @@
cal.set(Calendar.MILLISECOND, 1);
java.util.Date control = cal.getTime();
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateStringToUtilDate_Date() {
@@ -3929,7 +3931,7 @@
cal.set(Calendar.DAY_OF_MONTH, 1);
java.util.Date control = cal.getTime();
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateStringToUtilDate_DateTime() {
@@ -3947,7 +3949,7 @@
cal.set(Calendar.MILLISECOND, 1);
java.util.Date control = cal.getTime();
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
// String -> java.sql.Timestamp tests
@@ -3966,7 +3968,7 @@
cal.set(Calendar.MILLISECOND, 1);
java.util.Date control = cal.getTime();
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateStringToSqlTimestamp_DateTime() {
@@ -3984,7 +3986,7 @@
cal.set(Calendar.MILLISECOND, 1);
java.util.Date control = cal.getTime();
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateStringToSqlTimestamp_Date() {
@@ -3998,7 +4000,7 @@
cal.set(Calendar.DAY_OF_MONTH, 1);
java.util.Date control = cal.getTime();
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateStringToSqlTimestamp_Time() {
@@ -4013,7 +4015,7 @@
cal.set(Calendar.MILLISECOND, 1);
java.util.Date control = cal.getTime();
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
// String -> java.sql.Time tests
@@ -4022,7 +4024,7 @@
java.sql.Time test = (java.sql.Time) xcm.convertObject(input, java.sql.Time.class);
java.sql.Time control = java.sql.Time.valueOf(input);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
public void testPostADDateStringToSqlTimeZeroed() {
@@ -4030,7 +4032,7 @@
java.sql.Time test = (java.sql.Time) xcm.convertObject(input, java.sql.Time.class);
java.sql.Time control = java.sql.Time.valueOf(input);
- this.assertEquals(control, test);
+ assertEquals(control, test);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DoubleToBigDecimalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DoubleToBigDecimalTestCases.java
index 4bc580d..fa4bb9f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DoubleToBigDecimalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/DoubleToBigDecimalTestCases.java
@@ -22,6 +22,7 @@
XMLConversionManager xmlConversionManager;
+ @Override
public void setUp() {
xmlConversionManager = XMLConversionManager.getDefaultXMLManager();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/ListTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/ListTestCases.java
index 9dd4eae..3bae042 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/ListTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/ListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
super(name);
}
+ @Override
public void setUp() {
xcm = XMLConversionManager.getDefaultXMLManager();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/NumberTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/NumberTestCases.java
index 6617993..526e73d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/NumberTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/NumberTestCases.java
@@ -27,6 +27,7 @@
XMLConversionManager xmlConversionManager;
+ @Override
public void setUp() {
xmlConversionManager = XMLConversionManager.getDefaultXMLManager();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/QNameTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/QNameTestCases.java
index 5fcc756..f286be1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/QNameTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/QNameTestCases.java
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() {
xcm = XMLConversionManager.getDefaultXMLManager();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/XMLGregorianCalendarTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/XMLGregorianCalendarTestCases.java
index fed4239..7f6db7c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/XMLGregorianCalendarTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlconversionmanager/XMLGregorianCalendarTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,12 +48,14 @@
setControlDocument("org/eclipse/persistence/testing/oxm/xmlconversionmanager/emp.xml");
}
+ @Override
public void setUp() throws Exception {
super.setUp();
getXmlConversionManager().setTimeZoneQualified(true);
getXmlConversionManager().setTimeZone(TimeZone.getTimeZone("GMT+3"));
}
+ @Override
public Object getControlObject() {
try {
Calendar cal = Calendar.getInstance();
@@ -87,6 +89,7 @@
}
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xmlconversionmanager/emp-write.xml");
Document doc = parser.parse(inputStream);
@@ -193,7 +196,7 @@
public void testConversionFromStringWithSchemaType() throws Exception {
String aString = "2009-02-17T07:30:00.000+03:00";
- XMLGregorianCalendar c = (XMLGregorianCalendar) getXmlConversionManager().convertStringToXMLGregorianCalendar(aString, XMLConstants.DATE_QNAME);
+ XMLGregorianCalendar c = getXmlConversionManager().convertStringToXMLGregorianCalendar(aString, XMLConstants.DATE_QNAME);
assertEquals("Calendar's 'hour' field was not cleared.", c.getHour(), DatatypeConstants.FIELD_UNDEFINED);
assertEquals("Calendar's 'minute' field was not cleared.", c.getMinute(), DatatypeConstants.FIELD_UNDEFINED);
@@ -208,7 +211,7 @@
public void testConversionFromEmptyString() throws Exception {
String aString = "";
try {
- XMLGregorianCalendar c = (XMLGregorianCalendar) getXmlConversionManager().convertStringToXMLGregorianCalendar(aString);
+ XMLGregorianCalendar c = getXmlConversionManager().convertStringToXMLGregorianCalendar(aString);
} catch(Exception ex) {
fail("An unexpect exception was thrown when coverting empty string to Gregorian Calendar");
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmllogin/XMLLoginDeploymentXMLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmllogin/XMLLoginDeploymentXMLTestCases.java
index a852780..ad1db29 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmllogin/XMLLoginDeploymentXMLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmllogin/XMLLoginDeploymentXMLTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
junit.textui.TestRunner.main(arguments);
}
+ @Override
public void setUp() {
m_project = new Project();
m_login = new XMLLogin();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmllogin/XMLLoginSessionsXMLTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmllogin/XMLLoginSessionsXMLTestCases.java
index 95437ea..0c7a5c5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmllogin/XMLLoginSessionsXMLTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmllogin/XMLLoginSessionsXMLTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
public void setUp() {
m_sessionConfig = new DatabaseSessionConfig();
m_sessionConfig.setName(SESSION_NAME);
@@ -162,6 +163,7 @@
return (DatabaseSessionConfig) readConfigs.getSessionConfigs().firstElement();
}
+ @Override
public void tearDown() {
File tempFile = new File(SESSION_FILE_NAME);
tempFile.delete();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/MyContentHandler.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/MyContentHandler.java
index 7ac12b4..66e4c44 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/MyContentHandler.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/MyContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,11 +25,13 @@
super();
}
+ @Override
public void startDocument() throws SAXException {
startTriggered = true;
super.startDocument();
}
+ @Override
public void endDocument() throws SAXException {
endTriggered = true;
super.endDocument();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/UnmarshalChildElementNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/UnmarshalChildElementNSTestCases.java
index 023df01..672da78 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/UnmarshalChildElementNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/UnmarshalChildElementNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
super(name);
}
+ @Override
public void setUp() {
MotorcycleProject project = new MotorcycleProject();
XMLContext xmlContext = new XMLContext(project);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLContextConstructorUsingXMLSessionConfigLoader.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLContextConstructorUsingXMLSessionConfigLoader.java
index ed33972..b7eda00 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLContextConstructorUsingXMLSessionConfigLoader.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLContextConstructorUsingXMLSessionConfigLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import java.io.StringWriter;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.exceptions.ValidationException;
import org.eclipse.persistence.oxm.XMLContext;
@@ -45,6 +47,7 @@
super(name);
}
+ @Override
public void setUp()
{
SessionManager.setManager(new SessionManager());
@@ -107,7 +110,7 @@
try {
//XMLSessionConfigLoader loader = new XMLSessionConfigLoader(XML_RESOURCE_INVALID);
XMLContext context = new XMLContext(sessionName, XML_RESOURCE_INVALID);
- this.fail("ValidationException should be thrown.");
+ fail("ValidationException should be thrown.");
} catch (ValidationException e) {
//e.printStackTrace();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalExceptionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalExceptionTestCases.java
index ae36c4e..33d5a11 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalExceptionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalExceptionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalFragmentTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalFragmentTestCases.java
index f4d63f8..cd0963f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalFragmentTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalFragmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setNamespaceAware(true);
@@ -58,6 +59,7 @@
controlDocument = setupControlDocument(XML_RESOURCE);
}
+ @Override
public void tearDown() {
marshaller.setFragment(false);
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalNSTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalNSTestCases.java
index b3563f0..631f715 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalNSTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,6 +54,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setNamespaceAware(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalTestCases.java
index ae40f5c..33775a2 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshalTestCases.java
@@ -29,6 +29,7 @@
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamResult;
+import junit.framework.TestCase;
import org.eclipse.persistence.exceptions.XMLMarshalException;
import org.eclipse.persistence.oxm.CharacterEscapeHandler;
import org.eclipse.persistence.oxm.XMLContext;
@@ -86,6 +87,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setNamespaceAware(true);
@@ -436,7 +438,7 @@
marshaller.setFormattedOutput(false);
marshaller.setFragment(true);
marshaller.marshal(emailAddress, writer);
- this.assertEquals("<user-id>user</user-id><domain>domain</domain>", writer.toString());
+ assertEquals("<user-id>user</user-id><domain>domain</domain>", writer.toString());
}
/**
@@ -454,7 +456,7 @@
CharacterEscapeHandler characterEscapeHandler = new CustomCharacterEscapeHandler();
marshaller.setCharacterEscapeHandler(characterEscapeHandler);
marshaller.marshal(emailAddress, record);
- this.assertEquals("<user-id>*user***</user-id><domain>*domain***</domain>", removeWhiteSpaceFromString(byteArrayOutputStream.toString()));
+ assertEquals("<user-id>*user***</user-id><domain>*domain***</domain>", removeWhiteSpaceFromString(byteArrayOutputStream.toString()));
}
//Null Test Cases=========================================================================================
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerContentHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerContentHandlerTestCases.java
index f362f5b..750df2b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerContentHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerContentHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
project = new XMLMarshallerTestProject();
xmlContext = new XMLContext(project);
@@ -44,34 +45,45 @@
emp.setEmailAddress(new EmailAddress());
try {
xmlContext.createMarshaller().marshal(emp, new ContentHandler() {
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
if(uri == null) {
throw new NullPointerException();
}
}
+ @Override
public void startDocument() throws SAXException {}
+ @Override
public void skippedEntity(String name) throws SAXException {}
+ @Override
public void setDocumentLocator(Locator locator) {}
+ @Override
public void processingInstruction(String target, String data) throws SAXException {}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException {
if(uri == null) {
throw new NullPointerException();
}
}
+ @Override
public void endDocument() throws SAXException {}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException {}
});
} catch(Exception ex) {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerEventListener.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerEventListener.java
index 3d80497..99f6344 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerEventListener.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerEventListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
* PUBLIC:
* This Event is raised after the session logs in.
*/
+ @Override
public void postLogin(SessionEvent event) {
eventTriggered = true;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerExceptionTestProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerExceptionTestProject.java
index 6cc125c..5208693 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerExceptionTestProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerExceptionTestProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
public XMLMarshallerExceptionTestProject() {
}
+ @Override
protected XMLDescriptor getEmployeeDescriptor() {
XMLDescriptor descriptor = super.getEmployeeDescriptor();
descriptor.setDefaultRootElement("thens:employee");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerNSTestProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerNSTestProject.java
index db144a2..04734b8 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerNSTestProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerNSTestProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
public XMLMarshallerNSTestProject() {
}
+ @Override
protected XMLDescriptor getEmployeeDescriptor() {
XMLDescriptor descriptor = super.getEmployeeDescriptor();
descriptor.setDefaultRootElement("thens:employee");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerNoDefaultRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerNoDefaultRootTestCases.java
index 85f0aa9..427517c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerNoDefaultRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerNoDefaultRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,6 +70,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
builderFactory.setNamespaceAware(true);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerTestProject.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerTestProject.java
index b9abbcb..2782f19 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerTestProject.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerTestProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
public XMLMarshallerTestProject() {
}
+ @Override
protected XMLDescriptor getEmployeeDescriptor() {
XMLDescriptor descriptor = super.getEmployeeDescriptor();
descriptor.setDefaultRootElement("employee");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerValidateRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerValidateRootTestCases.java
index 6a554e1..1a560f9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerValidateRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerValidateRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
project = new XMLMarshallerCarProject();
xmlContext = new XMLContext(project);
@@ -105,12 +106,15 @@
}
private static class IgnoreAllErrorHandler implements ErrorHandler {
+ @Override
public void warning(SAXParseException exception) throws SAXException {
}
+ @Override
public void error(SAXParseException exception) throws SAXException {
}
+ @Override
public void fatalError(SAXParseException exception) throws SAXException {
}
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerValidationModeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerValidationModeTestCases.java
index 27ceb00..dc7be1b 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerValidationModeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLMarshallerValidationModeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() throws Exception {
context = this.getXMLContext(new XMLMarshallerCarProject());
unmarshaller = context.createUnmarshaller();
@@ -60,6 +61,7 @@
}
+ @Override
public void tearDown() throws Exception {
unmarshaller.setValidationMode(originalMode);
}
@@ -249,6 +251,7 @@
public TestEntityResolver() {
}
+ @Override
public InputSource resolveEntity(String publicId, String systemId) {
InputStream localDtdStream = ClassLoader.getSystemResourceAsStream(DTD_NAME);
if (localDtdStream != null) {
@@ -271,14 +274,17 @@
fatalErrorHasOccurred = false;
warningHasOccurred = false;
}
+ @Override
public void error(SAXParseException arg0) throws SAXException {
errorHasOccurred = true;
throw arg0;
}
+ @Override
public void fatalError(SAXParseException arg0) throws SAXException {
fatalErrorHasOccurred = true;
throw arg0;
}
+ @Override
public void warning(SAXParseException arg0) throws SAXException {
warningHasOccurred = true;
throw arg0;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLUnmarshalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLUnmarshalTestCases.java
index 0891d3e..a436b5e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLUnmarshalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLUnmarshalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() throws Exception {
context = getXMLContext(SESSION_NAME);
unmarshaller = context.createUnmarshaller();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLUnmarshallerHandlerTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLUnmarshallerHandlerTestCases.java
index 7ed792b..dde3ef9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLUnmarshallerHandlerTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/XMLUnmarshallerHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
super(name);
}
+ @Override
public void setUp() {
XMLMarshallerCarProject project = new XMLMarshallerCarProject();
XMLContext xmlContext = new XMLContext(project);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/setschemas/SetSchemasTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/setschemas/SetSchemasTestCases.java
index 05ed7a3..ff4f2ea 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/setschemas/SetSchemasTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/setschemas/SetSchemasTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
super(name);
}
+ @Override
public void setUp() {
EmployeeProject project = new EmployeeProject();
xmlContext = getXMLContext(project);
@@ -68,11 +69,14 @@
* Error handler implementation for handling parser errors
*/
class MyErrorHandler implements ErrorHandler {
+ @Override
public void warning(org.xml.sax.SAXParseException sex) throws org.xml.sax.SAXParseException {
}
+ @Override
public void error(org.xml.sax.SAXParseException sex) throws org.xml.sax.SAXParseException {
throw sex;
}
+ @Override
public void fatalError(org.xml.sax.SAXParseException sex) throws org.xml.sax.SAXParseException {
throw sex;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/setschemas/SetXmlSchemaTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/setschemas/SetXmlSchemaTestCases.java
index ac1c39b..4525fd9 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/setschemas/SetXmlSchemaTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/setschemas/SetXmlSchemaTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
super(name);
}
+ @Override
public void setUp() {
EmployeeProject project = new EmployeeProject();
xmlContext = getXMLContext(project);
@@ -93,11 +94,14 @@
* Error handler implementation for handling parser errors
*/
class MyErrorHandler implements ErrorHandler {
+ @Override
public void warning(org.xml.sax.SAXParseException sex) throws org.xml.sax.SAXParseException {
}
+ @Override
public void error(org.xml.sax.SAXParseException sex) throws org.xml.sax.SAXParseException {
throw sex;
}
+ @Override
public void fatalError(org.xml.sax.SAXParseException sex) throws org.xml.sax.SAXParseException {
throw sex;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/stax/UnmarshalLevelTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/stax/UnmarshalLevelTestCases.java
index d6b1c09..5e88523 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/stax/UnmarshalLevelTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/stax/UnmarshalLevelTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
super(name);
}
+ @Override
public void setUp() {
try {
xmlInputFactory = XMLInputFactory.newInstance();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/choice/ChoiceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/choice/ChoiceTestCases.java
index 6795598..fb04225 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/choice/ChoiceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/choice/ChoiceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
xmlContext = new XMLContext(new EmployeeProject());
xmlValidator = xmlContext.createValidator();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/GroupTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/GroupTestCases.java
index 9de49e9..d5078c0 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/GroupTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/GroupTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
xmlContext = new XMLContext(new EmployeeProject());
xmlValidator = xmlContext.createValidator();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/nestedGroup/GroupWithNestedGroupTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/nestedGroup/GroupWithNestedGroupTestCases.java
index cb7eebe..d6f611d 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/nestedGroup/GroupWithNestedGroupTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/nestedGroup/GroupWithNestedGroupTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
xmlContext = new XMLContext(new EmployeeProject());
xmlValidator = xmlContext.createValidator();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/nestedSequence/GroupWithNestedSequenceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/nestedSequence/GroupWithNestedSequenceTestCases.java
index 84f3ab7..55a9559 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/nestedSequence/GroupWithNestedSequenceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/group/nestedSequence/GroupWithNestedSequenceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
xmlContext = new XMLContext(new EmployeeProject());
xmlValidator = xmlContext.createValidator();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/sequence/SequenceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/sequence/SequenceTestCases.java
index 8fb3cc9..7f5bd45 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/sequence/SequenceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/sequence/SequenceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
xmlContext = new XMLContext(new EmployeeProject());
xmlValidator = xmlContext.createValidator();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/sequence/nestedGroup/SequenceWithNestedGroupTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/sequence/nestedGroup/SequenceWithNestedGroupTestCases.java
index 48df825..f26cf33 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/sequence/nestedGroup/SequenceWithNestedGroupTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/structureValidation/sequence/nestedGroup/SequenceWithNestedGroupTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
xmlContext = new XMLContext(new EmployeeProject());
xmlValidator = xmlContext.createValidator();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/twoprojects/TwoProjectsTestSuite.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/twoprojects/TwoProjectsTestSuite.java
index 6464967..50840ff 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/twoprojects/TwoProjectsTestSuite.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlmarshaller/twoprojects/TwoProjectsTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import java.util.ArrayList;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.oxm.XMLContext;
import org.eclipse.persistence.oxm.XMLLogin;
import org.eclipse.persistence.oxm.XMLMarshaller;
@@ -50,6 +52,7 @@
junit.textui.TestRunner.main(new String[] { "-c", "org.eclipse.persistence.testing.oxm.xmlmarshaller.twoprojects.TwoProjectsTestSuite" });
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
parser = dbf.newDocumentBuilder();
@@ -133,7 +136,7 @@
this.assertXMLIdentical(controlDocument, testDocument);
int numSessions = xmlContext.getSessions().size();
- this.assertEquals(3, numSessions);
+ assertEquals(3, numSessions);
}
public void testMarshalCustomerSAX() throws Exception {
@@ -189,7 +192,7 @@
log(testCustomer.toString());
log("");
- this.assertEquals(controlCustomer, testCustomer);
+ assertEquals(controlCustomer, testCustomer);
}
public void testUnmarshalCustomerCollectionConstructor() throws Exception {
@@ -209,7 +212,7 @@
log(testCustomer.toString());
log("");
- this.assertEquals(controlCustomer, testCustomer);
+ assertEquals(controlCustomer, testCustomer);
}
public void testMarshalEmployeeSAX() throws Exception {
@@ -265,7 +268,7 @@
log(testEmployee.toString());
log("");
- this.assertEquals(controlEmployee, testEmployee);
+ assertEquals(controlEmployee, testEmployee);
}
public void testUnmarshalEmployeeCollectionConstructor() throws Exception {
@@ -286,7 +289,7 @@
log(testEmployee.toString());
log("");
- this.assertEquals(controlEmployee, testEmployee);
+ assertEquals(controlEmployee, testEmployee);
}
public void testMarshalCustomerDOM() throws Exception {
@@ -321,7 +324,7 @@
log(testCustomer.toString());
log("");
- this.assertEquals(controlCustomer, testCustomer);
+ assertEquals(controlCustomer, testCustomer);
}
public void testMarshalEmployeeDOM() throws Exception {
@@ -356,7 +359,7 @@
log(testEmployee.toString());
log("");
- this.assertEquals(controlEmployee, testEmployee);
+ assertEquals(controlEmployee, testEmployee);
}
private Document getControlDocument(String resourceName) throws Exception {
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/MarshalToNodeTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/MarshalToNodeTestCases.java
index 92674e3..da9fa34 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/MarshalToNodeTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/MarshalToNodeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,6 +55,7 @@
return document;
}
+ @Override
public void setUp() throws Exception {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
documentBuilder = dbf.newDocumentBuilder();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexDifferentPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexDifferentPrefixTestCases.java
index 1c20476..8ba8c88 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexDifferentPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexDifferentPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
TestRunner.main(arguments);
}
+ @Override
public Project getTopLinkProject() {
Project p = super.getTopLinkProject();
((XMLDescriptor)p.getDescriptor(Person.class)).getNamespaceResolver().put("myns", "test");
@@ -47,6 +48,7 @@
return p;
}
+ @Override
public Object getControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -58,14 +60,17 @@
return xmlRoot;
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
+ @Override
public String getXMLResource() {
return XML_RESOURCE;
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xmlroot/complex/employee-diff-prefix-write.xml");
Document writeDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexDifferentPrefixWithDRTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexDifferentPrefixWithDRTestCases.java
index 31267f2..76897be 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexDifferentPrefixWithDRTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexDifferentPrefixWithDRTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
TestRunner.main(arguments);
}
+ @Override
public Project getTopLinkProject() {
Project p = super.getTopLinkProject();
((XMLDescriptor)p.getDescriptor(Person.class)).setDefaultRootElement("aaa:employee");
@@ -47,6 +48,7 @@
return p;
}
+ @Override
public Object getControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -54,6 +56,7 @@
return peep;
}
+ @Override
public Object getWriteControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -65,10 +68,12 @@
return xmlRoot;
}
+ @Override
public String getXMLResource() {
return "org/eclipse/persistence/testing/oxm/xmlroot/complex/employee-diff-prefix-dr.xml";
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xmlroot/complex/employee-diff-prefix-dr-write.xml");
Document writeDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoNRWithPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoNRWithPrefixTestCases.java
index d1e71e1..7b43000 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoNRWithPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoNRWithPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -54,14 +55,17 @@
return xmlRoot;
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
+ @Override
public String getXMLResource() {
return XML_RESOURCE;
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xmlroot/complex/employee-no-nr-withprefix-write.xml");
Document writeDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoNamespaceResolverTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoNamespaceResolverTestCases.java
index 84f508e..4dfb419 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoNamespaceResolverTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoNamespaceResolverTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
setProject(project);
}
+ @Override
public Object getReadControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -42,6 +43,7 @@
return xmlRoot;
}
+ @Override
public Object getWriteControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -53,6 +55,7 @@
return xmlRoot;
}
+ @Override
public String getXMLResource() {
return XML_RESOURCE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoPrefixTestCases.java
index 42b59d4..fdf0343 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNoPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
super(name);
}
+ @Override
public Object getReadControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -36,6 +37,7 @@
return xmlRoot;
}
+ @Override
public Object getWriteControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -47,6 +49,7 @@
return xmlRoot;
}
+ @Override
public String getXMLResource() {
return XML_RESOURCE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNullUriTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNullUriTestCases.java
index 5c7235c..3dc5e29 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNullUriTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexNullUriTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
setProject(project);
}
+ @Override
public Object getControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -43,10 +44,12 @@
return xmlRoot;
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
+ @Override
public String getXMLResource() {
return XML_RESOURCE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexTestCases.java
index 2c4c486..eb43124 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootComplexTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLStreamReader;
+import junit.framework.TestCase;
import org.eclipse.persistence.internal.oxm.record.XMLEventReaderInputSource;
import org.eclipse.persistence.internal.oxm.record.XMLEventReaderReader;
import org.eclipse.persistence.internal.oxm.record.XMLStreamReaderInputSource;
@@ -45,6 +46,7 @@
return new XMLRootComplexProject();
}
+ @Override
protected Object getControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -57,6 +59,7 @@
}
// Unmarshal tests
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(instream, Person.class);
@@ -64,17 +67,20 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
Object testObject = xmlUnmarshaller.unmarshal(getControlDocument(), Person.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(url, Person.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -90,6 +96,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -105,6 +112,7 @@
}
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**testXMLDocumentToObject**");
log("Expected:");
@@ -116,15 +124,16 @@
XMLRoot controlObj = (XMLRoot)getReadControlObject();
XMLRoot testObj = (XMLRoot)testObject;
- this.assertEquals(controlObj.getLocalName(), testObj.getLocalName());
- this.assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
- this.assertEquals(controlObj.getObject(), testObj.getObject());
+ assertEquals(controlObj.getLocalName(), testObj.getLocalName());
+ assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
+ assertEquals(controlObj.getObject(), testObj.getObject());
} else {
- this.assertEquals(getReadControlObject(), testObject);
+ assertEquals(getReadControlObject(), testObject);
}
}
// DOES NOT APPLY
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootMultipleMarshalTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootMultipleMarshalTestCases.java
index ed51c43..303941c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootMultipleMarshalTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootMultipleMarshalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,10 +35,12 @@
setProject(new EmployeeProject());
}
+ @Override
public boolean isUnmarshalTest() {
return false;
}
+ @Override
protected Object getControlObject() {
Employee employee = new Employee();
Address address= new Address();
@@ -56,6 +58,7 @@
return XML_RESOURCE;
}
+ @Override
public void testObjectToXMLDocument() throws Exception {
StringWriter dummyWriter = new StringWriter();
xmlMarshaller.marshal(getWriteControlObject(), dummyWriter);
@@ -63,6 +66,7 @@
super.testObjectToXMLDocument();
}
+ @Override
public void testObjectToXMLStringWriter() throws Exception {
StringWriter dummyWriter = new StringWriter();
xmlMarshaller.marshal(getWriteControlObject(), dummyWriter);
@@ -70,6 +74,7 @@
super.testObjectToXMLStringWriter();
}
+ @Override
public void testObjectToContentHandler() throws Exception {
StringWriter dummyWriter = new StringWriter();
xmlMarshaller.marshal(getWriteControlObject(), dummyWriter);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootNullSchemaReferenceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootNullSchemaReferenceTestCases.java
index 7815973..d567b4c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootNullSchemaReferenceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/XMLRootNullSchemaReferenceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLStreamReader;
+import junit.framework.TestCase;
import org.eclipse.persistence.internal.oxm.record.XMLEventReaderInputSource;
import org.eclipse.persistence.internal.oxm.record.XMLEventReaderReader;
import org.eclipse.persistence.internal.oxm.record.XMLStreamReaderInputSource;
@@ -49,6 +50,7 @@
return p;
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xmlroot/complex/employee-null-schemaref-write.xml");
Document doc = parser.parse(inputStream);
@@ -57,6 +59,7 @@
return doc;
}
+ @Override
protected Object getControlObject() {
Person peep = new Person();
peep.setName(CONTROL_PERSON_NAME);
@@ -69,6 +72,7 @@
}
// Unmarshal tests
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(instream, Person.class);
@@ -76,17 +80,20 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
Object testObject = xmlUnmarshaller.unmarshal(getControlDocument(), Person.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(url, Person.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -102,6 +109,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -117,6 +125,7 @@
}
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**testXMLDocumentToObject**");
log("Expected:");
@@ -128,15 +137,16 @@
XMLRoot controlObj = (XMLRoot)getReadControlObject();
XMLRoot testObj = (XMLRoot)testObject;
- this.assertEquals(controlObj.getLocalName(), testObj.getLocalName());
- this.assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
- this.assertEquals(controlObj.getObject(), testObj.getObject());
+ assertEquals(controlObj.getLocalName(), testObj.getLocalName());
+ assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
+ assertEquals(controlObj.getObject(), testObj.getObject());
} else {
- this.assertEquals(getReadControlObject(), testObject);
+ assertEquals(getReadControlObject(), testObject);
}
}
// DOES NOT APPLY
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootMatchingPersonXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootMatchingPersonXMLRootTestCases.java
index 1f94d5a..8b0a615 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootMatchingPersonXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootMatchingPersonXMLRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -55,12 +55,14 @@
return XML_RESOURCE;
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.setName(CONTROL_PERSON_NAME);
return p;
}
+ @Override
public Object getWriteControlObject() {
Person p = new Person();
p.setName(CONTROL_PERSON_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootPersonTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootPersonTestCases.java
index 1a00f54..e23eb89 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootPersonTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootPersonTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
return XML_RESOURCE;
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.setName(CONTROL_PERSON_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootPersonXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootPersonXMLRootTestCases.java
index 2811a8c..bdc8d3f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootPersonXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NonNullDefaultRootPersonXMLRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
return XML_RESOURCE;
}
+ @Override
protected Object getControlObject() {
Person p = new Person();
p.setName(CONTROL_PERSON_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NullDefaultRootXMLRootTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NullDefaultRootXMLRootTestCases.java
index 7ee4cac..d017678 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NullDefaultRootXMLRootTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/complex/inheritance/NullDefaultRootXMLRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
return XML_RESOURCE;
}
+ @Override
protected Object getControlObject() {
Employee emp = new Employee();
emp.setName(CONTROL_PERSON_NAME);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/nil/XMLRootNilForceWrapTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/nil/XMLRootNilForceWrapTestCases.java
index 9a937cd..b9c66ac 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/nil/XMLRootNilForceWrapTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/nil/XMLRootNilForceWrapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
private final static String XML_RESOURCE = "org/eclipse/persistence/testing/oxm/xmlroot/nil/nil.xml";
+ @Override
public void setUp() throws Exception {
super.setUp();
this.xmlUnmarshaller.setResultAlwaysXMLRoot(true);
@@ -36,6 +37,7 @@
setProject(new NilProject());
}
+ @Override
public Object getControlObject() {
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName("bar");
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootDurationTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootDurationTestCases.java
index f79349b..e8bd98e 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootDurationTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootDurationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLStreamReader;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.internal.oxm.record.XMLEventReaderInputSource;
@@ -48,6 +49,7 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName(CONTROL_ELEMENT_NAME);
@@ -65,6 +67,7 @@
}
// Unmarshal tests
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(instream, Duration.class);
@@ -72,17 +75,20 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
Object testObject = xmlUnmarshaller.unmarshal(getControlDocument(), Duration.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(url, Duration.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -98,6 +104,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -113,6 +120,7 @@
}
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**testXMLDocumentToObject**");
log("Expected:");
@@ -123,12 +131,13 @@
XMLRoot controlObj = (XMLRoot)getReadControlObject();
XMLRoot testObj = (XMLRoot)testObject;
- this.assertEquals(controlObj.getLocalName(), testObj.getLocalName());
- this.assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
- this.assertEquals(controlObj.getObject(), testObj.getObject());
+ assertEquals(controlObj.getLocalName(), testObj.getLocalName());
+ assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
+ assertEquals(controlObj.getObject(), testObj.getObject());
}
// DOES NOT APPLY
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootNoPrefixTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootNoPrefixTestCases.java
index b74248a..da24aa5 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootNoPrefixTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootNoPrefixTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
TestRunner.main(arguments);
}
+ @Override
public Object getReadControlObject() {
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName(CONTROL_ELEMENT_NAME);
@@ -40,6 +41,7 @@
return xmlRoot;
}
+ @Override
public Object getWriteControlObject() {
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName(CONTROL_ELEMENT_NAME_NO_PREFIX);
@@ -48,10 +50,12 @@
return xmlRoot;
}
+ @Override
public String getXMLResource() {
return XML_RESOURCE;
}
+ @Override
public Document getWriteControlDocument() {
return getControlDocument();
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootNullUriTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootNullUriTestCases.java
index 7a3ac19..3610efe 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootNullUriTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootNullUriTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
super(name);
}
+ @Override
public Object getControlObject() {
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName(CONTROL_ELEMENT_NAME);
@@ -36,14 +37,17 @@
return xmlRoot;
}
+ @Override
public Object getWriteControlObject() {
return getControlObject();
}
+ @Override
public Document getWriteControlDocument() {
return getControlDocument();
}
+ @Override
public String getXMLResource() {
return XML_RESOURCE;
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootSimpleCollectionTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootSimpleCollectionTestCases.java
index 45a9e2c..ffcf17c 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootSimpleCollectionTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootSimpleCollectionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
RootObjectWithSimpleCollection testObject = new RootObjectWithSimpleCollection();
List theList = new ArrayList();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootSimpleTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootSimpleTestCases.java
index c646751..302278f 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootSimpleTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootSimpleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLStreamReader;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.internal.oxm.record.XMLEventReaderInputSource;
@@ -47,6 +48,7 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName(CONTROL_ELEMENT_NAME);
@@ -55,6 +57,7 @@
return xmlRoot;
}
+ @Override
public Object getWriteControlObject() {
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName(CONTROL_ELEMENT_NAME);
@@ -68,6 +71,7 @@
}
// Unmarshal tests
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(instream, String.class);
@@ -75,17 +79,20 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
Object testObject = xmlUnmarshaller.unmarshal(getControlDocument(), String.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(url, String.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -101,6 +108,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -116,6 +124,7 @@
}
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**testXMLDocumentToObject**");
log("Expected:");
@@ -126,15 +135,17 @@
XMLRoot controlObj = (XMLRoot)getReadControlObject();
XMLRoot testObj = (XMLRoot)testObject;
- this.assertEquals(controlObj.getLocalName(), testObj.getLocalName());
- this.assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
- this.assertEquals(controlObj.getObject(), testObj.getObject());
+ assertEquals(controlObj.getLocalName(), testObj.getLocalName());
+ assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
+ assertEquals(controlObj.getObject(), testObj.getObject());
}
// DOES NOT APPLY
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
+ @Override
public Document getWriteControlDocument() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xmlroot/simple/employee-write.xml");
Document writeDocument = parser.parse(inputStream);
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootXMLGregorianCalendarTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootXMLGregorianCalendarTestCases.java
index dca9833..496e554 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootXMLGregorianCalendarTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xmlroot/simple/XMLRootXMLGregorianCalendarTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLStreamReader;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.internal.oxm.record.XMLEventReaderInputSource;
@@ -49,6 +50,7 @@
TestRunner.main(arguments);
}
+ @Override
public Object getControlObject() {
XMLRoot xmlRoot = new XMLRoot();
xmlRoot.setLocalName(CONTROL_ELEMENT_NAME);
@@ -70,6 +72,7 @@
}
// Unmarshal tests
+ @Override
public void testXMLToObjectFromInputStream() throws Exception {
InputStream instream = ClassLoader.getSystemResourceAsStream(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(instream, XMLGregorianCalendar.class);
@@ -77,17 +80,20 @@
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromNode() throws Exception {
Object testObject = xmlUnmarshaller.unmarshal(getControlDocument(), XMLGregorianCalendar.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromURL() throws Exception {
java.net.URL url = ClassLoader.getSystemResource(getXMLResource());
Object testObject = xmlUnmarshaller.unmarshal(url, XMLGregorianCalendar.class);
xmlToObjectTest(testObject);
}
+ @Override
public void testXMLToObjectFromXMLStreamReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -103,6 +109,7 @@
}
}
+ @Override
public void testXMLToObjectFromXMLEventReader() throws Exception {
if(null != XML_INPUT_FACTORY) {
InputStream instream = ClassLoader.getSystemResourceAsStream(resourceName);
@@ -118,6 +125,7 @@
}
}
+ @Override
public void xmlToObjectTest(Object testObject) throws Exception {
log("\n**testXMLDocumentToObject**");
log("Expected:");
@@ -128,12 +136,13 @@
XMLRoot controlObj = (XMLRoot)getReadControlObject();
XMLRoot testObj = (XMLRoot)testObject;
- this.assertEquals(controlObj.getLocalName(), testObj.getLocalName());
- this.assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
- this.assertEquals(controlObj.getObject(), testObj.getObject());
+ assertEquals(controlObj.getLocalName(), testObj.getLocalName());
+ assertEquals(controlObj.getNamespaceURI(), testObj.getNamespaceURI());
+ assertEquals(controlObj.getObject(), testObj.getObject());
}
// DOES NOT APPLY
+ @Override
public void testUnmarshallerHandler() throws Exception {
}
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineCreateTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineCreateTestCases.java
index 9036339..6f20d25 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineCreateTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineCreateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import junit.framework.TestCase;
import org.eclipse.persistence.exceptions.XMLMarshalException;
import org.eclipse.persistence.internal.oxm.XPathEngine;
import org.eclipse.persistence.internal.sessions.AbstractSession;
@@ -47,6 +48,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xpathengine/AddressBook.xml");
@@ -55,7 +57,7 @@
DocumentBuilder parser = builderFactory.newDocumentBuilder();
controlDocument = parser.parse(inputStream);
- searchNode = (Element) controlDocument.getDocumentElement();
+ searchNode = controlDocument.getDocumentElement();
XMLContext ctx = new XMLContext(new org.eclipse.persistence.testing.oxm.xmlmarshaller.XMLMarshallerTestProject());
session = (AbstractSession) ctx.getSession(0);
@@ -142,8 +144,8 @@
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
Document document = builderFactory.newDocumentBuilder().newDocument();
- Element elementValue = (Element) document.createElement("newChildWithElementValue");
- Element elementValueChild = (Element) document.createElement("newChildElementValue");
+ Element elementValue = document.createElement("newChildWithElementValue");
+ Element elementValueChild = document.createElement("newChildElementValue");
Text textNode = document.createTextNode("theValue");
elementValueChild.appendChild(textNode);
@@ -172,7 +174,7 @@
PrintWriter writer2 = new PrintWriter(stringWriter2);
try {
XMLTransformer xmlTransformer = XMLPlatformFactory.getInstance().getXMLPlatform().newXMLTransformer();
- xmlTransformer.transform((Element) verifyNodes.item(0), writer2);
+ xmlTransformer.transform(verifyNodes.item(0), writer2);
} catch (XMLPlatformException exception) {
fail("An XMLPlatformException was thrown");
return;
@@ -362,7 +364,7 @@
assertTrue("An unexpected XMLMarshalException was caught. " + validationException.getMessage(), validationException.getErrorCode() == XMLMarshalException.INVALID_XPATH_INDEX_STRING);
return;
} catch (Exception e) {
- this.fail("An unexpected Exception was caught. " + e.getMessage());
+ fail("An unexpected Exception was caught. " + e.getMessage());
return;
}
searchNode = backupNode;
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineFindTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineFindTestCases.java
index 3a2a9d1..f194828 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineFindTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineFindTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xpathengine/AddressBook.xml");
@@ -47,7 +48,7 @@
builderFactory.setIgnoringElementContentWhitespace(true);
DocumentBuilder parser = builderFactory.newDocumentBuilder();
controlDocument = parser.parse(inputStream);
- searchNode = (Element)controlDocument.getDocumentElement();
+ searchNode = controlDocument.getDocumentElement();
}
// ==========================================================================================
@@ -185,7 +186,7 @@
builderFactory.setIgnoringElementContentWhitespace(true);
DocumentBuilder parser = builderFactory.newDocumentBuilder();
Document controlDocumentNS = parser.parse(inputStreamNS);
- Element searchNodeNS = (Element)controlDocumentNS.getDocumentElement();
+ Element searchNodeNS = controlDocumentNS.getDocumentElement();
XMLField field = new XMLField("address/addressee/@testns:test");
NamespaceResolver resolver = new NamespaceResolver();
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineRemoveTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineRemoveTestCases.java
index bc62bb7..260a817 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineRemoveTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineRemoveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xpathengine/AddressBook.xml");
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
@@ -43,7 +44,7 @@
DocumentBuilder parser = builderFactory.newDocumentBuilder();
controlDocument = parser.parse(inputStream);
- searchNode = (Element) controlDocument.getDocumentElement();
+ searchNode = controlDocument.getDocumentElement();
}
// ========================================================================================
diff --git a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineReplaceTestCases.java b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineReplaceTestCases.java
index 748ab2a..e02f1c1 100644
--- a/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineReplaceTestCases.java
+++ b/moxy/org.eclipse.persistence.moxy/src/test/java/org/eclipse/persistence/testing/oxm/xpathengine/XPathEngineReplaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
super(name);
}
+ @Override
public void setUp() throws Exception {
InputStream inputStream = ClassLoader.getSystemResourceAsStream("org/eclipse/persistence/testing/oxm/xpathengine/AddressBook.xml");
@@ -54,7 +55,7 @@
DocumentBuilder parser = builderFactory.newDocumentBuilder();
controlDocument = parser.parse(inputStream);
- searchNode = (Element) controlDocument.getDocumentElement();
+ searchNode = controlDocument.getDocumentElement();
XMLContext ctx = new XMLContext(new org.eclipse.persistence.testing.oxm.xmlmarshaller.XMLMarshallerTestProject());
session = (AbstractSession) ctx.getSession(0);
}
@@ -124,13 +125,13 @@
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
Document document = builderFactory.newDocumentBuilder().newDocument();
- Element cityElement = (Element) document.createElement("city");
- Element nameElement = (Element) document.createElement("name");
+ Element cityElement = document.createElement("city");
+ Element nameElement = document.createElement("name");
Text nameText = document.createTextNode("thename");
nameElement.appendChild(nameText);
- Element codeElement = (Element) document.createElement("code");
+ Element codeElement = document.createElement("code");
Text codeText = document.createTextNode("thecode");
@@ -180,15 +181,15 @@
DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
Document document = builderFactory.newDocumentBuilder().newDocument();
- Element controlElement = (Element) document.createElement("city");
- Element townElement = (Element) document.createElement("town");
+ Element controlElement = document.createElement("city");
+ Element townElement = document.createElement("town");
- Element nameElement = (Element) document.createElement("name");
+ Element nameElement = document.createElement("name");
Text nameText = document.createTextNode("thename");
nameElement.appendChild(nameText);
- Attr codeAttribute = (Attr) document.createAttribute("code");
+ Attr codeAttribute = document.createAttribute("code");
codeAttribute.setNodeValue("thecode");
// controlElement is just used for comparison at the end of this test
diff --git a/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptImpl.java b/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptImpl.java
index 9d55253..f3dd83d 100644
--- a/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptImpl.java
+++ b/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptImpl.java
@@ -25,26 +25,32 @@
public DeptImpl() {
}
+ @Override
public java.lang.Integer getDeptno() {
return Integer.valueOf(getInt(START_PROPERTY_INDEX + 0));
}
+ @Override
public void setDeptno(java.lang.Integer value) {
set(START_PROPERTY_INDEX + 0, value);
}
+ @Override
public java.lang.String getDname() {
return getString(START_PROPERTY_INDEX + 1);
}
+ @Override
public void setDname(java.lang.String value) {
set(START_PROPERTY_INDEX + 1, value);
}
+ @Override
public java.lang.String getLoc() {
return getString(START_PROPERTY_INDEX + 2);
}
+ @Override
public void setLoc(java.lang.String value) {
set(START_PROPERTY_INDEX + 2, value);
}
diff --git a/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptServiceImpl.java b/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptServiceImpl.java
index 9cf05b4..5b85fee 100644
--- a/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptServiceImpl.java
+++ b/sdo/eclipselink.sdo.test.server/src/it/java/org/eclipse/persistence/testing/sdo/server/DeptServiceImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
public DeptServiceImpl() {
}
+ @Override
public Dept getDept(Integer deptno) {
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("\n********** getDept() Called **********\n");
@@ -43,6 +44,7 @@
return dept;
}
+ @Override
public boolean updateDept(Dept dept) {
LOGGER.info("\n********** updateDept() Called **********\n");
if (dept == null)
diff --git a/sdo/org.eclipse.persistence.sdo/pom.xml b/sdo/org.eclipse.persistence.sdo/pom.xml
index 44cb603..215b403 100644
--- a/sdo/org.eclipse.persistence.sdo/pom.xml
+++ b/sdo/org.eclipse.persistence.sdo/pom.xml
@@ -33,6 +33,8 @@
<properties>
<dep.sources>${project.build.directory}/generated-sources/dependencies</dep.sources>
<jdoc.doclint>-missing</jdoc.doclint>
+ <!-- XXX deprecated comes from commonj.sdo which we don't want to touch -->
+ <comp.xlint>-Xlint:all,-rawtypes,-unchecked,-serial,-deprecation</comp.xlint>
<test-skip-sdo-srg>${skipTests}</test-skip-sdo-srg>
<test-skip-sdo>true</test-skip-sdo>
@@ -181,6 +183,14 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- XXX deprecated comes from commonj.sdo which we don't want to touch -->
+ <showDeprecation>false</showDeprecation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<workingDirectory>${project.build.directory}/test-run</workingDirectory>
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/module-info.java b/sdo/org.eclipse.persistence.sdo/src/main/java/module-info.java
index fc6246e..e3fb30e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/module-info.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/module-info.java
@@ -15,7 +15,7 @@
requires java.naming;
requires org.eclipse.persistence.asm;
- requires org.eclipse.persistence.core;
+ requires transitive org.eclipse.persistence.core;
requires org.eclipse.persistence.moxy;
requires jakarta.activation;
requires jakarta.mail;
@@ -23,6 +23,7 @@
exports org.eclipse.persistence.sdo;
exports org.eclipse.persistence.sdo.helper;
+ exports org.eclipse.persistence.sdo.helper.delegates;
exports org.eclipse.persistence.sdo.types;
exports commonj.sdo;
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDODataObject.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDODataObject.java
index 6bf5b38..21f56b8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDODataObject.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDODataObject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -939,7 +939,7 @@
throw SDOException.cannotPerformOperationOnNullArgument("unset");
}
- if (((SDOProperty)property).isReadOnly()) {
+ if (property.isReadOnly()) {
throw new UnsupportedOperationException("Property is Readonly." + property.getName() + " " + getType().getName());
}
@@ -2807,8 +2807,8 @@
theList.add(property);
getInstanceProperties().add(property);
if (((SDOProperty)property).hasAliasNames()) {
- for (int i = 0, size = ((SDOProperty)property).getAliasNames().size(); i < size; i++) {
- _getOpenContentAliasNamesMap().put((String)((SDOProperty)property).getAliasNames().get(i), property);
+ for (int i = 0, size = property.getAliasNames().size(); i < size; i++) {
+ _getOpenContentAliasNamesMap().put((String) property.getAliasNames().get(i), property);
}
}
}
@@ -2832,8 +2832,8 @@
_getOpenContentPropertiesAttributes().remove(property);
getInstanceProperties().remove(property);
if (((SDOProperty)property).hasAliasNames()) {
- for (int i = 0, size = ((SDOProperty)property).getAliasNames().size(); i < size; i++) {
- _getOpenContentAliasNamesMap().remove(((SDOProperty)property).getAliasNames().get(i));
+ for (int i = 0, size = property.getAliasNames().size(); i < size; i++) {
+ _getOpenContentAliasNamesMap().remove(property.getAliasNames().get(i));
}
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOHelper.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOHelper.java
index 1644f21..b5e9eea 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOHelper.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -325,31 +325,31 @@
}
try {
if (clazz == SDOTypeType.class) {
- return (T) ((SDOTypeType) type);
+ return (T) type;
}
if (clazz == SDOPropertyType.class) {
- return (T) ((SDOPropertyType) type);
+ return (T) type;
}
if (clazz == SDOChangeSummaryType.class) {
- return (T) ((SDOChangeSummaryType) type);
+ return (T) type;
}
if (clazz == SDODataObjectType.class) {
- return (T) ((SDODataObjectType) type);
+ return (T) type;
}
if (clazz == SDODataType.class) {
- return (T) ((SDODataType) type);
+ return (T) type;
}
if (clazz == SDOOpenSequencedType.class) {
- return (T) ((SDOOpenSequencedType) type);
+ return (T) type;
}
if (clazz == SDOWrapperType.class) {
- return (T) ((SDOWrapperType) type);
+ return (T) type;
}
if (clazz == SDOXMLHelperLoadOptionsType.class) {
- return (T) ((SDOXMLHelperLoadOptionsType) type);
+ return (T) type;
}
if (clazz == SDOObjectType.class) {
- return (T) ((SDOObjectType) type);
+ return (T) type;
}
throw new IllegalArgumentException(ExceptionLocalization
.buildMessage("sdo_helper_invalid_target_for_type", new Object[] { clazz }));
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOProperty.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOProperty.java
index 6dbd22d..23e7ad5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOProperty.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOProperty.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -935,7 +935,7 @@
* @return id Property or null
*/
private SDOProperty getIDProp(Type aType) {
- return (SDOProperty)aType.getProperty((String)((SDOType)aType).get(SDOConstants.ID_PROPERTY));
+ return (SDOProperty)aType.getProperty((String) aType.get(SDOConstants.ID_PROPERTY));
}
private DatabaseMapping buildXMLCollectionReferenceMapping(String mappingUri) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOSequence.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOSequence.java
index 1d63970..fecf34b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOSequence.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/SDOSequence.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -131,7 +131,7 @@
return false;
}
// Disallow the addition of a read only Property
- if (((SDOProperty)property).isReadOnly()) {
+ if (property.isReadOnly()) {
return false;
}
// Disallow the addition of a Properties representing an XML attribute
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOCopyHelper.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOCopyHelper.java
index e0c32c1..a18fd68 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOCopyHelper.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOCopyHelper.java
@@ -160,7 +160,7 @@
Setting nextSetting = (Setting)settings.get(index);
Property prop = dataObject.getSequence().getProperty(index);
- if (prop == null || ((SDOType) prop.getType()).isDataType()) {
+ if (prop == null || prop.getType().isDataType()) {
Setting copySetting = nextSetting.copy(copy);
copy.getSequence().getSettings().add(copySetting);
copy.getSequence().addValueToSettings(copySetting);
@@ -571,14 +571,14 @@
Object aVSPropertyItem = null;
// get the # of non-opencontent properties for the object holding the CS - do not use DVS.getTypePropertyValues()
- for (int size = ((SDOType) anOriginalObject.getType()).getDeclaredProperties().size(), i = 0;
- i < size; i++) {
+ for (int size = anOriginalObject.getType().getDeclaredProperties().size(), i = 0;
+ i < size; i++) {
aVSPropertyItem = aVSOriginal.getDeclaredProperty(i);
// only iterate set properties
if (aVSOriginal.isSetDeclaredProperty(i)) {
// shallow copy the object values
// handle single case
- SDOProperty currentProperty = (SDOProperty)((SDOType)anOriginalObject.getType()).getDeclaredProperties().get(i);
+ SDOProperty currentProperty = (SDOProperty) anOriginalObject.getType().getDeclaredProperties().get(i);
if (currentProperty.isMany()) {
propertyToOriginalListMap.put(aVSPropertyItem, currentProperty);
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDODataHelper.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDODataHelper.java
index 70e8d59..e62b35a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDODataHelper.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDODataHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -762,7 +762,7 @@
@Override
public Object convert(Type type, Object value) {
Class convertClass = null;
- if (((SDOType) type).isDataType()) {
+ if (type.isDataType()) {
convertClass = type.getInstanceClass();
} /*else {
convertClass = ((org.eclipse.persistence.sdo.SDOType) type).getImplClass();
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOEqualityHelper.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOEqualityHelper.java
index 0f261ac..d822fa2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOEqualityHelper.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOEqualityHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -514,7 +514,7 @@
List l1 = dataObject1.getList(p);
List l2 = dataObject2.getList(p);
- if (((SDOType)p.getType()).isDataType()) {
+ if (p.getType().isDataType()) {
if (dataObject1.isSet(p) != dataObject2.isSet(p)) {
return false;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOHelperContext.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOHelperContext.java
index 5aae321..030a025 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOHelperContext.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOHelperContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -246,7 +246,7 @@
*/
public SDOHelperContext(ClassLoader aClassLoader) {
super();
- this.identifier = this.GLOBAL_HELPER_IDENTIFIER;
+ this.identifier = GLOBAL_HELPER_IDENTIFIER;
initialize(aClassLoader);
}
@@ -943,7 +943,7 @@
* care about "destroy", "start" etc.
*
*/
- public static class MyNotificationFilter extends NotificationFilterSupport {
+ static class MyNotificationFilter extends NotificationFilterSupport {
MyNotificationFilter() {
super.enableType(JBOSS_TYPE_STOP);
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOSchemaGenerator.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOSchemaGenerator.java
index 31365d3..c247990 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOSchemaGenerator.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOSchemaGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -376,7 +376,7 @@
}
private void buildElementsAndAttributes(Object owner, Type type) {
- List properties = ((SDOType) type).getDeclaredProperties();
+ List properties = type.getDeclaredProperties();
NestedParticle nestedParticle = null;
if ((properties == null) || (properties.size() == 0)) {
@@ -597,7 +597,7 @@
Type schemaSDOType = null;
QName schemaType = sdoProperty.getXsdType();
if (schemaType != null) {
- schemaSDOType = ((SDOTypeHelper)aHelperContext.getTypeHelper()).getType(schemaType.getNamespaceURI(), schemaType.getLocalPart());
+ schemaSDOType = aHelperContext.getTypeHelper().getType(schemaType.getNamespaceURI(), schemaType.getLocalPart());
if ((sdoProperty.getType() == SDOConstants.SDO_STRING) && (schemaSDOType != SDOConstants.SDO_STRING)) {
String sdoXmlPrefix = getPrefixForURI(SDOConstants.SDOXML_URL);
@@ -676,7 +676,7 @@
// process default values that are defined in the schema (not via primitive numeric Object wrapped pseudo defaults)
if (((SDOProperty)property).isDefaultSet()) {
- if (!property.isMany() && ((SDOType)property.getType()).isDataType()) {
+ if (!property.isMany() && property.getType().isDataType()) {
XMLConversionManager xmlConversionManager = ((SDOXMLHelper)aHelperContext.getXMLHelper()).getXmlConversionManager();
attr.setDefaultValue((String)xmlConversionManager.convertObject(property.getDefault(), ClassConstants.STRING, ((SDOProperty)property).getXsdType()));
}
@@ -687,7 +687,7 @@
QName schemaType = ((SDOProperty)property).getXsdType();
if (schemaType != null) {
- Type schemaSDOType = ((SDOTypeHelper)aHelperContext.getTypeHelper()).getType(schemaType.getNamespaceURI(), schemaType.getLocalPart());
+ Type schemaSDOType = aHelperContext.getTypeHelper().getType(schemaType.getNamespaceURI(), schemaType.getLocalPart());
if ((property.getType() == SDOConstants.SDO_STRING) && (schemaSDOType != SDOConstants.SDO_STRING)) {
String sdoXmlPrefix = getPrefixForURI(SDOConstants.SDOXML_URL);
@@ -696,7 +696,7 @@
}
}
- if (!((SDOType)property.getType()).isDataType()) {
+ if (!property.getType().isDataType()) {
schemaType = SDOConstants.ANY_URI_QNAME;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOTypesGenerator.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOTypesGenerator.java
index 6537936..915402a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOTypesGenerator.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOTypesGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1980,7 +1980,7 @@
//Since types aren't registered until the end of the define call we need to check type helper
//and the generatedTypesmap to see if a type already exists
private SDOType getExisitingType(String uri, String localName) {
- SDOType type = (SDOType) ((SDOTypeHelper) aHelperContext.getTypeHelper()).getType(uri, localName);
+ SDOType type = (SDOType) aHelperContext.getTypeHelper().getType(uri, localName);
if (type == null) {
QName qName = new QName(uri, localName);
type = (SDOType) getGeneratedTypes().get(qName);
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOUnmappedContentHandler.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOUnmappedContentHandler.java
index 3c42652..9e88957 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOUnmappedContentHandler.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/SDOUnmappedContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -278,7 +278,7 @@
value = ((SDODataHelper)aHelperContext.getDataHelper()).convertFromStringValue((String)value, currentProperty.getType(), currentSchemaType);
}
currentSchemaType = null;
- } else if ((currentProperty.getType() != null) && ((SDOType)currentProperty.getType()).isDataType()) {
+ } else if ((currentProperty.getType() != null) && currentProperty.getType().isDataType()) {
value = ((SDODataHelper)aHelperContext.getDataHelper()).convertFromStringValue((String)value, currentProperty.getType());
}
@@ -309,7 +309,7 @@
currentProperties.push(globalProperty);
SDOType theType = ((SDOType)globalProperty.getType());
- if (((SDOType)globalProperty.getType()).isDataType()) {
+ if (globalProperty.getType().isDataType()) {
depth++;
} else {
XMLDescriptor xmlDescriptor = theType.getXmlDescriptor();
@@ -413,7 +413,7 @@
SDOProperty property = new SDOProperty(aHelperContext);
property.setName(localName);
property.setMany(isElement);
- property.setContainment(!((SDOType)type).isDataType());
+ property.setContainment(!type.isDataType());
property.setType(type);
property.setUri(uri);
property.setInstanceProperty(SDOConstants.XMLELEMENT_PROPERTY, isElement);
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/delegates/SDODataFactoryDelegate.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/delegates/SDODataFactoryDelegate.java
index d65e270..59e43a5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/delegates/SDODataFactoryDelegate.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/delegates/SDODataFactoryDelegate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -111,14 +111,12 @@
if (implClass != null) {
// initialization of the properties Map Implementation will be done in the default constructor call below
// testcase is in org.apache.tuscany.sdo.test
- SDODataObject theDataObject = (SDODataObject)implClass.newInstance();
+ SDODataObject theDataObject = (SDODataObject)implClass.getConstructor().newInstance();
theDataObject._setType(sdoType);
theDataObject._setHelperContext(getHelperContext());
return theDataObject;
}
- } catch (InstantiationException e) {
- throw new IllegalArgumentException(SDOException.errorCreatingDataObjectForClass(e, (sdoType).getInstanceClassName(), sdoType.getURI(), sdoType.getName()));
- } catch (IllegalAccessException e) {
+ } catch (ReflectiveOperationException e) {
throw new IllegalArgumentException(SDOException.errorCreatingDataObjectForClass(e, (sdoType).getInstanceClassName(), sdoType.getURI(), sdoType.getName()));
}
SDODataObject dataObject = new SDODataObject();
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/delegates/SDOTypeHelperDelegate.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/delegates/SDOTypeHelperDelegate.java
index e0225cf..4f01f53 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/delegates/SDOTypeHelperDelegate.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/delegates/SDOTypeHelperDelegate.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -961,7 +961,7 @@
private boolean isBaseTypeBytes(Type theType) {
if (((SDOType) theType).isSubType()) {
- List baseTypes = ((SDOType)theType).getBaseTypes();
+ List baseTypes = theType.getBaseTypes();
Type nextType = (Type)baseTypes.get(0);
if (nextType == SDOConstants.SDO_BYTES) {
return true;
@@ -998,7 +998,7 @@
if (typeValue != null) {
if (typeValue == SDOConstants.SDO_BYTES) {
newProperty.setXsdType(XMLConstants.BASE_64_BINARY_QNAME);
- } else if (((SDOType)typeValue).isDataType()) {
+ } else if (typeValue.isDataType()) {
if (isBaseTypeBytes(typeValue)) {
newProperty.setXsdType(XMLConstants.BASE_64_BINARY_QNAME);
}
@@ -1011,7 +1011,7 @@
newProperty.setContainment(dataObject.getBoolean("containment"));
} else {
if (typeValue != null) {
- newProperty.setContainment(!((SDOType)typeValue).isDataType());
+ newProperty.setContainment(!typeValue.isDataType());
}
}
@@ -1237,7 +1237,7 @@
((SDOProperty)property).setUri(propertyUri);
XMLDescriptor aDescriptor;
- if (((SDOType)property.getType()).isDataType()) {
+ if (property.getType().isDataType()) {
// RICK: Types from DataObjects: isDataType() == true so:
// - find the SDOWrapperType from TypeHelper's WrappersHashMap
// - add the descriptor to XMLContext's DescriptorsByQName map
diff --git a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/jaxb/JAXBValueStore.java b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/jaxb/JAXBValueStore.java
index e888f0b..aee2c23 100644
--- a/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/jaxb/JAXBValueStore.java
+++ b/sdo/org.eclipse.persistence.sdo/src/main/java/org/eclipse/persistence/sdo/helper/jaxb/JAXBValueStore.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -195,8 +195,8 @@
// OLD VALUE
if (mapping.isAbstractCompositeObjectMapping()) {
XMLCompositeObjectMapping compositeMapping = (XMLCompositeObjectMapping) mapping;
- if (oldValue != null && compositeMapping.getContainerAccessor() != null) {
- compositeMapping.getContainerAccessor().setAttributeValueInObject(oldValue, null);
+ if (oldValue != null && compositeMapping.getInverseReferenceMapping().getAttributeAccessor() != null) {
+ compositeMapping.getInverseReferenceMapping().getAttributeAccessor().setAttributeValueInObject(oldValue, null);
}
}
@@ -205,8 +205,8 @@
mapping.getAttributeAccessor().setAttributeValueInObject(entity, newValue);
if (mapping.isAbstractCompositeObjectMapping()) {
XMLCompositeObjectMapping compositeMapping = (XMLCompositeObjectMapping) mapping;
- if (value != null && compositeMapping.getContainerAccessor() != null) {
- compositeMapping.getContainerAccessor().setAttributeValueInObject(newValue, entity);
+ if (value != null && compositeMapping.getInverseReferenceMapping().getAttributeAccessor() != null) {
+ compositeMapping.getInverseReferenceMapping().getAttributeAccessor().setAttributeValueInObject(newValue, entity);
}
}
}
@@ -250,7 +250,7 @@
// OLD VALUE
if (mapping.isAbstractCompositeCollectionMapping()) {
XMLCompositeCollectionMapping compositeMapping = (XMLCompositeCollectionMapping) mapping;
- if (compositeMapping.getContainerAccessor() != null) {
+ if (compositeMapping.getInverseReferenceMapping().getAttributeAccessor() != null) {
Object oldContainer = mapping.getAttributeValueFromObject(entity);
if (oldContainer != null) {
@@ -258,7 +258,7 @@
Object iterator = containerPolicy.iteratorFor(oldContainer);
while (containerPolicy.hasNext(iterator)) {
Object oldValue = containerPolicy.next(iterator, session);
- compositeMapping.getContainerAccessor().setAttributeValueInObject(oldValue, null);
+ compositeMapping.getInverseReferenceMapping().getAttributeAccessor().setAttributeValueInObject(oldValue, null);
}
}
}
@@ -272,9 +272,9 @@
Object oldValue = mapping.getAttributeAccessor().getAttributeValueFromObject(entity);
if (mapping.isAbstractCompositeObjectMapping()) {
XMLCompositeObjectMapping compositeMapping = (XMLCompositeObjectMapping) mapping;
- if (compositeMapping.getContainerAccessor() != null) {
+ if (compositeMapping.getInverseReferenceMapping().getAttributeAccessor() != null) {
if (oldValue != null) {
- compositeMapping.getContainerAccessor().setAttributeValueInObject(oldValue, null);
+ compositeMapping.getInverseReferenceMapping().getAttributeAccessor().setAttributeValueInObject(oldValue, null);
}
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOSRGTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOSRGTestSuite.java
index 4c9d056..761cca7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOSRGTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOSRGTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,10 +31,10 @@
public static Test suite() {
TestSuite suite = new TestSuite("All SDO SRG Tests");
- suite.addTest((new org.eclipse.persistence.testing.sdo.helper.datafactory.SDODataFactoryTestSuite()).suite());
- suite.addTest((new org.eclipse.persistence.testing.sdo.helper.xsdhelper.define.attributes.SDOAttributeXSDTestSuite()).suite());
- suite.addTest((new org.eclipse.persistence.testing.sdo.model.dataobject.containment.ContainmentTestSuite()).suite());
- suite.addTest((new org.eclipse.persistence.testing.sdo.model.type.SDOTypeTestSuite()).suite());
+ suite.addTest(org.eclipse.persistence.testing.sdo.helper.datafactory.SDODataFactoryTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.sdo.helper.xsdhelper.define.attributes.SDOAttributeXSDTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.sdo.model.dataobject.containment.ContainmentTestSuite.suite());
+ suite.addTest(org.eclipse.persistence.testing.sdo.model.type.SDOTypeTestSuite.suite());
suite.addTest(new TestSuite(org.eclipse.persistence.testing.sdo.model.dataobject.SDODataObjectSetGetWithPropertyTest.class));
/* suite.addTest(new TestSuite(org.eclipse.persistence.testing.sdo.model.dataobject.SDODataObjectSetGetWithIndexTest.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestCase.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestCase.java
index d540538..9fa7b02 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestCase.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -114,6 +114,7 @@
// default to a static context
}
+ @Override
public void setUp() {
xmlComparer = new SDOXMLComparer();
if (customContext) {
@@ -147,6 +148,7 @@
((SDOXSDHelper) xsdHelper).reset();
}
+ @Override
public void tearDown() throws Exception {
((SDOTypeHelper) typeHelper).reset();
@@ -190,6 +192,7 @@
public void assertSchemaIdentical(Document control, Document test) {
assertTrue("Node " + control + " is not equal to node " + test, xmlComparer.isSchemaEqual(control, test));
}
+ @Override
public String getName() {
String longClassName = getClass().getName();
String shortClassName = longClassName.substring(longClassName.lastIndexOf(".") + 1, longClassName.length() - 1);
@@ -437,14 +440,14 @@
assertFalse(changeSummary.isCreated(dataObject));
assertFalse(changeSummary.isModified(dataObject));
if (!isReAttached) {
- assertTrue(((SDOChangeSummary) changeSummary).isDeleted(dataObject));
+ assertTrue(changeSummary.isDeleted(dataObject));
if (dataObject.getSequence() != null) {
assertNotNull(changeSummary.getOldSequence(dataObject));
} else {
assertNull(changeSummary.getOldSequence(dataObject));
}
} else {
- assertFalse(((SDOChangeSummary) changeSummary).isDeleted(dataObject));
+ assertFalse(changeSummary.isDeleted(dataObject));
}
int propertySize = dataObject.getType().getProperties().size();
@@ -488,9 +491,9 @@
assertFalse(changeSummary.isCreated(dataobject));
assertFalse(changeSummary.isModified(dataobject));
if (!isReAttached) {
- assertTrue(((SDOChangeSummary) changeSummary).isDeleted(dataobject));
+ assertTrue(changeSummary.isDeleted(dataobject));
} else {
- assertFalse(((SDOChangeSummary) changeSummary).isDeleted(dataobject));
+ assertFalse(changeSummary.isDeleted(dataobject));
}
int propertySize = dataobject.getType().getProperties().size();
@@ -672,7 +675,7 @@
// verify logging is on
assertTrue(aRootObject.getChangeSummary().isLogging());
SDOSequence anOriginalSequenceAfterUndo = (SDOSequence) ((SDOChangeSummary) aRootObject.getChangeSummary()).getOriginalSequences().get(aRootObject);
- SDOSequence aCurrentSequenceAfterUndo = (SDOSequence) ((SDODataObject) aRootObject).getSequence();
+ SDOSequence aCurrentSequenceAfterUndo = ((SDODataObject) aRootObject).getSequence();
assertNull(anOriginalSequenceAfterUndo);
assertNotNull(aCurrentSequenceAfterUndo);
// we return the sequence back to the current VS
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestSuite.java
index 9f92868..010c522 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,9 +42,9 @@
SDOHelperTestSuite htsu = new SDOHelperTestSuite();
SDOModelTestSuite mtsu = new SDOModelTestSuite();
SDOResolvableTestSuite rtsu = new SDOResolvableTestSuite();
- suite.addTest(htsu.suite());
- suite.addTest(mtsu.suite());
- suite.addTest(rtsu.suite());
+ suite.addTest(SDOHelperTestSuite.suite());
+ suite.addTest(SDOModelTestSuite.suite());
+ suite.addTest(SDOResolvableTestSuite.suite());
return suite;
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOXMLComparer.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOXMLComparer.java
index 9ba6fa9..734aed8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOXMLComparer.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/SDOXMLComparer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
super();
}
+ @Override
protected boolean isAttributeEqual(Attr control, Attr test) {
String name = control.getLocalName();
if (name.equals("delete") || name.equals("create") || name.equals("unset")) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/BinaryPropertyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/BinaryPropertyTestCases.java
index 9dcc5b2..a01cf74 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/BinaryPropertyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/BinaryPropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -106,22 +106,27 @@
private static final String FIXED_ID = "FIXED";
+ @Override
public String addMtomAttachment(DataHandler data, String elementName, String namespace) {
return FIXED_ID;
}
+ @Override
public String addMtomAttachment(byte[] data, int start, int length, String mimeType, String elementName, String namespace) {
return FIXED_ID;
}
+ @Override
public String addSwaRefAttachment(DataHandler data) {
return FIXED_ID;
}
+ @Override
public String addSwaRefAttachment(byte[] data, int start, int length) {
return FIXED_ID;
}
+ @Override
public boolean isXOPPackage() {
return true;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/SDOResolvableTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/SDOResolvableTest.java
index cad4bbb..3adb728 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/SDOResolvableTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/externalizable/SDOResolvableTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
super(name);
}
+ @Override
public void setUp() {
try {
xmlComparer = new SDOXMLComparer();
@@ -79,7 +80,7 @@
FileInputStream inStream = new FileInputStream("org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderNSDeep.xml");
XMLDocument document = xmlHelper.load(inStream);
- root = (DataObject)document.getRootObject();
+ root = document.getRootObject();
inStream.close();
} catch (Exception e) {
@@ -124,7 +125,7 @@
serialize(root, SERIALIZATION_FILE_NAME);
// deserialize the binary file representation
- DataObject aDeserializedDataObject = (DataObject)deserialize(SERIALIZATION_FILE_NAME);
+ DataObject aDeserializedDataObject = deserialize(SERIALIZATION_FILE_NAME);
// the original and deserialized objects should be the same
assertTrue(equalityHelper.equal(root, aDeserializedDataObject));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOCopyEqualityHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOCopyEqualityHelperTestCases.java
index 0b31968..ba59c54 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOCopyEqualityHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOCopyEqualityHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -202,6 +202,7 @@
* Test Case 5: there exists dataobject's non containment property has another DataObject that is not in containment tree as value
* Test Case 6: copied containedProperty's ChangeSummary Type property containedProperty_ChangeSummary has a copied ChangeSummary from source's ChangeSummary chSum
*/
+ @Override
public void setUp() {
super.setUp();
SDOType changeSummaryType = (SDOType) aHelperContext.getTypeHelper().getType(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOHelperTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOHelperTestSuite.java
index 9f32efb..e5ca054 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOHelperTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/SDOHelperTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,11 +39,11 @@
*/
public static Test suite() {
TestSuite suite = new TestSuite("All Helper Tests");
- suite.addTest(new SDOXSDHelperTestSuite().suite());
- suite.addTest(new SDOTypeHelperTestSuite().suite());
- suite.addTest(new SDODataFactoryTestSuite().suite());
+ suite.addTest(SDOXSDHelperTestSuite.suite());
+ suite.addTest(SDOTypeHelperTestSuite.suite());
+ suite.addTest(SDODataFactoryTestSuite.suite());
//suite.addTest(new SDOClassGenTestSuite().suite());
- suite.addTest(new SDOXMLHelperTestSuite().suite());
+ suite.addTest(SDOXMLHelperTestSuite.suite());
suite.addTestSuite(SDOHelperTestCases.class);
suite.addTestSuite(SDOHelperContextTest.class);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/BaseTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/BaseTypeTestCases.java
index 2b54dc3..2a24f2a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/BaseTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/BaseTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,18 +30,22 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/CustomerWithExtension.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./baseTypes";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/baseTypes";
}
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("CustomerType.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenComplexTypesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenComplexTypesTestCases.java
index cb27942..24ebf3a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenComplexTypesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenComplexTypesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
classGenerator = new SDOClassGenerator(aHelperContext);
@@ -202,14 +203,17 @@
runClassGenTest(xsdSchemaName, 1);
}
+ @Override
protected String getControlSourceFolder() {
return controlSourceFolder;
}
+ @Override
protected String getSourceFolder() {
return "complextypes";
}
+ @Override
protected List<String> getControlFileNames() {
return controlFileNames;
}
@@ -229,9 +233,11 @@
}
+ @Override
public void testClassGen() throws Exception {
}
+ @Override
protected String getSchemaName() {
return null;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenElementsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenElementsTestCases.java
index 546564f..e3db4ec 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenElementsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenElementsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
// schemaGen in the super will fail schema load with a NPE that generates an empty xsdString for this suite - normal
super.setUp();
@@ -230,14 +231,17 @@
}
+ @Override
protected String getSourceFolder() {
return "elements";
}
+ @Override
protected String getControlSourceFolder() {
return controlSourceFolder;
}
+ @Override
protected List<String> getControlFileNames() {
return controlFileNames;
}
@@ -257,9 +261,11 @@
}
// The following test case is out of scope for ClassGenElements - we let it fail with a NPE that generates an empty xsdString for this suite
+ @Override
public void testClassGen() throws Exception {
}
+ @Override
protected String getSchemaName() {
return null;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenUnicodeCharacterTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenUnicodeCharacterTestCases.java
index e1e0af1..f212281 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenUnicodeCharacterTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenUnicodeCharacterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,18 +37,22 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/DeptView.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./unicode";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/unicode";
}
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("DeptView\u00c9SDO.java");
@@ -56,6 +60,7 @@
return list;
}
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("model/mbcs/common");
@@ -63,6 +68,7 @@
return packages;
}
+ @Override
public String getSchema(InputStream is, String fileName) {
String xsdSchema = EMPTY_STRING;
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithImportsDontProcessTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithImportsDontProcessTestCases.java
index bf7b7f5..c4929ab 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithImportsDontProcessTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithImportsDontProcessTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
try {
@@ -44,15 +45,18 @@
}
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsWithNamespaces.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./srcImportsDontProcess";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
for(int i = 0;i < getControlFileNames().size();i++) {
@@ -61,6 +65,7 @@
return packages;
}
+ @Override
public void testClassGen() throws Exception {
StringReader reader = new StringReader(xsdString);
org.eclipse.persistence.sdo.helper.DefaultSchemaResolver schemaResolver = new org.eclipse.persistence.sdo.helper.DefaultSchemaResolver();
@@ -77,10 +82,12 @@
compareFiles(getControlFiles(), getGeneratedFiles(classGenerator.getGeneratedBuffers()));
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/srcImportsDontProcess/";
}
+ @Override
protected List<String> getControlFileNames() {
ArrayList<String> list = new ArrayList<String>();
list.add("PurchaseOrder.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithImportsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithImportsTestCases.java
index 97d76a2..303eed7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithImportsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithImportsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
try {
@@ -45,10 +46,12 @@
}
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsWithNamespaces.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./srcImports";
}
@@ -58,6 +61,7 @@
* There are two packages [my] and [uri2.my]
*/
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("uri/my");
@@ -67,6 +71,7 @@
return packages;
}
+ @Override
public void testClassGen() throws Exception {
StringReader reader = new StringReader(xsdString);
org.eclipse.persistence.sdo.helper.DefaultSchemaResolver schemaResolver = new org.eclipse.persistence.sdo.helper.DefaultSchemaResolver();
@@ -80,10 +85,12 @@
compareFiles(getControlFiles(), getGeneratedFiles(classGenerator.getGeneratedBuffers()));
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/srcImports";
}
+ @Override
protected List<String> getControlFileNames() {
ArrayList<String> list = new ArrayList<String>();
list.add("PurchaseOrder.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithInvalidClassNameFormatTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithInvalidClassNameFormatTestCases.java
index 9cbfca3..b0a9d28 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithInvalidClassNameFormatTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithInvalidClassNameFormatTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
TestRunner.main(arguments);
}
+ @Override
protected List getControlFileNames() {
ArrayList<String> controlFileNames = new ArrayList<String>();
controlFileNames.add("Company.java");
@@ -48,15 +49,18 @@
return controlFileNames;
}
+ @Override
protected String getSourceFolder() {
// 20070710: generate at root instead of internal folder
return "./invalidtypename";
}
+ @Override
protected String getControlSourceFolder() {
return "org/eclipse/persistence/testing/sdo/helper/classgen/invalidtypename/";
}
+ @Override
public void testClassGen() throws Exception {
//compileFiles(getControlSourceFolder() + "/" + getPackageDir());
compileFiles();
@@ -71,6 +75,7 @@
//compareFiles(getControlFiles(), getGeneratedFiles(classGenerator.getGeneratedBuffers()));
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/schemas/classgen/CompanyWithSequenceCSWithDuplicateInvalidClassName.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavaDocsAndListenerTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavaDocsAndListenerTestCases.java
index cd1410f..9bb133e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavaDocsAndListenerTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavaDocsAndListenerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,28 +29,34 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
classGenerator.setSDOClassGeneratorListener(new TestSDOClassGeneratorListener());
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
classGenerator.setSDOClassGeneratorListener(null);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithJavaDocs.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./poJavadocsListener";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/poJavadocsListener";
}
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("LineItemType.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavaReservedWordCollisionTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavaReservedWordCollisionTestCases.java
index f228137..8fcfbea 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavaReservedWordCollisionTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavaReservedWordCollisionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
TestRunner.main(arguments);
}
+ @Override
protected List getControlFileNames() {
ArrayList controlFileNames = new ArrayList();
controlFileNames.add("Company.java");
@@ -46,10 +47,12 @@
return controlFileNames;
}
+ @Override
protected String getSourceFolder() {
return "collidejava";
}
+ @Override
protected String getControlSourceFolder() {
return "org/eclipse/persistence/testing/sdo/helper/classgen/collidejava/";
}
@@ -67,6 +70,7 @@
//compareFiles(getControlFiles(), getGeneratedFiles(classGenerator.getGeneratedBuffers()));
}*/
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/schemas/classgen/CompanyWithSequenceCSWithJavaReservedName.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavadocsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavadocsTestCases.java
index e4b29d4..978e727 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavadocsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithJavadocsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,18 +29,22 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithJavaDocs.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./poJavadocs";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/poJavadocs";
}
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("LineItemType.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithSDOReservedWordCollisionTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithSDOReservedWordCollisionTestCases.java
index 5249af7..aa9a425 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithSDOReservedWordCollisionTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ClassGenWithSDOReservedWordCollisionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
TestRunner.main(arguments);
}
+ @Override
protected List getControlFileNames() {
ArrayList<String> controlFileNames = new ArrayList<String>();
controlFileNames.add("Company.java");
@@ -46,15 +47,18 @@
return controlFileNames;
}
+ @Override
protected String getSourceFolder() {
return "./collidesdo";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/collidesdo";
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/schemas/classgen/CompanyWithSequenceCSWithSDOReservedName.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ListTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ListTestCases.java
index 4d59a19..c3f8a47 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ListTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/ListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
//TODO: do we need to define types before generating classes???
@@ -36,18 +37,22 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/SimpleTypeWithListItem.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./list";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/list";
}
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("TestComplexType.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/NestedBaseTypesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/NestedBaseTypesTestCases.java
index 50b6592..52c338a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/NestedBaseTypesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/NestedBaseTypesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,14 +30,17 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/NestedBaseTypes.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./nestedBaseTypes";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/nestedBaseTypes";
}
@@ -51,6 +54,7 @@
compareFiles(getControlFiles(), getGeneratedFiles(classGenerator.getGeneratedBuffers()));
}*/
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("Root.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/PurchaseOrderTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/PurchaseOrderTestCases.java
index 2e1b668..e0e6ed5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/PurchaseOrderTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/PurchaseOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,18 +34,22 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrder.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./srcPO";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/srcPO";
}
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("LineItemType.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/PurchaseOrderWithAnnotationsClassGenTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/PurchaseOrderWithAnnotationsClassGenTestCases.java
index 94fe9e3..6c6e11a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/PurchaseOrderWithAnnotationsClassGenTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/PurchaseOrderWithAnnotationsClassGenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
if(null != packageNames && packageNames.size() > 0) {
return packageNames;
@@ -42,24 +43,29 @@
return packageNames;
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithAnnotations.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./srcPOAnnotations";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/srcPOAnnotations";
}
+ @Override
protected List getFileNamesToCompile(){
List returnList = getControlFileNames();
returnList.add("SKU.java");
return returnList;
}
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("PurchaseOrder.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/SDOClassGenTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/SDOClassGenTestCases.java
index d9bdf68..6be3700 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/SDOClassGenTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/SDOClassGenTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
File f = new File(getSourceFolder());
@@ -47,6 +48,7 @@
classGenerator = new SDOClassGenerator(aHelperContext);
}
+ @Override
public void tearDown() throws Exception{
super.tearDown();
List<String> packages = getPackages();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/SchemaTypesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/SchemaTypesTestCases.java
index 1d2332a..0f174ac 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/SchemaTypesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/SchemaTypesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,18 +26,22 @@
super(name);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/SchemaTypes.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./schemaTypes";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/schematypes";
}
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("MyTestType.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/TestSDOClassGeneratorListener.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/TestSDOClassGeneratorListener.java
index d4d6e08..014f2c3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/TestSDOClassGeneratorListener.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/TestSDOClassGeneratorListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,30 +24,37 @@
public TestSDOClassGeneratorListener() {
}
+ @Override
public void preInterfacePackage(StringBuffer buffer) {
buffer.append("//this is the preInterfacePackage event" + cr);
}
+ @Override
public void preImplPackage(StringBuffer buffer) {
buffer.append("//this is the preImplPackage event"+ cr);
}
+ @Override
public void preInterfaceImports(StringBuffer buffer) {
buffer.append("//this is the preInterfaceImports event"+ cr);
}
+ @Override
public void preImplImports(StringBuffer buffer) {
buffer.append("//this is the preImplImports event"+ cr);
}
+ @Override
public void preInterfaceClass(StringBuffer buffer) {
buffer.append("//this is the preInterfaceClass event"+ cr);
}
+ @Override
public void preImplClass(StringBuffer buffer) {
buffer.append("//this is the preImplClass event"+ cr);
}
+ @Override
public void preImplAttributes(StringBuffer buffer) {
buffer.append("//this is the preImplAttributes event"+ cr);
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/UnionTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/UnionTestCases.java
index 813e0de..49ff1e8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/UnionTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/UnionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
//TODO: do we need to define types before generating classes???
@@ -34,18 +35,22 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/SimpleTypeWithUnionType.xsd";
}
+ @Override
protected String getSourceFolder() {
return "./union";
}
+ @Override
protected String getControlSourceFolder() {
return "./org/eclipse/persistence/testing/sdo/helper/classgen/union";
}
+ @Override
protected List getControlFileNames() {
ArrayList list = new ArrayList();
list.add("TestComplexType.java");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/ChangeSummaryTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/ChangeSummaryTestCases.java
index ba5fd2d..083b638 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/ChangeSummaryTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/ChangeSummaryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
InputStream xsdInputStream = Thread.currentThread().getContextClassLoader().getSystemResourceAsStream(XSD);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/DataTypeManyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/DataTypeManyTestCases.java
index 2e8bd43..a355007 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/DataTypeManyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/DataTypeManyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
InputStream xsdInputStream = Thread.currentThread().getContextClassLoader().getSystemResourceAsStream(XSD);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/DataTypesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/DataTypesTestCases.java
index 729e2c7..d7386a5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/DataTypesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/DataTypesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
InputStream xsdInputStream = Thread.currentThread().getContextClassLoader().getSystemResourceAsStream(XSD);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/InheritanceTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/InheritanceTestCases.java
index f3f4e18..28c8a17 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/InheritanceTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/InheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
InputStream xsdInputStream = Thread.currentThread().getContextClassLoader().getSystemResourceAsStream(XSD);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/NonDataTypeManyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/NonDataTypeManyTestCases.java
index 401b1a3..d9c1423 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/NonDataTypeManyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/NonDataTypeManyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
InputStream xsdInputStream = Thread.currentThread().getContextClassLoader().getSystemResourceAsStream(XSD);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/NonDataTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/NonDataTypeTestCases.java
index 2d02655..55d2dbe 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/NonDataTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/NonDataTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
InputStream xsdInputStream = Thread.currentThread().getContextClassLoader().getSystemResourceAsStream(XSD);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/OneElementTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/OneElementTestCases.java
index 99fcee9..ed6d62b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/OneElementTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/classgen/dynamicimpl/OneElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
InputStream xsdInputStream = Thread.currentThread().getContextClassLoader().getSystemResourceAsStream(XSD);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperDeepCopyTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperDeepCopyTest.java
index a71ff07..0cc6aea 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperDeepCopyTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperDeepCopyTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -259,13 +259,13 @@
"containedProperty2-notdataType");
assertNotNull(bidirCopyStart);
// get property containing opposite property link (inside copy tree)
- SDOProperty bidirCopyOppositeStartProp = (SDOProperty)bidirCopyStart.getType().getProperty(//
+ SDOProperty bidirCopyOppositeStartProp = bidirCopyStart.getType().getProperty(//
"containedByContainedProperty1-notdataType");
assertNotNull(bidirCopyOppositeStartProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(bidirCopyOppositeStartProp.getType().isDataType());
// get bidir property outside of copy tree
- SDOProperty bidirCopyViaOpposite = (SDOProperty)bidirCopyOppositeStartProp.getType()//
+ SDOProperty bidirCopyViaOpposite = bidirCopyOppositeStartProp.getType()//
.getProperty("contained1Property1-notdataType");
assertNull(bidirCopyViaOpposite);
SDODataObject bidirCopyViaOppositeDO = (SDODataObject)copy.get(//
@@ -328,13 +328,13 @@
"containedProperty2-notdataType");
assertNotNull(bidirCopyStart);
// get property containing opposite property link (inside copy tree)
- SDOProperty bidirCopyOppositeStartProp = (SDOProperty)bidirCopyStart.getType().getProperty(//
+ SDOProperty bidirCopyOppositeStartProp = bidirCopyStart.getType().getProperty(//
"containedByContainedProperty1-notdataType");
assertNotNull(bidirCopyOppositeStartProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(bidirCopyOppositeStartProp.getType().isDataType());
// get bidir property outside of copy tree
- SDOProperty bidirCopyViaOpposite = (SDOProperty)bidirCopyOppositeStartProp.getType()//
+ SDOProperty bidirCopyViaOpposite = bidirCopyOppositeStartProp.getType()//
.getProperty("contained1Property1-notdataType");
assertNull(bidirCopyViaOpposite);
SDODataObject bidirCopyViaOppositeDO = (SDODataObject)copy.get(//
@@ -361,13 +361,13 @@
ChangeSummary aCS2 = bidirCopyStart.getChangeSummary();
assertNotNull(aCS2);
// get property containing opposite property link (inside copy tree)
- SDOProperty bidirCopyOppositeStartProp = (SDOProperty)bidirCopyStart.getType().getProperty(//
+ SDOProperty bidirCopyOppositeStartProp = bidirCopyStart.getType().getProperty(//
"containedByContainedProperty1-notdataType");
assertNotNull(bidirCopyOppositeStartProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(bidirCopyOppositeStartProp.getType().isDataType());
// get bidir property inside copy tree
- SDOProperty oppositeEndProp = (SDOProperty)((SDODataObject)copy.get(//
+ SDOProperty oppositeEndProp = ((SDODataObject)copy.get(//
"rootproperty3-notdatatype")).getType().getProperty("contained1Property1-notdataType").getOpposite();
assertNotNull(oppositeEndProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
@@ -383,14 +383,14 @@
// Constraint C3 - Spec 3.9.4
// verify there are no object pointers between source and copy (all objects are instance independent)
// ie: a' != a - or there are no references to "root" from "copy"
- assertNotSame((SDODataObject)root.get("rootproperty2-notdatatype/containedProperty2-notdataType"),//
- (SDODataObject)copy.get("rootproperty2-notdatatype/containedProperty2-notdataType"));
- assertNotSame((SDODataObject)root.get("rootproperty3-notdatatype"),//
- (SDODataObject)copy.get("rootproperty3-notdatatype"));
- assertNotSame((SDODataObject)root.get(//
+ assertNotSame(root.get("rootproperty2-notdatatype/containedProperty2-notdataType"),//
+ copy.get("rootproperty2-notdatatype/containedProperty2-notdataType"));
+ assertNotSame(root.get("rootproperty3-notdatatype"),//
+ copy.get("rootproperty3-notdatatype"));
+ assertNotSame(root.get(//
"rootproperty2-notdatatype/containedProperty2-notdataType/containedByContainedProperty1-notdataType"),//
- (SDODataObject)copy.get("//" +//
- "rootproperty2-notdatatype/containedProperty2-notdataType/containedByContainedProperty1-notdataType"));
+ copy.get("//" +//
+ "rootproperty2-notdatatype/containedProperty2-notdataType/containedByContainedProperty1-notdataType"));
// Spec 8.4 "Properties that are bi-directional require that no more than one end has containment=true"
assertFalse(areBothBidirectionalOppositePropertiesContainmentTrue(//
@@ -416,13 +416,13 @@
//ChangeSummary aCS2 = bidirCopyStart.getChangeSummary();
//assertNotNull(aCS2);
// get property containing opposite property link (inside copy tree)
- SDOProperty bidirCopyOppositeStartProp = (SDOProperty)bidirCopyStart.getType().getProperty(//
+ SDOProperty bidirCopyOppositeStartProp = bidirCopyStart.getType().getProperty(//
"addressWork");
assertNotNull(bidirCopyOppositeStartProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(bidirCopyOppositeStartProp.getType().isDataType());
// get bidir property inside copy tree
- SDOProperty oppositeEndProp = (SDOProperty)((SDODataObject)copy.get(//
+ SDOProperty oppositeEndProp = ((SDODataObject)copy.get(//
"rootWork")).getType().getProperty("workAddress").getOpposite();
assertNotNull(oppositeEndProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
@@ -437,18 +437,18 @@
// Constraint C3 - Spec 3.9.4
// verify there are no object pointers between source and copy (all objects are instance independent)
// ie: a' != a - or there are no references to "root" from "copy"
- assertNotSame((SDODataObject)rootUC4.get("rootHome/homeAddress"),//
- (SDODataObject)copy.get("rootHome/homeAddress"));
- assertNotSame((SDODataObject)rootUC4.get("rootWork"),//
- (SDODataObject)copy.get("rootWork"));
- assertNotSame((SDODataObject)rootUC4.get(//
+ assertNotSame(rootUC4.get("rootHome/homeAddress"),//
+ copy.get("rootHome/homeAddress"));
+ assertNotSame(rootUC4.get("rootWork"),//
+ copy.get("rootWork"));
+ assertNotSame(rootUC4.get(//
"rootHome/homeAddress/addressWork"),//
- (SDODataObject)copy.get("//" +//
- "rootHome/homeAddress/addressWork"));
+ copy.get("//" +//
+ "rootHome/homeAddress/addressWork"));
// Spec 8.4 "Properties that are bi-directional require that no more than one end has containment=true"
assertFalse(areBothBidirectionalOppositePropertiesContainmentTrue(//
- bidirCopyOppositeStartProp, (SDOProperty)bidirCopyOppositeStartProp.getOpposite()));
+ bidirCopyOppositeStartProp, bidirCopyOppositeStartProp.getOpposite()));
}
// bidirectional property target is cached during containment iteration
@@ -473,13 +473,13 @@
//ChangeSummary aCS2 = bidirCopyStart.getChangeSummary();
//assertNotNull(aCS2);
// get property containing opposite property link (inside copy tree)
- SDOProperty bidirCopyOppositeStartProp = (SDOProperty)bidirCopyStart.getType().getProperty(//
+ SDOProperty bidirCopyOppositeStartProp = bidirCopyStart.getType().getProperty(//
"addressWork");
assertNotNull(bidirCopyOppositeStartProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(bidirCopyOppositeStartProp.getType().isDataType());
// get bidir property inside copy tree
- SDOProperty oppositeEndProp = (SDOProperty)((SDODataObject)copy.get(//
+ SDOProperty oppositeEndProp = ((SDODataObject)copy.get(//
"rootHome/homeAddress")).getType().getProperty("addressWork");//.getOpposite();
assertNotNull(oppositeEndProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
@@ -495,8 +495,8 @@
// Constraint C3 - Spec 3.9.4
// verify there are no object pointers between source and copy (all objects are instance independent)
// ie: a' != a - or there are no references to "root" from "copy"
- assertNotSame((SDODataObject)rootUC4m.get("rootHome/homeAddress"),//
- (SDODataObject)copy.get("rootHome/homeAddress"));
+ assertNotSame(rootUC4m.get("rootHome/homeAddress"),//
+ copy.get("rootHome/homeAddress"));
// verify isMany objects are distinct
ListWrapper do1 = (ListWrapper)rootUC4m.get("rootWork");
ListWrapper do2 = (ListWrapper)copy.get("rootWork");
@@ -516,7 +516,7 @@
// "rootHome/homeAddress/addressWork"));
// Spec 8.4 "Properties that are bi-directional require that no more than one end has containment=true"
assertFalse(areBothBidirectionalOppositePropertiesContainmentTrue(//
- bidirCopyOppositeStartProp, (SDOProperty)bidirCopyOppositeStartProp.getOpposite()));
+ bidirCopyOppositeStartProp, bidirCopyOppositeStartProp.getOpposite()));
}
// bidirectional property target is not cached during containment iteration - original unidirectional is cached
@@ -541,13 +541,13 @@
//ChangeSummary aCS2 = bidirCopyStart.getChangeSummary();
//assertNotNull(aCS2);
// get property containing opposite property link (inside copy tree)
- SDOProperty bidirCopyOppositeStartProp = (SDOProperty)bidirCopyStart.getType().getProperty(//
+ SDOProperty bidirCopyOppositeStartProp = bidirCopyStart.getType().getProperty(//
"addressWork");
assertNotNull(bidirCopyOppositeStartProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(bidirCopyOppositeStartProp.getType().isDataType());
// get bidir property inside copy tree
- SDOProperty oppositeEndProp = (SDOProperty)((SDODataObject)copy.get(//
+ SDOProperty oppositeEndProp = ((SDODataObject)copy.get(//
"rootHome/homeAddress")).getType().getProperty("addressWork");//.getOpposite();
assertNotNull(oppositeEndProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
@@ -563,8 +563,8 @@
// Constraint C3 - Spec 3.9.4
// verify there are no object pointers between source and copy (all objects are instance independent)
// ie: a' != a - or there are no references to "root" from "copy"
- assertNotSame((SDODataObject)rootUC4m.get("rootHome/homeAddress"),//
- (SDODataObject)copy.get("rootHome/homeAddress"));
+ assertNotSame(rootUC4m.get("rootHome/homeAddress"),//
+ copy.get("rootHome/homeAddress"));
// verify isMany objects are distinct
ListWrapper do1 = (ListWrapper)rootUC4m.get("rootWork");
ListWrapper do2 = (ListWrapper)copy.get("rootWork");
@@ -585,7 +585,7 @@
// "rootHome/homeAddress/addressWork"));
// Spec 8.4 "Properties that are bi-directional require that no more than one end has containment=true"
assertFalse(areBothBidirectionalOppositePropertiesContainmentTrue(//
- bidirCopyOppositeStartProp, (SDOProperty)bidirCopyOppositeStartProp.getOpposite()));
+ bidirCopyOppositeStartProp, bidirCopyOppositeStartProp.getOpposite()));
}
// bidirectional property target is not cached during containment iteration - it is unset
@@ -611,13 +611,13 @@
//ChangeSummary aCS2 = bidirCopyStart.getChangeSummary();
//assertNotNull(aCS2);
// get property containing opposite property link (inside copy tree)
- SDOProperty bidirCopyOppositeStartProp = (SDOProperty)bidirCopyStart.getType().getProperty(//
+ SDOProperty bidirCopyOppositeStartProp = bidirCopyStart.getType().getProperty(//
"addressWork");
assertNotNull(bidirCopyOppositeStartProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(bidirCopyOppositeStartProp.getType().isDataType());
// get bidir property inside copy tree
- SDOProperty oppositeEndProp = (SDOProperty)((SDODataObject)copy.get(//
+ SDOProperty oppositeEndProp = ((SDODataObject)copy.get(//
"rootHome/homeAddress")).getType().getProperty("addressWork");//.getOpposite();
assertNotNull(oppositeEndProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
@@ -633,8 +633,8 @@
// Constraint C3 - Spec 3.9.4
// verify there are no object pointers between source and copy (all objects are instance independent)
// ie: a' != a - or there are no references to "root" from "copy"
- assertNotSame((SDODataObject)rootUC4m.get("rootHome/homeAddress"),//
- (SDODataObject)copy.get("rootHome/homeAddress"));
+ assertNotSame(rootUC4m.get("rootHome/homeAddress"),//
+ copy.get("rootHome/homeAddress"));
// verify isMany objects are distinct
ListWrapper do1 = (ListWrapper)rootUC4m.get("rootWork");
ListWrapper do2 = (ListWrapper)copy.get("rootWork");
@@ -655,7 +655,7 @@
// "rootHome/homeAddress/addressWork"));
// Spec 8.4 "Properties that are bi-directional require that no more than one end has containment=true"
assertFalse(areBothBidirectionalOppositePropertiesContainmentTrue(//
- bidirCopyOppositeStartProp, (SDOProperty)bidirCopyOppositeStartProp.getOpposite()));
+ bidirCopyOppositeStartProp, bidirCopyOppositeStartProp.getOpposite()));
}
public void testUC0102DeepCopy1_1BidirectionalPropSubTreeOutsideCopyTreeNotCopied() {
@@ -673,13 +673,13 @@
"homeAddress");
assertNotNull(bidirCopyStart);
// get property containing opposite property link (inside copy tree)
- SDOProperty bidirCopyOppositeStartProp = (SDOProperty)bidirCopyStart.getType().getProperty(//
+ SDOProperty bidirCopyOppositeStartProp = bidirCopyStart.getType().getProperty(//
"addressWork");
assertNotNull(bidirCopyOppositeStartProp);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(bidirCopyOppositeStartProp.getType().isDataType());
// get bidir property outside of copy tree
- SDOProperty bidirCopyViaOpposite = (SDOProperty)bidirCopyOppositeStartProp.getType()//
+ SDOProperty bidirCopyViaOpposite = bidirCopyOppositeStartProp.getType()//
.getProperty("workAddress");
assertNull(bidirCopyViaOpposite);
SDODataObject bidirCopyViaOppositeDO = (SDODataObject)copy.get(//
@@ -797,7 +797,7 @@
assertEquals(originalChSum.isLogging(), copyChSum.isLogging());// logging status is same
// their root dataObject have the same setting
- testCopySourceMap(containedDataObject, (SDODataObject)copyChSum.getRootObject());
+ testCopySourceMap(containedDataObject, copyChSum.getRootObject());
}
@@ -917,13 +917,13 @@
}
public void testShallowCopySourceHaveSameType() {
- SDODataObject copy = (SDODataObject)((SDOCopyHelper)copyHelper).copyShallow(root);
+ SDODataObject copy = (SDODataObject) copyHelper.copyShallow(root);
assertEquals(copy.getType(), root.getType());
}
// TODO: this tests only tests the MapValueStore impl, separate generic test required
public void testShallowCopySourceHaveDifferentMap() {
- SDODataObject copy = (SDODataObject)((SDOCopyHelper)copyHelper).copyShallow(root);
+ SDODataObject copy = (SDODataObject) copyHelper.copyShallow(root);
int copySize = getPropertiesSize(copy);
assertFalse(copySize == getPropertiesSize(root));
//testCopySourceMap(root, copy);
@@ -931,7 +931,7 @@
// TODO: this tests only tests the MapValueStore impl, separate generic test required
public void testShallowCopySourceMapsHaveSameDataTypeObj() {
- SDODataObject copy = (SDODataObject)((SDOCopyHelper)copyHelper).copyShallow(root);
+ SDODataObject copy = (SDODataObject) copyHelper.copyShallow(root);
int copySize = getPropertiesSize(copy);
assertFalse(copySize == getPropertiesSize(root));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOpenContentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOpenContentTestCases.java
index 5ee83b2..2809001 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOpenContentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOpenContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
TestRunner.run(SDOCopyHelperOpenContentTestCases.class);
}
+ @Override
public void setUp() {
super.setUp();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOpenContentWithCSTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOpenContentWithCSTestCases.java
index dba49cc..2b2e70f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOpenContentWithCSTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOpenContentWithCSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
@@ -55,10 +56,12 @@
TestRunner.run(SDOCopyHelperOpenContentWithCSTestCases.class);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/CustomerOpenContentWithCS.xsd";
}
+ @Override
protected String getXMLFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElementOpenContentWithCS.xml";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOriginalDeepCopyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOriginalDeepCopyTestCases.java
index f41b4c5..4fafa5c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOriginalDeepCopyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperOriginalDeepCopyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,10 +26,12 @@
junit.textui.TestRunner.run(SDOCopyHelperOriginalDeepCopyTestCases.class);
}
+ @Override
public SDOChangeSummary getChangeSummary() {
- return(SDOChangeSummary)containedDataObject.getChangeSummary();
+ return containedDataObject.getChangeSummary();
}
+ @Override
public void assertEqualityHelperEqual(DataObject original, DataObject copy) {
if (original.getChangeSummary() != null) {
if (original.getChangeSummary().getChangedDataObjects().size() > 0) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperTestCases.java
index d4f0c95..733e873 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/copyhelper/SDOCopyHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -110,6 +110,7 @@
* Test Case 6: copied containedProperty's ChangeSummary Type property containedProperty_ChangeSummary
* has a copied ChangeSummary from source's ChangeSummary chSum
*/
+ @Override
public void setUp() {
super.setUp();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datafactory/SDODataFactoryCreateSimpleTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datafactory/SDODataFactoryCreateSimpleTestCases.java
index 0d60036..0867877 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datafactory/SDODataFactoryCreateSimpleTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datafactory/SDODataFactoryCreateSimpleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
simpleType = getSDOType();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datafactory/USAddressImpl.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datafactory/USAddressImpl.java
index f976e68..c6d2bc0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datafactory/USAddressImpl.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datafactory/USAddressImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,18 +19,22 @@
public class USAddressImpl extends SDODataObject implements USAddress {
+ @Override
public java.lang.String getName() {
return (java.lang.String)get("name");
}
+ @Override
public void setName(java.lang.String value) {
set("name", value);
}
+ @Override
public java.lang.String getStreet() {
return (java.lang.String)get("street");
}
+ @Override
public void setStreet(java.lang.String value) {
set("street", value);
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertFromStringTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertFromStringTest.java
index 14fb1f2..23c4fd8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertFromStringTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertFromStringTest.java
@@ -22,6 +22,7 @@
import java.util.Date;
import java.util.TimeZone;
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOType;
import org.eclipse.persistence.testing.sdo.SDOTestCase;
@@ -34,14 +35,14 @@
public void testConverFromString() {
String b = "10";
Integer B = Integer.valueOf(b);
- this.assertEquals(B, (Integer)dataHelper.convertFromStringValue(b, Integer.class, null));
+ assertEquals(B, dataHelper.convertFromStringValue(b, Integer.class, null));
}
public void testConverFromString_Date() {
String b = "2000";
Date aDate = dataHelper.toDate(b);
- this.assertEquals(aDate, (Date)dataHelper.convertFromStringValue(b, Date.class, null));
+ assertEquals(aDate, dataHelper.convertFromStringValue(b, Date.class, null));
}
public void testConverFromString_Calendar() {
@@ -59,13 +60,13 @@
public void testConverFromString_NoQname() {
String b = "10";
Integer B = Integer.valueOf(b);
- this.assertEquals(B, (Integer)dataHelper.convertFromStringValue(b, Integer.class));
+ assertEquals(B, dataHelper.convertFromStringValue(b, Integer.class));
}
public void testConverFromString_Date_NoQName() {
String b = "2000";
Date aDate = dataHelper.toDate(b);
- this.assertEquals(aDate, (Date)dataHelper.convertFromStringValue(b, Date.class));
+ assertEquals(aDate, dataHelper.convertFromStringValue(b, Date.class));
}
public void testConverFromString_Calendar_NoQname() {
@@ -83,50 +84,50 @@
public void testConverFromString_Type() {
String b = "10";
Integer B = Integer.valueOf(b);
- this.assertEquals(B, (Integer)dataHelper.convertFromStringValue(b, Integer.class));
+ assertEquals(B, dataHelper.convertFromStringValue(b, Integer.class));
}
public void testConverFromString_DateWithType() {
String b = "2000";
Date aDate = dataHelper.toDate(b);
SDOType d = SDOConstants.SDO_DATE;
- this.assertEquals(aDate, (Date)dataHelper.convertFromStringValue(b, d));
+ assertEquals(aDate, dataHelper.convertFromStringValue(b, d));
}
public void testConverFromString_DateWithTypeNullQName() {
String b = "2000";
Date aDate = dataHelper.toDate(b);
SDOType d = SDOConstants.SDO_DATE;
- this.assertEquals(aDate, (Date)dataHelper.convertFromStringValue(b, d, null));
+ assertEquals(aDate, dataHelper.convertFromStringValue(b, d, null));
}
public void testConverFromString_DateWithTypeQName() {
String b = "2000";
Date aDate = dataHelper.toDate(b);
SDOType d = SDOConstants.SDO_DATE;
- this.assertEquals(aDate, (Date)dataHelper.convertFromStringValue(b, d, SDOConstants.GYEARMONTH_QNAME));
+ assertEquals(aDate, dataHelper.convertFromStringValue(b, d, SDOConstants.GYEARMONTH_QNAME));
}
public void testConverFromString_DateWithNullTypeNullQName() {
String b = "2000";
Date aDate = dataHelper.toDate(b);
SDOType d = new SDOType(aHelperContext);
- this.assertEquals(b, (String)dataHelper.convertFromStringValue(b, d, null));
+ assertEquals(b, (String)dataHelper.convertFromStringValue(b, d, null));
}
public void testConverFromObject_DateWithNullTypeNullQName() {
String b = "2000";
Date aDate = dataHelper.toDate(b);
- this.assertEquals("2000-01-01T00:00:00Z", (String)dataHelper.convertToStringValue((Object)aDate, (Type)SDOConstants.SDO_DATETIME));
- this.assertEquals("2000", (String)dataHelper.convertToStringValue((Object)aDate, (Type)SDOConstants.SDO_YEAR));
- this.assertEquals("2000-01", (String)dataHelper.convertToStringValue((Object)aDate, (Type)SDOConstants.SDO_YEARMONTH));
- this.assertEquals("2000-01-01T00:00:00Z", (String)dataHelper.convertToStringValue((Object)aDate, (Type)SDOConstants.SDO_DATE));
- this.assertEquals("00:00:00Z", (String)dataHelper.convertToStringValue((Object)aDate, (Type)SDOConstants.SDO_TIME));
- this.assertEquals("---01", (String)dataHelper.convertToStringValue((Object)aDate, (Type)SDOConstants.SDO_DAY));
- this.assertEquals("P2000Y1M1DT0H0M0.0S", (String)dataHelper.convertToStringValue((Object)aDate, (Type)SDOConstants.SDO_DURATION));
- this.assertEquals("--01", (String)dataHelper.convertToStringValue((Object)aDate, (Type)SDOConstants.SDO_MONTH));
- this.assertEquals("--01-01", (String)dataHelper.convertToStringValue((Object)aDate, (Type)SDOConstants.SDO_MONTHDAY));
+ assertEquals("2000-01-01T00:00:00Z", dataHelper.convertToStringValue(aDate, SDOConstants.SDO_DATETIME));
+ assertEquals("2000", dataHelper.convertToStringValue(aDate, SDOConstants.SDO_YEAR));
+ assertEquals("2000-01", dataHelper.convertToStringValue(aDate, SDOConstants.SDO_YEARMONTH));
+ assertEquals("2000-01-01T00:00:00Z", dataHelper.convertToStringValue(aDate, SDOConstants.SDO_DATE));
+ assertEquals("00:00:00Z", dataHelper.convertToStringValue(aDate, SDOConstants.SDO_TIME));
+ assertEquals("---01", dataHelper.convertToStringValue(aDate, SDOConstants.SDO_DAY));
+ assertEquals("P2000Y1M1DT0H0M0.0S", dataHelper.convertToStringValue(aDate, SDOConstants.SDO_DURATION));
+ assertEquals("--01", dataHelper.convertToStringValue(aDate, SDOConstants.SDO_MONTH));
+ assertEquals("--01-01", dataHelper.convertToStringValue(aDate, SDOConstants.SDO_MONTHDAY));
}
public void testConverFromObject_Date_GMTDefault() {
@@ -142,6 +143,6 @@
f.setTimeZone(TimeZone.getTimeZone("GMT"));
String dateString = f.format(aDate);
- this.assertEquals(origDateString, dateString);
+ assertEquals(origDateString, dateString);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertValueTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertValueTest.java
index 51801b2..b4469b7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertValueTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperConvertValueTest.java
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
public class DataHelperConvertValueTest extends DataHelperTestCases {
public DataHelperConvertValueTest(String name) {
super(name);
@@ -22,6 +24,6 @@
public void testToCalendarWithGYearMonth() {
String b = "true";
Boolean B = Boolean.valueOf(b);
- this.assertEquals(B, (Boolean)dataHelper.convertValue(b, Boolean.class, null));
+ assertEquals(B, dataHelper.convertValue(b, Boolean.class, null));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperTestCases.java
index f69b0ff..7686844 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
sb = new StringBuffer();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarTest.java
index 37bbc25..616e775 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.TimeZone;
@@ -168,7 +170,7 @@
public void testToCalendarWithInvalidInput() {
try {
Calendar aCalendar = dataHelper.toCalendar("----2000");
- this.fail();
+ fail();
} catch (IllegalArgumentException e) {
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarWithLocale.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarWithLocale.java
index ab63d50..38d0cc9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarWithLocale.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToCalendarWithLocale.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Locale;
import java.util.TimeZone;
@@ -178,7 +180,7 @@
try {
Locale lc = Locale.US;
Calendar aCalendar = dataHelper.toCalendar("--2000", lc);
- this.assertNull(aCalendar);
+ assertNull(aCalendar);
} catch (IllegalArgumentException e) {
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTest.java
index 0e34fcf..89a6e72 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import java.util.Locale;
import java.util.TimeZone;
+import junit.framework.TestCase;
import org.eclipse.persistence.internal.oxm.XMLConversionManager;
import org.eclipse.persistence.oxm.XMLConstants;
@@ -45,7 +46,7 @@
controlCalendar.set(Calendar.MONTH, Calendar.MAY);
Date controlDate = controlCalendar.getTime();
Date aDate = dataHelper.toDate("2001-05");
- this.assertEquals(controlDate, aDate);
+ assertEquals(controlDate, aDate);
}
public void testToDateWithGYear() {
@@ -55,7 +56,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
Date aDate = dataHelper.toDate("2000");
- this.assertEquals(controlDate, aDate);
+ assertEquals(controlDate, aDate);
}
public void testToDateWithGMonthDay() {
@@ -66,7 +67,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
Date aDate = dataHelper.toDate("--07-04");
- this.assertEquals(controlDate, aDate);
+ assertEquals(controlDate, aDate);
}
public void testToDateWithGMonth() {
@@ -76,7 +77,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
Date aDate = dataHelper.toDate("--11");
- this.assertEquals(controlDate, aDate);
+ assertEquals(controlDate, aDate);
}
public void testToDateWithGDay() {
@@ -86,7 +87,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
Date aDate = dataHelper.toDate("---15");
- this.assertEquals(controlDate, aDate);
+ assertEquals(controlDate, aDate);
}
public void testToDateWithTime() {
@@ -99,7 +100,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
Date aDate = dataHelper.toDate("01:21:12.037");
- this.assertEquals(controlDate, aDate);
+ assertEquals(controlDate, aDate);
}
public void testToDateWithDate() {
@@ -111,7 +112,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
Date aDate = dataHelper.toDate("2001-01-01");
- this.assertEquals(controlDate, aDate);
+ assertEquals(controlDate, aDate);
}
public void testToDateWithDateTime() {
@@ -127,7 +128,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
Date aDate = dataHelper.toDate("2001-10-01T00:00:01.001");
- this.assertEquals(controlDate, aDate);
+ assertEquals(controlDate, aDate);
}
public void testToDateWithDuration() {
@@ -143,7 +144,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
Date aDate = dataHelper.toDate("P12Y10M2DT0H40M27.087S");
- this.assertEquals(controlDate, aDate);
+ assertEquals(controlDate, aDate);
}
public void testToDateBeforeGregorianChange() {
@@ -187,7 +188,7 @@
public void testToCalendaWithInvalidInput() {
try {
Date aCalendar = dataHelper.toDate("--2000");
- this.fail();
+ fail();
} catch (IllegalArgumentException e) {
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeTest.java
index fad9f63..5bfe856 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -37,7 +39,7 @@
Date controlDate = controlCalendar.getTime();
String dt = dataHelper.toDateTime(controlDate);
log(dt);
- this.assertEquals("2001-05-01T12:23:11.001Z", dt);
+ assertEquals("2001-05-01T12:23:11.001Z", dt);
}
public void testToDateTimeWithDefault() {
@@ -46,12 +48,12 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String dt = dataHelper.toDateTime(controlDate);
- this.assertEquals("1970-01-01T00:00:00Z", dt);
+ assertEquals("1970-01-01T00:00:00Z", dt);
}
public void testToDateTimeWithNullInput() {
Date controlDate = null;
String dt = dataHelper.toDateTime(controlDate);
- this.assertNull(dt);
+ assertNull(dt);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeWithCalnTest.java
index a7ffafd..a52a6ce 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeWithCalnTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDateTimeWithCalnTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -34,7 +36,7 @@
controlCalendar.set(Calendar.MILLISECOND, 1);
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
String tm = dataHelper.toDateTime(controlCalendar);
- this.assertEquals("2001-04-01T11:23:11.001Z", tm);
+ assertEquals("2001-04-01T11:23:11.001Z", tm);
}
public void testToDateTimeWithDefault() {
@@ -42,12 +44,12 @@
controlCalendar.clear();
controlCalendar.set(Calendar.ZONE_OFFSET, 0);
String tm = dataHelper.toDateTime(controlCalendar);
- this.assertEquals("1970-01-01T00:00:00Z", tm);
+ assertEquals("1970-01-01T00:00:00Z", tm);
}
public void testToDateTimeWithNullInput() {
Calendar controlCalendar = null;
String tm = dataHelper.toDateTime(controlCalendar);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDayTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDayTest.java
index 16c10ac..9d30023 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDayTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDayTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
@@ -32,7 +34,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toDay(controlDate);
- this.assertEquals("---15", tm);
+ assertEquals("---15", tm);
}
public void testToDateTimeWithDefault() {
@@ -41,12 +43,12 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toDay(controlDate);
- this.assertEquals("---01", tm);
+ assertEquals("---01", tm);
}
public void testToDateTimeWithNullInput() {
Date controlDate = null;
String tm = dataHelper.toDay(controlDate);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDayWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDayWithCalnTest.java
index 3f2133d..1797c7c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDayWithCalnTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDayWithCalnTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
public class DataHelperToDayWithCalnTest extends DataHelperTestCases {
@@ -26,19 +28,19 @@
controlCalendar.clear();
controlCalendar.set(Calendar.DATE, 15);
String tm = dataHelper.toDay(controlCalendar);
- this.assertEquals("---15", tm);
+ assertEquals("---15", tm);
}
public void testToDateTimeWithDefault() {
Calendar controlCalendar = Calendar.getInstance();
controlCalendar.clear();
String tm = dataHelper.toDay(controlCalendar);
- this.assertEquals("---01", tm);
+ assertEquals("---01", tm);
}
public void testToDateTimeWithNullInput() {
Calendar controlCalendar = null;
String tm = dataHelper.toDay(controlCalendar);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationTest.java
index dd29631..7236a86 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -36,7 +38,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String dur = dataHelper.toDuration(controlDate);
- this.assertEquals("P12Y9M2DT0H40M27.87S", dur);
+ assertEquals("P12Y9M2DT0H40M27.87S", dur);
}
public void testToDurationWithDefault() {
@@ -45,12 +47,12 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String dur = dataHelper.toDuration(controlDate);
- this.assertEquals("P1970Y1M1DT0H0M0.0S", dur);
+ assertEquals("P1970Y1M1DT0H0M0.0S", dur);
}
public void testToDurationWithNullInput() {
Date controlDate = null;
String dur = dataHelper.toDuration(controlDate);
- this.assertNull(dur);
+ assertNull(dur);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationWithCalnTest.java
index 6638905..a3e53d9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationWithCalnTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToDurationWithCalnTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
@@ -33,19 +35,19 @@
controlCalendar.set(Calendar.SECOND, 27);
controlCalendar.set(Calendar.MILLISECOND, 870);
String tm = dataHelper.toDuration(controlCalendar);
- this.assertEquals("P12Y11M2DT0H40M27.87S", tm);
+ assertEquals("P12Y11M2DT0H40M27.87S", tm);
}
public void testToDateTimeWithDefault() {
Calendar controlCalendar = Calendar.getInstance();
controlCalendar.clear();
String tm = dataHelper.toDuration(controlCalendar);
- this.assertEquals("P1970Y1M1DT0H0M0.0S", tm);
+ assertEquals("P1970Y1M1DT0H0M0.0S", tm);
}
public void testToDateTimeWithNullInput() {
Calendar controlCalendar = null;
String tm = dataHelper.toDuration(controlCalendar);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthDayTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthDayTest.java
index da309c5..6d55da0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthDayTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthDayTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -31,7 +33,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toMonthDay(controlDate);
- this.assertEquals("--12-25", tm);
+ assertEquals("--12-25", tm);
}
public void testToDateTimeWithDefault() {
@@ -40,12 +42,12 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toMonthDay(controlDate);
- this.assertEquals("--01-01", tm);
+ assertEquals("--01-01", tm);
}
public void testToDateTimeWithNullInput() {
Date controlDate = null;
String tm = dataHelper.toMonthDay(controlDate);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthDayWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthDayWithCalnTest.java
index 4d14de9..834a501 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthDayWithCalnTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthDayWithCalnTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
public class DataHelperToMonthDayWithCalnTest extends DataHelperTestCases {
@@ -27,7 +29,7 @@
controlCalendar.set(Calendar.MONTH, 3);
controlCalendar.set(Calendar.DATE, 1);
String tm = dataHelper.toMonthDay(controlCalendar);
- this.assertEquals("--04-01", tm);
+ assertEquals("--04-01", tm);
}
public void testToMonthDayWithDefault() {
@@ -35,12 +37,12 @@
controlCalendar.clear();
String tm = dataHelper.toMonthDay(controlCalendar);
log("HH" + tm);
- this.assertEquals("--01-01", tm);
+ assertEquals("--01-01", tm);
}
public void testToMonthDayWithNullInput() {
Calendar controlCalendar = null;
String tm = dataHelper.toMonthDay(controlCalendar);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthTest.java
index 6c807bb..475f5b7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -30,7 +32,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toMonth(controlDate);
- this.assertEquals("--11", tm);
+ assertEquals("--11", tm);
}
public void testToMonthWithDefault() {
@@ -39,12 +41,12 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toMonth(controlDate);
- this.assertEquals("--01", tm);
+ assertEquals("--01", tm);
}
public void testToMonthWithNullInput() {
Date controlDate = null;
String tm = dataHelper.toMonth(controlDate);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthWithCalnTest.java
index eadd1c7..734dd76 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthWithCalnTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToMonthWithCalnTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
public class DataHelperToMonthWithCalnTest extends DataHelperTestCases {
@@ -26,19 +28,19 @@
controlCalendar.clear();
controlCalendar.set(Calendar.MONTH, 10);
String tm = dataHelper.toMonth(controlCalendar);
- this.assertEquals("--11", tm);
+ assertEquals("--11", tm);
}
public void testToMonthWithDefault() {
Calendar controlCalendar = Calendar.getInstance();
controlCalendar.clear();
String tm = dataHelper.toMonth(controlCalendar);
- this.assertEquals("--01", tm);
+ assertEquals("--01", tm);
}
public void testToMonthWithNullInput() {
Calendar controlCalendar = null;
String tm = dataHelper.toMonth(controlCalendar);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeTest.java
index 785e30f..328e2a2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -33,7 +35,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toTime(controlDate);
- this.assertEquals("12:23:11.001Z", tm);
+ assertEquals("12:23:11.001Z", tm);
}
public void testToTimeWithDefault() {
@@ -42,12 +44,12 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toTime(controlDate);
- this.assertEquals("00:00:00Z", tm);
+ assertEquals("00:00:00Z", tm);
}
public void testToTimeWithNullInput() {
Date controlDate = null;
String tm = dataHelper.toTime(controlDate);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeWithCalnTest.java
index 159536c..668529b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeWithCalnTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToTimeWithCalnTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -34,7 +36,7 @@
controlCalendar.set(Calendar.MILLISECOND, 1);
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
String tm = dataHelper.toTime(controlCalendar);
- this.assertEquals("11:23:11.001Z", tm);
+ assertEquals("11:23:11.001Z", tm);
}
public void testToTimeWithDefault() {
@@ -42,12 +44,12 @@
controlCalendar.clear();
controlCalendar.set(Calendar.ZONE_OFFSET, 0);
String tm = dataHelper.toTime(controlCalendar);
- this.assertEquals("00:00:00Z", tm);
+ assertEquals("00:00:00Z", tm);
}
public void testToTimeWithNullInput() {
Calendar controlCalendar = null;
String tm = dataHelper.toTime(controlCalendar);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthDayTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthDayTest.java
index b0af9dd..11a4866 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthDayTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthDayTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -32,7 +34,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toYearMonthDay(controlDate);
- this.assertEquals("2001-01-01", tm);
+ assertEquals("2001-01-01", tm);
}
public void testToMonthDayWithDefault() {
@@ -41,12 +43,12 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toYearMonthDay(controlDate);
- this.assertEquals("1970-01-01", tm);
+ assertEquals("1970-01-01", tm);
}
public void testToMonthDayWithNullInput() {
Date controlDate = null;
String tm = dataHelper.toYearMonthDay(controlDate);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthDayWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthDayWithCalnTest.java
index 492473e..a773f37 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthDayWithCalnTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthDayWithCalnTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
public class DataHelperToYearMonthDayWithCalnTest extends DataHelperTestCases {
@@ -28,19 +30,19 @@
controlCalendar.set(Calendar.MONTH, 3);
controlCalendar.set(Calendar.DATE, 1);
String tm = dataHelper.toYearMonthDay(controlCalendar);
- this.assertEquals("2001-04-01", tm);
+ assertEquals("2001-04-01", tm);
}
public void testToMonthDayWithDefault() {
Calendar controlCalendar = Calendar.getInstance();
controlCalendar.clear();
String tm = dataHelper.toYearMonthDay(controlCalendar);
- this.assertEquals("1970-01-01", tm);
+ assertEquals("1970-01-01", tm);
}
public void testToMonthDayWithNullInput() {
Calendar controlCalendar = null;
String tm = dataHelper.toYearMonthDay(controlCalendar);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthTest.java
index d689691..512bff9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -31,7 +33,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toYearMonth(controlDate);
- this.assertEquals("2001-05", tm);
+ assertEquals("2001-05", tm);
}
public void testToYearMonthWithDefault() {
@@ -40,12 +42,12 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toYearMonth(controlDate);
- this.assertEquals("1970-01", tm);
+ assertEquals("1970-01", tm);
}
public void testToYearMonthWithNullInput() {
Date controlDate = null;
String tm = dataHelper.toYearMonth(controlDate);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthWithCalnTest.java
index 8c9b494..4fbbcc4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthWithCalnTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearMonthWithCalnTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
public class DataHelperToYearMonthWithCalnTest extends DataHelperTestCases {
@@ -27,19 +29,19 @@
controlCalendar.set(Calendar.YEAR, 2001);
controlCalendar.set(Calendar.MONTH, 3);
String tm = dataHelper.toYearMonth(controlCalendar);
- this.assertEquals("2001-04", tm);
+ assertEquals("2001-04", tm);
}
public void testToYearMonthWithDefault() {
Calendar controlCalendar = Calendar.getInstance();
controlCalendar.clear();
String tm = dataHelper.toYearMonth(controlCalendar);
- this.assertEquals("1970-01", tm);
+ assertEquals("1970-01", tm);
}
public void testToYearMonthWithNullInput() {
Calendar controlCalendar = null;
String tm = dataHelper.toYearMonth(controlCalendar);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearTest.java
index cba3e91..dbb8f2e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -30,7 +32,7 @@
controlCalendar.setTimeZone(TimeZone.getTimeZone("GMT"));
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toYear(controlDate);
- this.assertEquals("2000", tm);
+ assertEquals("2000", tm);
}
public void testToYearWithDefault() {
@@ -39,12 +41,12 @@
controlCalendar.clear();
Date controlDate = controlCalendar.getTime();
String tm = dataHelper.toYear(controlDate);
- this.assertEquals("1970", tm);
+ assertEquals("1970", tm);
}
public void testToYearWithNullInput() {
Date controlDate = null;
String tm = dataHelper.toYear(controlDate);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearWithCalnTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearWithCalnTest.java
index 9bafab3..33400a7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearWithCalnTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DataHelperToYearWithCalnTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.helper.datahelper;
+import junit.framework.TestCase;
+
import java.util.Calendar;
import java.util.Date;
@@ -27,19 +29,19 @@
controlCalendar.clear();
controlCalendar.set(Calendar.YEAR, 2000);
String tm = dataHelper.toYear(controlCalendar);
- this.assertEquals("2000", tm);
+ assertEquals("2000", tm);
}
public void testToYearWithDefault() {
Calendar controlCalendar = Calendar.getInstance();
controlCalendar.clear();
String tm = dataHelper.toYear(controlCalendar);
- this.assertEquals("1970", tm);
+ assertEquals("1970", tm);
}
public void testToYearWithNullInput() {
Calendar controlCalendar = null;
String tm = dataHelper.toYear(controlCalendar);
- this.assertNull(tm);
+ assertNull(tm);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DateConvertBug5672591TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DateConvertBug5672591TestCases.java
index bf9e082..321598b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DateConvertBug5672591TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/datahelper/DateConvertBug5672591TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
DataObject rootDo = dataFactory.create("commonj.sdo", "Type");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestCases.java
index 34bb1e8..a64f797 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/entityresolver/EntityResolverTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,10 +70,12 @@
* This resolver will handle entity resolution.
*/
private class SchemaEntityResolver implements SchemaResolver {
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
return null;
}
+ @Override
public InputSource resolveEntity(String publicId, String systemId) {
try {
if (systemId.endsWith("SomeSchema.dtd")) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperBidirectionalTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperBidirectionalTest.java
index a891a3b..1729e45 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperBidirectionalTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperBidirectionalTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -96,7 +96,7 @@
assertNotNull(oppositePropertySrc);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(oppositePropertySrc.getType().isDataType());
- SDOProperty oppositePropertyDest = (SDOProperty)oppositePropertySrc.getOpposite();
+ SDOProperty oppositePropertyDest = oppositePropertySrc.getOpposite();
assertNotNull(oppositePropertyDest);
// Spec 8.4 "Properties that are bi-directional require type.dataType=false"
assertFalse(oppositePropertyDest.getType().isDataType());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperEqualTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperEqualTestCases.java
index 67b0056..cab2126 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperEqualTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperEqualTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -98,6 +98,7 @@
* Test Case 5: there exists dataobject's not containment property has another DataObjcet that is not in containment tree as value
* Test Case 6: copied containedProperty's ChangeSummary Type property containedProperty_ChangeSummary has a copied ChangeSummary from source's ChangeSummary chSum
*/
+ @Override
public void setUp() {
super.setUp();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperTest.java
index fb98674..bedb545 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/equalityhelper/SDOEqualityHelperTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,6 +15,7 @@
package org.eclipse.persistence.testing.sdo.helper.equalityhelper;
import commonj.sdo.DataObject;
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -40,30 +41,30 @@
// compare a DataObject with another DataObject with the same contents --- true
public void testDeepEqualWithADataObjectToItsSameContentObject() {
- this.assertTrue(equalityHelper.equal(root, root1));
+ assertTrue(equalityHelper.equal(root, root1));
}
// comapre a DataObject with its Shallow copy by deep equal --- false
public void testDeepEqualWithADataObjectToItsShallowCopy() {
DataObject shallowCopy = copyHelper.copyShallow(root);
- this.assertFalse(equalityHelper.equal(root, shallowCopy));
+ assertFalse(equalityHelper.equal(root, shallowCopy));
}
// comapre a DataObject with its Shallow copy by deep equal --- false
public void testDeepEqualWithADataObjectToItsChild() {
- this.assertFalse(equalityHelper.equal(root, containedDataObject));
+ assertFalse(equalityHelper.equal(root, containedDataObject));
}
// compare a DataObject with another different DataObject --- false
public void testDeepEqualWithADataObjectToAnotherDataObject() {
- this.assertFalse(equalityHelper.equal(root, containedDataObject));
+ assertFalse(equalityHelper.equal(root, containedDataObject));
}
// !! this test case base on the following and Now its meaning is still not sure !!
// Note that properties to a containing DataObject are not compared which
// means two DataObject trees can be equal even if their containers are not equal.
public void testDeepEqualWithADataObjectToAnotherDataObjectWithDifferentParents() {
- this.assertTrue(equalityHelper.equal(containedDataObject, containedDataObject_1));
+ assertTrue(equalityHelper.equal(containedDataObject, containedDataObject_1));
}
// purpose: one has open content datatype property while another doesn't
@@ -75,7 +76,7 @@
openP.setType(SDOConstants.SDO_STRING);
containedType.setOpen(true);
containedDataObject.set(openP, "test");
- this.assertFalse(equalityHelper.equal(root, root1));
+ assertFalse(equalityHelper.equal(root, root1));
}
// purpose: one has open content datatype property while another does too
@@ -88,10 +89,10 @@
containedType.setOpen(true);
containedDataObject.set(openP, "test");
containedDataObject_1.set(openP, "test");
- this.assertTrue(equalityHelper.equal(root, root1));
+ assertTrue(equalityHelper.equal(root, root1));
containedDataObject.set(openP, "test");
containedDataObject_1.set(openP, "test1");
- this.assertFalse(equalityHelper.equal(root, root1));
+ assertFalse(equalityHelper.equal(root, root1));
}
// purpose: one has open content datatype property while another doesn't
@@ -105,7 +106,7 @@
SDOType mockType = new SDOType("uri", "name");
DataObject d1 = dataFactory.create(mockType);
containedDataObject.set(openP, d1);
- this.assertFalse(equalityHelper.equal(root, root1));
+ assertFalse(equalityHelper.equal(root, root1));
}
// purpose: one has open content datatype property while another doesn't
@@ -121,7 +122,7 @@
DataObject d2 = dataFactory.create(mockType);
containedDataObject.set(openP, d1);
containedDataObject_1.set(openP, d2);
- this.assertTrue(equalityHelper.equal(root, root1));
+ assertTrue(equalityHelper.equal(root, root1));
}
// compare DataObject with properties as many
@@ -132,7 +133,7 @@
objects1.add("test");
root.set(rootProperty4, objects);
root1.set(rootProperty4, objects1);
- this.assertTrue(equalityHelper.equal(root, root1));
+ assertTrue(equalityHelper.equal(root, root1));
}
// compare DataObject with properties as many
@@ -148,7 +149,7 @@
rootProperty4.setMany(true);
root.set(rootProperty4, objects);
root1.set(rootProperty4, objects1);
- this.assertTrue(equalityHelper.equal(root, root1));
+ assertTrue(equalityHelper.equal(root, root1));
}
// compare DataObject with properties as many
@@ -176,7 +177,7 @@
rootProperty4.setMany(true);
root.set(rootProperty4, objects);
root1.set(rootProperty4, objects1);
- this.assertFalse(equalityHelper.equal(root, root1));
+ assertFalse(equalityHelper.equal(root, root1));
}
// compare DataObject with properties as many
@@ -204,7 +205,7 @@
rootProperty4.setMany(true);
root.set(rootProperty4, objects);
root1.set(rootProperty4, objects1);
- this.assertFalse(equalityHelper.equal(root, root1));
+ assertFalse(equalityHelper.equal(root, root1));
}
// compare DataObject with properties as many
@@ -232,7 +233,7 @@
rootProperty4.setMany(true);
root.set(rootProperty4, objects);
//root1.set(rootProperty4, objects1);
- this.assertFalse(equalityHelper.equal(root, root1));
+ assertFalse(equalityHelper.equal(root, root1));
}
/**
@@ -286,49 +287,49 @@
rootProperty4.setType(SDOConstants.SDO_STRING);
root.set(rootProperty4, objects);
root1.set(rootProperty4, objects1);
- this.assertTrue(equalityHelper.equal(root, root1));
+ assertTrue(equalityHelper.equal(root, root1));
}
// compare a DataObject with itself by shallow equal --- true
public void testShallowEqualWithDataObjectToItself() {
- this.assertTrue(equalityHelper.equalShallow(root, root));
+ assertTrue(equalityHelper.equalShallow(root, root));
}
// compare a DataObject with its Deep copy by shallow equal --- true
public void testShallowEqualWithADataObjectToItsDeepCopy() {
DataObject deepCopy = copyHelper.copy(root);
- this.assertTrue(equalityHelper.equalShallow(root, deepCopy));
+ assertTrue(equalityHelper.equalShallow(root, deepCopy));
}
// compare a DataObject with its Shallow copy by shallow equal --- true
public void testShallowEqualWithADataObjectToItsShallowCopy() {
DataObject shallowCopy = copyHelper.copyShallow(root);
- this.assertTrue(equalityHelper.equalShallow(root, shallowCopy));
+ assertTrue(equalityHelper.equalShallow(root, shallowCopy));
}
// compare a DataObject with another different DataObject by shallow equal --- false
public void testShallowEqualWithADataObjectToAnotherDataObject() {
- this.assertFalse(equalityHelper.equalShallow(root, containedDataObject));
+ assertFalse(equalityHelper.equalShallow(root, containedDataObject));
}
// compare null with null by deep equal --- true
public void testDeepEqualWithNullToNull() {
- this.assertTrue(equalityHelper.equal(null, null));
+ assertTrue(equalityHelper.equal(null, null));
}
// compare a DataObject with null by deep equal --- false
public void testDeepEqualWithADataObjectToNull() {
- this.assertFalse(equalityHelper.equal(root, null));
+ assertFalse(equalityHelper.equal(root, null));
}
// compare null with null by shallow equal --- true
public void testShallowEqualWithNullToNull() {
- this.assertTrue(equalityHelper.equalShallow(null, null));
+ assertTrue(equalityHelper.equalShallow(null, null));
}
// compare a DataObject with shallow null --- false
public void testShallowEqualWithADataObjectToNull() {
- this.assertFalse(equalityHelper.equalShallow(root, null));
+ assertFalse(equalityHelper.equalShallow(root, null));
}
// compare DataObject with properties as many
@@ -346,7 +347,7 @@
rootProperty5.setMany(true);
root.set(rootProperty5, objects);
root1.set(rootProperty5, objects1);
- this.assertFalse(equalityHelper.equalShallow(root, root1));
+ assertFalse(equalityHelper.equalShallow(root, root1));
}
// compare DataObject with properties as many
@@ -367,6 +368,6 @@
rootProperty5.setMany(true);
root.set(rootProperty5, objects);
//root1.set(rootProperty5, objects1);
- this.assertFalse(equalityHelper.equalShallow(root, root1));
+ assertFalse(equalityHelper.equalShallow(root, root1));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextMultiThreadedTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextMultiThreadedTest.java
index 2140a58..f4506f1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextMultiThreadedTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextMultiThreadedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -99,6 +99,7 @@
assertFalse(errors);
}
+ @Override
public void setUp() {
super.setUp();
count = 0;
@@ -123,6 +124,7 @@
this.cdl = cdl;
}
+ @Override
public void run() {
for (int i=0; i< ITERATIONS; i++) {
DataObject anObject = null;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTest.java
index 92ae7d3..f8029dd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -89,6 +89,7 @@
}
}
+ @Override
public void setUp() {
// define 1st type
setUpContext(CONTEXT1_DATAOBJECT_XSD_PATH, CONTEXT1_DATAOBJECT_XML_PATH, aNonStaticHelperContext1);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTestCases.java
index 22d1117..c71de4b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/SDOHelperContextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,6 +70,7 @@
/**
* This function is invoked by the JUnit framework before test cases are executed
*/
+ @Override
public void setUp() {
super.setUp();
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/UserSetContextMapTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/UserSetContextMapTestCases.java
index 16d6d7a..d27b614 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/UserSetContextMapTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/helpercontext/UserSetContextMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
((SDOXMLHelper)globalCtx.getXMLHelper()).reset();
}
+ @Override
public void setUp() {
FileInputStream inStream = null;
// Clear defined schemas
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/changesummary/ChangeSummaryTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/changesummary/ChangeSummaryTestCases.java
index 5977939..56b54e4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/changesummary/ChangeSummaryTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/changesummary/ChangeSummaryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
super(name);
}
+ @Override
public void setUp() {
ChangeSummaryProject project = new ChangeSummaryProject();
XMLContext xmlContext = new XMLContext(project);
@@ -332,6 +333,7 @@
assertEquals(false, setting.isSet());
}
+ @Override
public void tearDown() {
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentProject.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentProject.java
index b591fa4..8113c85 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentProject.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,14 +71,14 @@
XMLCompositeObjectMapping mapping = new XMLCompositeObjectMapping();
mapping.setReferenceClass(Child.class);
- mapping.setContainerAttributeName("container");
+ mapping.getInverseReferenceMapping().setAttributeName("container");
mapping.setAttributeName("childProperty");
mapping.setXPath("tns:child");
xmlDescriptor.addMapping(mapping);
XMLCompositeCollectionMapping mapping2 = new XMLCompositeCollectionMapping();
mapping2.setReferenceClass(Child.class);
- mapping2.setContainerAttributeName("container");
+ mapping2.getInverseReferenceMapping().setAttributeName("container");
mapping2.setAttributeName("childCollectionProperty");
mapping2.setXPath("tns:child-many");
mapping2.getContainerPolicy().setContainerClass(ArrayList.class);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentTestCases.java
index 011c71d..9f0c562 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/containment/ContainmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
super(name);
}
+ @Override
public void setUp() {
ContainmentProject project = new ContainmentProject();
XMLContext xmlContext = new XMLContext(project);
@@ -209,6 +210,7 @@
assertSame(childManyProperty, containmentProperty);
}
+ @Override
public void tearDown() {
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/copyhelper/CopyHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/copyhelper/CopyHelperTestCases.java
index eb314a8..44b5357 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/copyhelper/CopyHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/copyhelper/CopyHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
super(name);
}
+ @Override
public void setUp() {
CopyHelperProject project = new CopyHelperProject();
XMLContext xmlContext = new XMLContext(project);
@@ -91,6 +92,7 @@
assertNotNull(rootCopy.getChild2());
}
+ @Override
public void tearDown() {
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/datafactory/DataFactoryTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/datafactory/DataFactoryTestCases.java
index 1664575..2bbd21e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/datafactory/DataFactoryTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/datafactory/DataFactoryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
super(name);
}
+ @Override
public void setUp() {
try {
Class[] classes = new Class[1];
@@ -87,6 +88,7 @@
}
}
+ @Override
public void tearDown() {
}
@@ -98,6 +100,7 @@
return schemaWriter.toString();
}
+ @Override
public Result createOutput(String arg0, String arg1) throws IOException {
schemaWriter = new StringWriter();
return new StreamResult(schemaWriter);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/helpercontext/HelperContextTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/helpercontext/HelperContextTestCases.java
index 5095c35..11fbf0c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/helpercontext/HelperContextTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/helpercontext/HelperContextTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
super(name);
}
+ @Override
public void setUp() {
try {
Class[] classes = new Class[1];
@@ -304,6 +305,7 @@
assertEquals(0, entities.size());
}
+ @Override
public void tearDown() {
}
@@ -315,6 +317,7 @@
return schemaWriter.toString();
}
+ @Override
public Result createOutput(String arg0, String arg1) throws IOException {
schemaWriter = new StringWriter();
return new StreamResult(schemaWriter);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/identity/IdentityTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/identity/IdentityTestCases.java
index 06f499f..8de0f09 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/identity/IdentityTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/identity/IdentityTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
super(name);
}
+ @Override
public void setUp() {
IdentityProject project = new IdentityProject();
XMLContext xmlContext = new XMLContext(project);
@@ -66,6 +67,7 @@
assertNotSame(root1DO, root2DO);
}
+ @Override
public void tearDown() {
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetAndUnsetTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetAndUnsetTestCases.java
index aea4881..a1b9834 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetAndUnsetTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetAndUnsetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public void setUp() {
IsSetProject project = new IsSetProject();
XMLContext xmlContext = new XMLContext(project);
@@ -123,6 +124,7 @@
}
+ @Override
public void tearDown() {
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetProject.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetProject.java
index 5f78523..d8f6b51 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetProject.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/isset/IsSetProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -71,14 +71,14 @@
XMLCompositeObjectMapping mapping = new XMLCompositeObjectMapping();
mapping.setReferenceClass(Child.class);
- mapping.setContainerAttributeName("container");
+ mapping.getInverseReferenceMapping().setAttributeName("container");
mapping.setAttributeName("childProperty");
mapping.setXPath("tns:child");
xmlDescriptor.addMapping(mapping);
XMLCompositeCollectionMapping mapping2 = new XMLCompositeCollectionMapping();
mapping2.setReferenceClass(Child.class);
- mapping2.setContainerAttributeName("container");
+ mapping2.getInverseReferenceMapping().setAttributeName("container");
mapping2.setAttributeName("childCollectionProperty");
mapping2.setXPath("tns:child-many");
mapping2.getContainerPolicy().setContainerClass(ArrayList.class);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/jaxb/JAXBTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/jaxb/JAXBTestCases.java
index 6d8c2ab..a00ffd4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/jaxb/JAXBTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/jaxb/JAXBTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
public void setUp() {
try {
Class[] classes = new Class[3];
@@ -83,6 +84,7 @@
assertEquals(Child2.class, child2.getClass());
}
+ @Override
public void tearDown() {
}
@@ -94,6 +96,7 @@
return schemaWriter.toString();
}
+ @Override
public Result createOutput(String arg0, String arg1) throws IOException {
schemaWriter = new StringWriter();
return new StreamResult(schemaWriter);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/mappings/MappingsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/mappings/MappingsTestCases.java
index d3342f8..3cd4dc7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/mappings/MappingsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/mappings/MappingsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
super(name);
}
+ @Override
public void setUp() {
MappingsProject project = new MappingsProject();
XMLContext xmlContext = new XMLContext(project);
@@ -93,6 +94,7 @@
assertTrue(child1.getChild2Collection().contains(child2B));
}
+ @Override
public void tearDown() {
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/oppositeproperty/OppositePropertyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/oppositeproperty/OppositePropertyTestCases.java
index be0ef76..ebcde8b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/oppositeproperty/OppositePropertyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/oppositeproperty/OppositePropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
import org.eclipse.persistence.testing.sdo.SDOTestCase;
import commonj.sdo.DataObject;
@@ -40,6 +41,7 @@
super(name);
}
+ @Override
public void setUp() {
OppositeProject project = new OppositeProject();
XMLContext xmlContext = new XMLContext(project);
@@ -57,10 +59,10 @@
Property child2Property = child1DO.getType().getProperty("child2");
child1DO.set(child2Property, child2DO);
- this.assertEquals(child1DO, child2DO.get("child1"));
+ assertEquals(child1DO, child2DO.get("child1"));
Child2 child2 = (Child2) jaxbHelperContext.unwrap(child2DO);
- this.assertNotNull(child2.getChild1());
+ assertNotNull(child2.getChild1());
}
public void testOppositePropertyCleared1() {
@@ -73,14 +75,14 @@
child1DO.set(child2Property, child2DO);
child1DO.set(child2Property, newChild2DO);
- this.assertNull(child2DO.get("child1"));
- this.assertEquals(child1DO, newChild2DO.get("child1"));
+ assertNull(child2DO.get("child1"));
+ assertEquals(child1DO, newChild2DO.get("child1"));
Child2 child2 = (Child2) jaxbHelperContext.unwrap(child2DO);
- this.assertNull(child2.getChild1());
+ assertNull(child2.getChild1());
Child2 newChild2 = (Child2) jaxbHelperContext.unwrap(newChild2DO);
- this.assertNotNull(newChild2.getChild1());
+ assertNotNull(newChild2.getChild1());
}
public void testOppositePropertyCleared2() {
@@ -93,14 +95,14 @@
child1DO.set(child2Property, child2DO);
child1DO.set(child2Property, newChild2DO);
- this.assertNull(child2DO.get("child1"));
- this.assertEquals(child1DO, newChild2DO.get("child1"));
+ assertNull(child2DO.get("child1"));
+ assertEquals(child1DO, newChild2DO.get("child1"));
Child2 child2 = (Child2) jaxbHelperContext.unwrap(child2DO);
- this.assertNull(child2.getChild1());
+ assertNull(child2.getChild1());
Child2 newChild2 = (Child2) jaxbHelperContext.unwrap(newChild2DO);
- this.assertNotNull(newChild2.getChild1());
+ assertNotNull(newChild2.getChild1());
}
public void testOppositePropertySetCollectionCaseAdd() {
@@ -111,10 +113,10 @@
Property child2CollectionProperty = child1DO.getType().getProperty("child2collection");
List list = child1DO.getList(child2CollectionProperty);
list.add(child2DO);
- this.assertEquals(child1DO, child2DO.get("child1"));
+ assertEquals(child1DO, child2DO.get("child1"));
Child2 child2 = (Child2) jaxbHelperContext.unwrap(child2DO);
- this.assertNotNull(child2.getChild1());
+ assertNotNull(child2.getChild1());
}
public void testOppositePropertySetCollectionCaseSet() {
@@ -127,12 +129,13 @@
child2Collection.add(child2DO);
child1DO.setList(child2CollectionProperty, child2Collection);
- this.assertEquals(child1DO, child2DO.get("child1"));
+ assertEquals(child1DO, child2DO.get("child1"));
Child2 child2 = (Child2) jaxbHelperContext.unwrap(child2DO);
- this.assertNotNull(child2.getChild1());
+ assertNotNull(child2.getChild1());
}
+ @Override
public void tearDown() {
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/xmlhelper/XMLHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/xmlhelper/XMLHelperTestCases.java
index d6eb49c..0c52ebd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/xmlhelper/XMLHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/xmlhelper/XMLHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
super(name);
}
+ @Override
public void setUp() {
XMLHelperProject project = new XMLHelperProject();
XMLContext xmlContext = new XMLContext(project);
@@ -150,6 +151,7 @@
}
}
+ @Override
public void tearDown() {
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/xsdhelper/XSDHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/xsdhelper/XSDHelperTestCases.java
index 6fbf99f..bb224a8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/xsdhelper/XSDHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/jaxbhelper/xsdhelper/XSDHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public void setUp() {
XSDHelperProject project = new XSDHelperProject();
XMLContext xmlContext = new XMLContext(project);
@@ -72,6 +73,7 @@
assertSame(Child2.class, child2.getClass());
}
+ @Override
public void tearDown() {
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/sdohelper/SDOHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/sdohelper/SDOHelperTestCases.java
index 472983c..53d8af3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/sdohelper/SDOHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/sdohelper/SDOHelperTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -83,6 +83,7 @@
Type teamType;
DataObject teamDO;
+ @Override
public void setUp() throws Exception {
aHelperContext = SDOHelperContext.getHelperContext();
typeHelper = aHelperContext.getTypeHelper();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/OpenContentPropertiesByNameTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/OpenContentPropertiesByNameTestCases.java
index 2b23a64..1f216c0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/OpenContentPropertiesByNameTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/OpenContentPropertiesByNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperAppInfoTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperAppInfoTestCases.java
index fe0ee08..8e0bf91 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperAppInfoTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperAppInfoTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -81,6 +81,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
HelperContext aHelperContext;
if (customContext) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperBuiltinCommonjMapTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperBuiltinCommonjMapTestCases.java
index acbccf8..90a1c76 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperBuiltinCommonjMapTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperBuiltinCommonjMapTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,6 +15,7 @@
package org.eclipse.persistence.testing.sdo.helper.typehelper;
import commonj.sdo.Type;
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.testing.sdo.SDOTestCase;
@@ -30,12 +31,12 @@
*/
public void test_Unique_SDO_Boolean() {
Type Boolean1 = typeHelper.getType(BUILT_IN, "Boolean");
- this.assertNotNull(Boolean1);
+ assertNotNull(Boolean1);
Type Boolean2 = typeHelper.getType(BUILT_IN, "Boolean");
- this.assertNotNull(Boolean2);
+ assertNotNull(Boolean2);
- this.assertTrue(Boolean1 == Boolean2);
+ assertTrue(Boolean1 == Boolean2);
}
/**
@@ -43,12 +44,12 @@
*/
public void test_Unique_SDO_Byte() {
Type Byte1 = typeHelper.getType(BUILT_IN, "Byte");
- this.assertNotNull(Byte1);
+ assertNotNull(Byte1);
Type Byte2 = typeHelper.getType(BUILT_IN, "Byte");
- this.assertNotNull(Byte2);
+ assertNotNull(Byte2);
- this.assertTrue(Byte1 == Byte2);
+ assertTrue(Byte1 == Byte2);
}
/**
@@ -56,12 +57,12 @@
*/
public void test_Unique_SDO_Bytes() {
Type Bytes1 = typeHelper.getType(BUILT_IN, "Bytes");
- this.assertNotNull(Bytes1);
+ assertNotNull(Bytes1);
Type Bytes2 = typeHelper.getType(BUILT_IN, "Bytes");
- this.assertNotNull(Bytes2);
+ assertNotNull(Bytes2);
- this.assertTrue(Bytes1 == Bytes2);
+ assertTrue(Bytes1 == Bytes2);
}
/**
@@ -69,12 +70,12 @@
*/
public void test_Unique_SDO_CHARACTER() {
Type Character1 = typeHelper.getType(BUILT_IN, "Character");
- this.assertNotNull(Character1);
+ assertNotNull(Character1);
Type Character2 = typeHelper.getType(BUILT_IN, "Character");
- this.assertNotNull(Character2);
+ assertNotNull(Character2);
- this.assertTrue(Character1 == Character2);
+ assertTrue(Character1 == Character2);
}
/**
@@ -82,12 +83,12 @@
*/
public void test_Unique_SDO_DATAOBJECT() {
Type DataObject1 = typeHelper.getType(BUILT_IN, "DataObject");
- this.assertNotNull(DataObject1);
+ assertNotNull(DataObject1);
Type DataObject2 = typeHelper.getType(BUILT_IN, "DataObject");
- this.assertNotNull(DataObject2);
+ assertNotNull(DataObject2);
- this.assertTrue(DataObject1 == DataObject2);
+ assertTrue(DataObject1 == DataObject2);
}
/**
@@ -95,12 +96,12 @@
*/
public void test_Unique_SDO_DATE() {
Type Date1 = typeHelper.getType(BUILT_IN, "Date");
- this.assertNotNull(Date1);
+ assertNotNull(Date1);
Type Date2 = typeHelper.getType(BUILT_IN, "Date");
- this.assertNotNull(Date2);
+ assertNotNull(Date2);
- this.assertTrue(Date1 == Date2);
+ assertTrue(Date1 == Date2);
}
/**
@@ -108,12 +109,12 @@
*/
public void test_Unique_SDO_DATETIME() {
Type DateTime1 = typeHelper.getType(BUILT_IN, "DateTime");
- this.assertNotNull(DateTime1);
+ assertNotNull(DateTime1);
Type DateTime2 = typeHelper.getType(BUILT_IN, "DateTime");
- this.assertNotNull(DateTime2);
+ assertNotNull(DateTime2);
- this.assertTrue(DateTime1 == DateTime2);
+ assertTrue(DateTime1 == DateTime2);
}
/**
@@ -121,12 +122,12 @@
*/
public void test_Unique_SDO_DAY() {
Type Day1 = typeHelper.getType(BUILT_IN, "Day");
- this.assertNotNull(Day1);
+ assertNotNull(Day1);
Type Day2 = typeHelper.getType(BUILT_IN, "Day");
- this.assertNotNull(Day2);
+ assertNotNull(Day2);
- this.assertTrue(Day1 == Day2);
+ assertTrue(Day1 == Day2);
}
/**
@@ -134,12 +135,12 @@
*/
public void test_Unique_SDO_DECIMAL() {
Type Decimal1 = typeHelper.getType(BUILT_IN, "Decimal");
- this.assertNotNull(Decimal1);
+ assertNotNull(Decimal1);
Type Decimal2 = typeHelper.getType(BUILT_IN, "Decimal");
- this.assertNotNull(Decimal2);
+ assertNotNull(Decimal2);
- this.assertTrue(Decimal1 == Decimal2);
+ assertTrue(Decimal1 == Decimal2);
}
/**
@@ -147,12 +148,12 @@
*/
public void test_Unique_SDO_DOUBLE() {
Type Double1 = typeHelper.getType(BUILT_IN, "Double");
- this.assertNotNull(Double1);
+ assertNotNull(Double1);
Type Double2 = typeHelper.getType(BUILT_IN, "Double");
- this.assertNotNull(Double2);
+ assertNotNull(Double2);
- this.assertTrue(Double1 == Double2);
+ assertTrue(Double1 == Double2);
}
/**
@@ -160,12 +161,12 @@
*/
public void test_Unique_SDO_DURATION() {
Type Duration1 = typeHelper.getType(BUILT_IN, "Duration");
- this.assertNotNull(Duration1);
+ assertNotNull(Duration1);
Type Duration2 = typeHelper.getType(BUILT_IN, "Duration");
- this.assertNotNull(Duration2);
+ assertNotNull(Duration2);
- this.assertTrue(Duration1 == Duration2);
+ assertTrue(Duration1 == Duration2);
}
/**
@@ -173,12 +174,12 @@
*/
public void test_Unique_SDO_FLOAT() {
Type Float1 = typeHelper.getType(BUILT_IN, "Float");
- this.assertNotNull(Float1);
+ assertNotNull(Float1);
Type Float2 = typeHelper.getType(BUILT_IN, "Float");
- this.assertNotNull(Float2);
+ assertNotNull(Float2);
- this.assertTrue(Float1 == Float2);
+ assertTrue(Float1 == Float2);
}
/**
@@ -186,12 +187,12 @@
*/
public void test_Unique_SDO_INT() {
Type int1 = typeHelper.getType(BUILT_IN, "Int");
- this.assertNotNull(int1);
+ assertNotNull(int1);
Type int2 = typeHelper.getType(BUILT_IN, "Int");
- this.assertNotNull(int2);
+ assertNotNull(int2);
- this.assertTrue(int1 == int2);
+ assertTrue(int1 == int2);
}
/**
@@ -199,12 +200,12 @@
*/
public void test_Unique_SDO_INTEGER() {
Type Integer1 = typeHelper.getType(BUILT_IN, "Integer");
- this.assertNotNull(Integer1);
+ assertNotNull(Integer1);
Type Integer2 = typeHelper.getType(BUILT_IN, "Integer");
- this.assertNotNull(Integer2);
+ assertNotNull(Integer2);
- this.assertTrue(Integer1 == Integer2);
+ assertTrue(Integer1 == Integer2);
}
/**
@@ -212,12 +213,12 @@
*/
public void test_Unique_SDO_LONG() {
Type Long1 = typeHelper.getType(BUILT_IN, "Long");
- this.assertNotNull(Long1);
+ assertNotNull(Long1);
Type Long2 = typeHelper.getType(BUILT_IN, "Long");
- this.assertNotNull(Long2);
+ assertNotNull(Long2);
- this.assertTrue(Long1 == Long2);
+ assertTrue(Long1 == Long2);
}
/**
@@ -225,12 +226,12 @@
*/
public void test_Unique_SDO_MONTH() {
Type Month1 = typeHelper.getType(BUILT_IN, "Month");
- this.assertNotNull(Month1);
+ assertNotNull(Month1);
Type Month2 = typeHelper.getType(BUILT_IN, "Month");
- this.assertNotNull(Month2);
+ assertNotNull(Month2);
- this.assertTrue(Month1 == Month2);
+ assertTrue(Month1 == Month2);
}
/**
@@ -238,12 +239,12 @@
*/
public void test_Unique_SDO_MONTHDAY() {
Type MonthDay1 = typeHelper.getType(BUILT_IN, "MonthDay");
- this.assertNotNull(MonthDay1);
+ assertNotNull(MonthDay1);
Type MonthDay2 = typeHelper.getType(BUILT_IN, "MonthDay");
- this.assertNotNull(MonthDay2);
+ assertNotNull(MonthDay2);
- this.assertTrue(MonthDay1 == MonthDay2);
+ assertTrue(MonthDay1 == MonthDay2);
}
/**
@@ -251,12 +252,12 @@
*/
public void test_Unique_SDO_OBJECT() {
Type Object1 = typeHelper.getType(BUILT_IN, "Object");
- this.assertNotNull(Object1);
+ assertNotNull(Object1);
Type Object2 = typeHelper.getType(BUILT_IN, "Object");
- this.assertNotNull(Object2);
+ assertNotNull(Object2);
- this.assertTrue(Object1 == Object2);
+ assertTrue(Object1 == Object2);
}
/**
@@ -264,12 +265,12 @@
*/
public void test_Unique_SDO_SHORT() {
Type Short1 = typeHelper.getType(BUILT_IN, "Short");
- this.assertNotNull(Short1);
+ assertNotNull(Short1);
Type Short2 = typeHelper.getType(BUILT_IN, "Short");
- this.assertNotNull(Short2);
+ assertNotNull(Short2);
- this.assertTrue(Short1 == Short2);
+ assertTrue(Short1 == Short2);
}
/**
@@ -277,12 +278,12 @@
*/
public void test_Unique_SDO_STRING() {
Type String1 = typeHelper.getType(BUILT_IN, "String");
- this.assertNotNull(String1);
+ assertNotNull(String1);
Type String2 = typeHelper.getType(BUILT_IN, "String");
- this.assertNotNull(String2);
+ assertNotNull(String2);
- this.assertTrue(String1 == String2);
+ assertTrue(String1 == String2);
}
/**
@@ -290,12 +291,12 @@
*/
public void test_Unique_SDO_STRINGS() {
Type Strings1 = typeHelper.getType(BUILT_IN, "Strings");
- this.assertNotNull(Strings1);
+ assertNotNull(Strings1);
Type Strings2 = typeHelper.getType(BUILT_IN, "Strings");
- this.assertNotNull(Strings2);
+ assertNotNull(Strings2);
- this.assertTrue(Strings1 == Strings2);
+ assertTrue(Strings1 == Strings2);
}
/**
@@ -303,12 +304,12 @@
*/
public void test_Unique_SDO_Tim() {
Type Time1 = typeHelper.getType(BUILT_IN, "Time");
- this.assertNotNull(Time1);
+ assertNotNull(Time1);
Type Time2 = typeHelper.getType(BUILT_IN, "Time");
- this.assertNotNull(Time2);
+ assertNotNull(Time2);
- this.assertTrue(Time1 == Time2);
+ assertTrue(Time1 == Time2);
}
/**
@@ -316,12 +317,12 @@
*/
public void test_Unique_SDO_YEAR() {
Type Year1 = typeHelper.getType(BUILT_IN, "Year");
- this.assertNotNull(Year1);
+ assertNotNull(Year1);
Type Year2 = typeHelper.getType(BUILT_IN, "Year");
- this.assertNotNull(Year2);
+ assertNotNull(Year2);
- this.assertTrue(Year1 == Year2);
+ assertTrue(Year1 == Year2);
}
/**
@@ -329,12 +330,12 @@
*/
public void test_Unique_SDO_YEARMONTH() {
Type YearMonth1 = typeHelper.getType(BUILT_IN, "YearMonth");
- this.assertNotNull(YearMonth1);
+ assertNotNull(YearMonth1);
Type YearMonth2 = typeHelper.getType(BUILT_IN, "YearMonth");
- this.assertNotNull(YearMonth2);
+ assertNotNull(YearMonth2);
- this.assertTrue(YearMonth1 == YearMonth2);
+ assertTrue(YearMonth1 == YearMonth2);
}
/**
@@ -342,12 +343,12 @@
*/
public void test_Unique_SDO_YEARMONTHDAY() {
Type YearMonthDay1 = typeHelper.getType(BUILT_IN, "YearMonthDay");
- this.assertNotNull(YearMonthDay1);
+ assertNotNull(YearMonthDay1);
Type YearMonthDay2 = typeHelper.getType(BUILT_IN, "YearMonthDay");
- this.assertNotNull(YearMonthDay2);
+ assertNotNull(YearMonthDay2);
- this.assertTrue(YearMonthDay1 == YearMonthDay2);
+ assertTrue(YearMonthDay1 == YearMonthDay2);
}
/**
@@ -355,12 +356,12 @@
*/
public void test_Unique_SDO_URI() {
Type URI1 = typeHelper.getType(BUILT_IN, "URI");
- this.assertNotNull(URI1);
+ assertNotNull(URI1);
Type URI2 = typeHelper.getType(BUILT_IN, "URI");
- this.assertNotNull(URI2);
+ assertNotNull(URI2);
- this.assertTrue(URI1 == URI2);
+ assertTrue(URI1 == URI2);
}
/**
@@ -369,10 +370,10 @@
*/
public void test_Non_Built_in_URI() {
Type URI1 = typeHelper.getType("somthing.else", "URI");
- this.assertNull(URI1);
+ assertNull(URI1);
Type URI2 = typeHelper.getType(null, "URI");
- this.assertNull(URI2);
+ assertNull(URI2);
}
@@ -382,10 +383,10 @@
*/
public void test_Non_Built_Typename() {
Type URI1 = typeHelper.getType("somthing.else", "not_built_in");
- this.assertNull(URI1);
+ assertNull(URI1);
Type URI2 = typeHelper.getType("somthing.else", null);
- this.assertNull(URI2);
+ assertNull(URI2);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperDelegateInitializeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperDelegateInitializeTestCases.java
index de2a7ca..84bc1b1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperDelegateInitializeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperDelegateInitializeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
customContext = Boolean.getBoolean("customContext");
}
+ @Override
public void setUp(){
HelperContext aHelperContext;
if (customContext) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperTestSuite.java
index da9f36e..3d9460a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/SDOTypeHelperTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,7 +38,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("All TypHelper Tests");
suite.addTest(new TestSuite(SDOTypeHelperBuiltinCommonjMapTestCases.class));
- suite.addTest(new SDOTypeHelperDefineTestSuite().suite());
+ suite.addTest(SDOTypeHelperDefineTestSuite.suite());
suite.addTest(new TestSuite(OpenContentPropertiesByNameTestCases.class));
suite.addTestSuite(SDOTypeHelperExceptionTestCases.class);
suite.addTest(new TestSuite(SDOTypeHelperDelegateInitializeTestCases.class));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/MimeTypeDefineTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/MimeTypeDefineTestCases.java
index b6d777b..7c7d288 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/MimeTypeDefineTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/MimeTypeDefineTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
TestRunner.main(arguments);
}
+ @Override
protected DataObject getDataObject() {
DataObject customerType = super.getDataObject();
@@ -53,6 +54,7 @@
return customerType;
}
+ @Override
protected void verify(Type definedType) {
super.verify(definedType);
Type bytesType = typeHelper.getType("commonj.sdo", "Bytes");
@@ -92,6 +94,7 @@
}
+ @Override
protected int getPropsSize() {
return 4;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/MimeTypeOnOtherPropertyDefineTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/MimeTypeOnOtherPropertyDefineTestCases.java
index 1063626..cd03e10 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/MimeTypeOnOtherPropertyDefineTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/MimeTypeOnOtherPropertyDefineTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
TestRunner.main(arguments);
}
+ @Override
protected DataObject getDataObject() {
DataObject customerType = super.getDataObject();
Type bytesType = typeHelper.getType("commonj.sdo", "Bytes");
@@ -60,6 +61,7 @@
return customerType;
}
+ @Override
protected void verify(Type definedType) {
super.verify(definedType);
Type bytesType = typeHelper.getType("commonj.sdo", "Bytes");
@@ -76,6 +78,7 @@
}
+ @Override
protected int getPropsSize() {
return 5;
}
@@ -90,7 +93,7 @@
byte[] bytes = null;
customer.set("base64Name", bytes);
- Property prop = (SDOProperty)typeHelper.getOpenContentProperty("org.eclipse.persistence.sdo", "mimeTypeProperty");
+ Property prop = typeHelper.getOpenContentProperty("org.eclipse.persistence.sdo", "mimeTypeProperty");
//customer.set(prop, "testMimeType");//needs type to be open
customer.set("testMimeType", "Image");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/OpenContentDefineTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/OpenContentDefineTestCases.java
index b728464..12c47db 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/OpenContentDefineTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/OpenContentDefineTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/SDOTypeHelperDefineInvalidTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/SDOTypeHelperDefineInvalidTestCases.java
index 5565774..dc479f1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/SDOTypeHelperDefineInvalidTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/typehelper/define/SDOTypeHelperDefineInvalidTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -76,6 +76,7 @@
}
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
if (systemPropertyBackup == null) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/SDOXMLHelperTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/SDOXMLHelperTestSuite.java
index f89a61a..5cabe77 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/SDOXMLHelperTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/SDOXMLHelperTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,9 +30,9 @@
public static Test suite() {
TestSuite suite = new TestSuite("All XMLHelper Tests");
- suite.addTest(new SDOXMLHelperLoadTestSuite().suite());
- suite.addTest(new SDOXMLHelperSaveTestSuite().suite());
- suite.addTest(new SDOXMLHelperThreadSafetyTestSuite().suite());
+ suite.addTest(SDOXMLHelperLoadTestSuite.suite());
+ suite.addTest(SDOXMLHelperSaveTestSuite.suite());
+ suite.addTest(SDOXMLHelperThreadSafetyTestSuite.suite());
suite.addTestSuite(SDOXMLHelperExceptionTestCases.class);
return suite;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeBase64TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeBase64TestCases.java
index 21e9577..f082e0d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeBase64TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeBase64TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,30 +35,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return byte[].class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_BYTES;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myBase64Binary-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myBase64Binary-NS";
}
+ @Override
protected String getControlRootName() {
return "myBase64Binary";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myBase64Binary.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myBase64Binary-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeBooleanTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeBooleanTestCases.java
index 35688a0..dc528a5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeBooleanTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeBooleanTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,30 +36,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return Boolean.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_BOOLEAN;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myBoolean-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myBoolean-NS";
}
+ @Override
protected String getControlRootName() {
return "myBoolean";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myBoolean.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myBoolean-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeByteTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeByteTestCases.java
index 154a704..df572ec 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeByteTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeByteTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return Byte.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_BYTE;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myByte-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myByte-NS";
}
+ @Override
protected String getControlRootName() {
return "myByte";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myByte.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myByte-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeCharacterTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeCharacterTestCases.java
index 2e23f1d..50cb627 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeCharacterTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeCharacterTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_CHARACTER;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myCharacter-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myCharacter-NS";
}
+ @Override
protected String getControlRootName() {
return "myCharacter";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myCharacter.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myCharacter-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDateTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDateTestCases.java
index 466ee89..bd0af1d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDateTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,30 +33,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_DATE;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myDate-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myDate-NS";
}
+ @Override
protected String getControlRootName() {
return "myDate";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myDate.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myDate-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDateTimeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDateTimeTestCases.java
index ccd6e9a..5b5df28 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDateTimeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDateTimeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,30 +33,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_DATETIME;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myDateTime-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myDateTime-NS";
}
+ @Override
protected String getControlRootName() {
return "myDateTime";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myDateTime.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myDateTime-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDayTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDayTestCases.java
index 661d165..74124a2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDayTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_DAY;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myDay-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myDay-NS";
}
+ @Override
protected String getControlRootName() {
return "myDay";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myDay.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myDay-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDecimalTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDecimalTestCases.java
index 856096a..0b533fe 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDecimalTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDecimalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,30 +33,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return BigDecimal.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_DECIMAL;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myDecimal-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myDecimal-NS";
}
+ @Override
protected String getControlRootName() {
return "myDecimal";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myDecimal.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myDecimal-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDoubleTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDoubleTestCases.java
index fef8112..7908815 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDoubleTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeDoubleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return Double.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_DOUBLE;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myDouble-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myDouble-NS";
}
+ @Override
protected String getControlRootName() {
return "myDouble";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myDouble.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myDouble-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeFloatTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeFloatTestCases.java
index 8a9ef49..ab02f24 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeFloatTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeFloatTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return Float.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_FLOAT;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myFloat-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myFloat-NS";
}
+ @Override
protected String getControlRootName() {
return "myFloat";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myFloat.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myFloat-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeHexTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeHexTestCases.java
index 13e9210..c766080 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeHexTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeHexTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,30 +35,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return byte[].class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_BYTES;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myHexBinary-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myHexBinary-NS";
}
+ @Override
protected String getControlRootName() {
return "myHexBinary";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myHexBinary.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myHexBinary-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeIntTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeIntTestCases.java
index a92bdb2..9fdeacd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeIntTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeIntTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return Integer.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_INT;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myInt-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myInt-NS";
}
+ @Override
protected String getControlRootName() {
return "myInt";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myInt.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myInt-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeIntegerTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeIntegerTestCases.java
index 8697278..052aa82 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeIntegerTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeIntegerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,30 +33,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return BigInteger.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_INTEGER;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myInteger-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myInteger-NS";
}
+ @Override
protected String getControlRootName() {
return "myInteger";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myInteger.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myInteger-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeLongTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeLongTestCases.java
index d8d8195..12621ce 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeLongTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeLongTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return Long.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_LONG;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myLong-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myLong-NS";
}
+ @Override
protected String getControlRootName() {
return "myLong";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myLong.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myLong-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeMonthDayTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeMonthDayTestCases.java
index 5b963a7..02a7baf 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeMonthDayTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeMonthDayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_MONTHDAY;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myMonthDay-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myMonthDay-NS";
}
+ @Override
protected String getControlRootName() {
return "myMonthDay";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myMonthDay.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myMonthDay-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeMonthTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeMonthTestCases.java
index fec8568..7eb57fd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeMonthTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeMonthTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_MONTH;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myMonth-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myMonth-NS";
}
+ @Override
protected String getControlRootName() {
return "myMonth";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myMonth.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myMonth-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeObjectTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeObjectTestCases.java
index c06452d..df99f2c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeObjectTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_OBJECT;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myObject-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myObject-NS";
}
+ @Override
protected String getControlRootName() {
return "myObject";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myObject.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myObject-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeQNameTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeQNameTestCases.java
index 9eb6c9b..f9659d9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeQNameTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeQNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -122,7 +122,7 @@
ByteArrayOutputStream outstream = new ByteArrayOutputStream();
StreamResult result = new StreamResult(outstream);
- ((SDOXMLHelper) xmlHelper).save(document, result, null);
+ xmlHelper.save(document, result, null);
// Uncomment to print out document during test
//((SDOXMLHelper) xmlHelper).save(document, System.out, null);
@@ -140,7 +140,7 @@
ByteArrayOutputStream outstream = new ByteArrayOutputStream();
StreamResult result = new StreamResult(outstream);
- ((SDOXMLHelper) xmlHelper).save(document, result, null);
+ xmlHelper.save(document, result, null);
// Uncomment to print out document during test
//((SDOXMLHelper) xmlHelper).save(document, System.out, null);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeShortTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeShortTestCases.java
index c340663..f35112e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeShortTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeShortTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return Short.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_SHORT;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myShort-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myShort-NS";
}
+ @Override
protected String getControlRootName() {
return "myShort";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myShort.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myShort-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeStringTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeStringTestCases.java
index 77bccf5..bbe1b30 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeStringTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_STRING;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myString-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myString-NS";
}
+ @Override
protected String getControlRootName() {
return "myString";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myString.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myString-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeStringsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeStringsTestCases.java
index 74c7599..563d792 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeStringsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeStringsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_STRINGS;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myStrings-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myStrings-NS";
}
+ @Override
protected String getControlRootName() {
return "myStrings";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myStrings.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myStrings-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeTestCase.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeTestCase.java
index bd3842d..5167ec1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeTestCase.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -151,7 +151,7 @@
ByteArrayOutputStream outstream = new ByteArrayOutputStream();
StreamResult result = new StreamResult(outstream);
- ((SDOXMLHelper) xmlHelper).save(document, result, null);
+ xmlHelper.save(document, result, null);
// Uncomment to print out document during test
//((SDOXMLHelper) xmlHelper).save(document, System.out, null);
@@ -169,7 +169,7 @@
ByteArrayOutputStream outstream = new ByteArrayOutputStream();
StreamResult result = new StreamResult(outstream);
- ((SDOXMLHelper) xmlHelper).save(document, result, null);
+ xmlHelper.save(document, result, null);
// Uncomment to print out document during test
//((SDOXMLHelper) xmlHelper).save(document, System.out, null);
@@ -187,7 +187,7 @@
ByteArrayOutputStream outstream = new ByteArrayOutputStream();
StreamResult result = new StreamResult(outstream);
- ((SDOXMLHelper) xmlHelper).save(document, result, null);
+ xmlHelper.save(document, result, null);
// Uncomment to print out document during test
//((SDOXMLHelper) xmlHelper).save(document, System.out, null);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeTimeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeTimeTestCases.java
index 7d6e586..a19579a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeTimeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeTimeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_TIME;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myTime-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myTime-NS";
}
+ @Override
protected String getControlRootName() {
return "myTime";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myTime.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myTime-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeUriTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeUriTestCases.java
index c70c74b..eba4d39 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeUriTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeUriTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_URI;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myUri-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myUri-NS";
}
+ @Override
protected String getControlRootName() {
return "myUri";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myUri.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myUri-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearMonthDayTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearMonthDayTestCases.java
index 6d06396..3e11903 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearMonthDayTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearMonthDayTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,30 +33,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_YEARMONTHDAY;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myYearMonthDay-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myYearMonthDay-NS";
}
+ @Override
protected String getControlRootName() {
return "myYearMonthDay";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myYearMonthDay.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myYearMonthDay-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearMonthTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearMonthTestCases.java
index a62265b..e0410a4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearMonthTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearMonthTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_YEARMONTH;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myYearMonth-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myYearMonth-NS";
}
+ @Override
protected String getControlRootName() {
return "myYearMonth";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myYearMonth.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myYearMonth-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearTestCases.java
index f3f1f2b..a52a05a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/SDOXMLHelperDatatypeYearTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,30 +31,37 @@
TestRunner.main(arguments);
}
+ @Override
protected Class getDatatypeJavaClass() {
return String.class;
}
+ @Override
protected SDOType getValueType() {
return SDOConstants.SDO_YEAR;
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/myYear-1.xml");
}
+ @Override
protected String getControlRootURI() {
return "myYear-NS";
}
+ @Override
protected String getControlRootName() {
return "myYear";
}
+ @Override
protected String getSchemaNameForUserDefinedType() {
return getSchemaLocation() + "myYear.xsd";
}
+ @Override
protected String getSchemaNameForBuiltinType() {
return getSchemaLocation() + "myYear-builtin.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/XsiTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/XsiTypeTestCases.java
index 2183ca5..56d65ff 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/XsiTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/datatype/XsiTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
super(name);
}
+ @Override
public void setUp() {
HelperContext helperContext = new SDOHelperContext();
xmlHelper = helperContext.getXMLHelper();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadPurchaseOrderTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadPurchaseOrderTestCases.java
index b89a81b..4b06620 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadPurchaseOrderTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadPurchaseOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,14 +22,17 @@
super(name);
}
+ @Override
protected String getFileNameToLoad() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderNS.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrder.xsd";
}
+ @Override
protected void verifyDocument(XMLDocument document) {
super.verifyDocument(document);
assertEquals("purchaseOrder", document.getRootElementName());
@@ -73,6 +76,7 @@
}
}
+ @Override
protected void createTypes() {
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSchemasWithImportAndInheritance.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSchemasWithImportAndInheritance.java
index 19bddf2..aab9be4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSchemasWithImportAndInheritance.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSchemasWithImportAndInheritance.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,7 @@
}
private class MySchemaResolver implements SchemaResolver {
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
try {
FileInputStream fInstream = new FileInputStream("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/" + schemaLocation);
@@ -68,6 +69,7 @@
return null;
}
+ @Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
return null;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSchemasWithImportCloseStream.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSchemasWithImportCloseStream.java
index cb1bf52..af0b113 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSchemasWithImportCloseStream.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSchemasWithImportCloseStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -72,6 +72,7 @@
private class MySchemaResolver implements SchemaResolver {
private List<MyFileInputStream> streams = new ArrayList<MyFileInputStream>();
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
try {
InputStream fInstream = this.getClass().getClassLoader().getResourceAsStream("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/" + schemaLocation);
@@ -90,6 +91,7 @@
return streams;
}
+ @Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
return null;
}
@@ -102,6 +104,7 @@
super(is);
}
+ @Override
public void close() throws IOException{
super.close();
isClosed = true;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSimpleAttributeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSimpleAttributeTestCases.java
index a9cae20..d2a0d0e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSimpleAttributeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSimpleAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,10 +24,12 @@
super(name);
}
+ @Override
protected String getFileNameToLoad() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleAttribute.xml");
}
+ @Override
protected void verifyDocument(XMLDocument document) {
super.verifyDocument(document);
assertEquals(CONTROL_ROOT_NAME, document.getRootElementName());
@@ -55,6 +57,7 @@
}
}
+ @Override
protected void createTypes() {
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSimpleElementTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSimpleElementTestCases.java
index 98fc9f6..622b793 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSimpleElementTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadSimpleElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,10 +24,12 @@
super(name);
}
+ @Override
protected String getFileNameToLoad() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElement.xml");
}
+ @Override
protected void verifyDocument(XMLDocument document) {
super.verifyDocument(document);
assertEquals(CONTROL_ROOT_NAME, document.getRootElementName());
@@ -55,6 +57,7 @@
}
}
+ @Override
protected void createTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadWithDataHandlerGetStringTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadWithDataHandlerGetStringTestCases.java
index 9046ff3..682dae1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadWithDataHandlerGetStringTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/LoadWithDataHandlerGetStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,14 +25,17 @@
super(name);
}
+ @Override
protected String getFileNameToLoad() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/datahandler_base64.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/DataHandler_Base64.xsd";
}
+ @Override
protected void verifyDocument(XMLDocument document) {
super.verifyDocument(document);
@@ -42,6 +45,7 @@
assertTrue("Unexpected String Value: " + value, value.equals(CONTROL_BASE64_VALUE));
}
+ @Override
protected void createTypes() {
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/StringWrapperBug268335TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/StringWrapperBug268335TestCases.java
index da35488..fae69ac 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/StringWrapperBug268335TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/StringWrapperBug268335TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,14 +23,17 @@
super(name);
}
+ @Override
protected String getFileNameToLoad() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/268335-string.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/load/268335.xsd";
}
+ @Override
protected void verifyDocument(XMLDocument document) {
super.verifyDocument(document);
@@ -42,6 +45,7 @@
assertEquals("The wrong wrapper type was created.", doClassName, "org.eclipse.persistence.sdo.types.SDOWrapperType.StringWrapperImpl");
}
+ @Override
protected void createTypes() {
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/AttachmentMarshallerImpl.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/AttachmentMarshallerImpl.java
index 2b7c407..9f4acdc 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/AttachmentMarshallerImpl.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/AttachmentMarshallerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,22 +30,27 @@
}
// maintain a global counter
+ @Override
public String addMtomAttachment(byte[] bytes, int start, int offset, String namespaceURI, String elemtnName, String mimeType) {
return id;
}
+ @Override
public String addSwaRefAttachment(byte[] bytes, int start, int offset) {
throw new UnsupportedOperationException("addSwaRefAttachment not supported");
}
+ @Override
public String addMtomAttachment(DataHandler data, String elementName, String namespace) {
throw new UnsupportedOperationException("addMtomAttachment not supported");
}
+ @Override
public String addSwaRefAttachment(DataHandler data) {
throw new UnsupportedOperationException("addSwaRefAttachment not supported");
}
+ @Override
public boolean isXOPPackage() {
// force attachment usage
return true;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/AttachmentUnmarshallerImpl.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/AttachmentUnmarshallerImpl.java
index b6fa669..6a1003d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/AttachmentUnmarshallerImpl.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/AttachmentUnmarshallerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,15 +28,18 @@
this.bytes = bytes;
}
+ @Override
public byte[] getAttachmentAsByteArray(String cid) {
return bytes;
}
+ @Override
public DataHandler getAttachmentAsDataHandler(String id) {
throw new UnsupportedOperationException("getAttachmentAsDataHandler not supported");
}
+ @Override
public boolean isXOPPackage() {
// force attachment usage
return true;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveAttributeGroupTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveAttributeGroupTestCases.java
index 83ee4cc..826710f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveAttributeGroupTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveAttributeGroupTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
TestRunner.main(arguments);
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
Type rootType = typeHelper.getType(getControlRootURI(), "root");
@@ -72,6 +73,7 @@
assertEquals("href", ((Property)childDeclaredProps.get(8)).getName());
}
+ @Override
protected List defineTypes() {
try {
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -84,6 +86,7 @@
}
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception {
URL url = new URL(getSchemaLocation() + getSchemaName());
InputStream is = url.openStream();
@@ -96,41 +99,50 @@
classGenerator.generate(ss, tmpDirName, schemaResolver);
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/attributegroup/";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/attributegroup/AttributeGroup.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/attributegroup/AttributeGroupNoSchema.xml";
}
+ @Override
protected String getSchemaName() {
return "AttributeGroup.xsd";
}
+ @Override
protected String getControlRootURI() {
return "http://schemas.xmlsoap.org/soap/encoding/";
}
+ @Override
protected String getControlRootName() {
return "wrapper";
}
+ @Override
protected String getRootInterfaceName() {
return "Wrapper";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("org/xmlsoap/schemas/soap/encoding");
return packages;
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
SDOType typeType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.TYPE);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveBase64AttachmentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveBase64AttachmentTestCases.java
index 085c3ad..31b87f6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveBase64AttachmentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveBase64AttachmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
@@ -54,30 +55,37 @@
anUnmarshaller.setAttachmentUnmarshaller(anAttachmentUnmarshaller);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/EmployeeWithBase64Attachment.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithBase64Attachment.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithBase64Attachment.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://www.example.org";
}
+ @Override
protected String getControlRootName() {
return "employeeType";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
SDOType bytesType = (SDOType) typeHelper.getType("commonj.sdo", "Bytes");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveBug6130541TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveBug6130541TestCases.java
index dcfe476..db8399a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveBug6130541TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveBug6130541TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,22 +39,27 @@
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderWithIDREF.xml";
}
*/
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/bug6130541/Bug6130541.xml";
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/helper/xmlhelper/bug6130541/Bug6130541.xsd";
}
+ @Override
protected String getControlRootURI() {
return "http://theUri";
}
+ @Override
protected String getControlRootName() {
return "company";
}
+ @Override
protected String getRootInterfaceName() {
return "CompanyType";
}
@@ -70,6 +75,7 @@
StreamSource ss = new StreamSource(is);
classGenerator.generate(ss, tmpDirName, schemaResolver);
}*/
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveDataHandlerTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveDataHandlerTestCases.java
index 968b875..cccb2f1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveDataHandlerTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveDataHandlerTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,37 +38,46 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "EmployeeDataHandler1.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/schemas/";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithDataHandler.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithDataHandler.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://www.example.org";
}
+ @Override
protected String getControlRootName() {
return "employeeType";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
protected List defineTypes() {
try {
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -81,6 +90,7 @@
}
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception{
URL url = new URL(getSchemaLocation() + getSchemaName());
InputStream is = url.openStream();
@@ -93,6 +103,7 @@
classGenerator.generate(ss, tmpDirName, schemaResolver);
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
SDOType bytesType = (SDOType) typeHelper.getType("commonj.sdo", "Bytes");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveEmptyElementTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveEmptyElementTestCases.java
index 245e313..0c93260 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveEmptyElementTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveEmptyElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,38 +29,47 @@
super(name);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/empty/input.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/empty/input.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/empty/output.xml");
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/empty/output.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/empty/input.xml");
}
+ @Override
protected String getControlRootURI() {
return "namespace1";
}
+ @Override
protected String getControlRootName() {
return "root";
}
+ @Override
protected String getRootInterfaceName() {
return "RootType";
}
+ @Override
protected void verifyAfterLoad (XMLDocument document) {
super.verifyAfterLoad(document);
DataObject rootDO = document.getRootObject();
@@ -90,12 +99,14 @@
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("namespace1");
return packages;
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
Type decimalType = typeHelper.getType("commonj.sdo", "Decimal");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveExceptionBug325353TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveExceptionBug325353TestCases.java
index ca4052d..9e5fce9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveExceptionBug325353TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveExceptionBug325353TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,37 +39,45 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/Customer.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElement.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElementNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "customer";
}
+ @Override
protected String getRootInterfaceName() {
return "CustomerType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
@@ -94,6 +102,7 @@
typeHelper.defineOpenContentProperty(getControlRootURI(), propDO);
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
xmlHelper = new SDOHelperContext().getXMLHelper();
assertNotNull(document);
@@ -101,6 +110,7 @@
assertNull(document.getRootObject().getContainer());
}
+ @Override
public void testLoadFromAndSaveAfterDefineMultipleSchemas() throws Exception {
try{
super.testLoadFromAndSaveAfterDefineMultipleSchemas();
@@ -111,6 +121,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testLoadFromDomSourceWithURIAndOptionsSaveDataObjectToStreamResult() throws Exception {
try{
super.testLoadFromDomSourceWithURIAndOptionsSaveDataObjectToStreamResult();
@@ -121,6 +132,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testLoadFromFileReaderWithURIAndOptionsStreamSaveDataObjectToWriter() throws Exception {
try{
super.testLoadFromFileReaderWithURIAndOptionsStreamSaveDataObjectToWriter();
@@ -131,6 +143,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testLoadFromInputStreamSaveDocumentToOutputStream() throws Exception {
try{
super.testLoadFromInputStreamSaveDocumentToOutputStream();
@@ -141,6 +154,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testLoadFromInputStreamWithURIAndOptionsSaveDataObjectToOutputStream() throws Exception {
try{
super.testLoadFromInputStreamWithURIAndOptionsSaveDataObjectToOutputStream();
@@ -151,6 +165,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testLoadFromInputStreamWithURIAndOptionsSaveDataObjectToStreamResult() throws Exception {
try{
super.testLoadFromInputStreamWithURIAndOptionsSaveDataObjectToStreamResult();
@@ -161,6 +176,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testLoadFromSAXSourceWithURIAndOptionsSaveDataObjectToStreamResult() throws Exception {
try{
super.testLoadFromSAXSourceWithURIAndOptionsSaveDataObjectToStreamResult();
@@ -171,6 +187,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testLoadFromStreamSourceWithURIAndOptionsSaveDataObjectToStreamResult() throws Exception {
try{
super.testLoadFromStreamSourceWithURIAndOptionsSaveDataObjectToStreamResult();
@@ -181,6 +198,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testLoadFromStringSaveDocumentToWriter() throws Exception {
try{
super.testLoadFromStringSaveDocumentToWriter();
@@ -191,6 +209,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
try{
super.testNoSchemaLoadFromInputStreamSaveDataObjectToString();
@@ -201,6 +220,7 @@
fail("An SDOException should have been thrown.");
}
+ @Override
public void testClassGenerationLoadAndSave() throws Exception {
try{
super.testClassGenerationLoadAndSave();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveGroupTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveGroupTestCases.java
index bb2a69b..198585a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveGroupTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveGroupTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,41 +34,50 @@
TestRunner.main(arguments);
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/group/Group.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/group/GroupNoSchema.xml";
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/group/Group.xsd";
}
+ @Override
protected String getControlRootURI() {
return "theURI";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("theuri");
return packages;
}
+ @Override
protected String getControlRootName() {
return "AAA";
}
+ @Override
protected String getRootInterfaceName() {
return "AAA";
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
SDOType typeType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.TYPE);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveIDRefTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveIDRefTestCases.java
index b3ccdf8..0cf5359 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveIDRefTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveIDRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,35 +36,43 @@
TestRunner.main(arguments);
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderWithIDREF.xml";
}
+ @Override
protected String getControlDataObjectFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderWithIDREF.xml";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderWithIDREF.xml";
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithIDREF.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "company";
}
+ @Override
protected String getRootInterfaceName() {
return "Company";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
@@ -163,6 +171,7 @@
//return typeHelper.define(customerType);
}
+ @Override
public void registerTypes() {
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
@@ -205,6 +214,7 @@
typeHelper.defineOpenContentProperty(getControlRootURI(), propDO);
}
+ @Override
public void verifyAfterLoad(XMLDocument doc)
{
super.verifyAfterLoad(doc);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsDefaultNamespaceTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsDefaultNamespaceTestCases.java
index eb68ef7..e09f51f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsDefaultNamespaceTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsDefaultNamespaceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,34 +40,42 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "Dept.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/dept.xml");
}
+ @Override
protected String getControlWriteFileName(){
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/deptWrite.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/deptNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://sdo.sample.service.types/Dept/";
}
+ @Override
protected String getControlRootName() {
return "dept";
}
+ @Override
protected String getRootInterfaceName() {
return "Dept";
}
+ @Override
protected List defineTypes() {
try {
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -79,10 +87,12 @@
}
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/";
}
+ @Override
protected List getPackages() {
List packages = new ArrayList();
packages.add("sdo/sample/service/types/dept");
@@ -91,6 +101,7 @@
return packages;
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception{
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -104,6 +115,7 @@
classGenerator.generate(ss, tmpDirName, schemaResolver);
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsElementOrderTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsElementOrderTestCases.java
index 3a46a03..f171b56 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsElementOrderTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsElementOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,34 +40,42 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "Types.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/employee_types.xml");
}
+ @Override
protected String getControlWriteFileName(){
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/employee_types.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/employee_types.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://www.example.org/emp";
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
protected List defineTypes() {
try {
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -79,16 +87,19 @@
}
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/";
}
+ @Override
protected List getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("org/example/emp");
return packages;
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception{
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -102,10 +113,12 @@
classGenerator.generate(ss, tmpDirName, schemaResolver);
}
+ @Override
public void registerTypes() {
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsWithInheritanceTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsWithInheritanceTestCases.java
index 8399d49..e34f0d8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsWithInheritanceTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveImportsWithInheritanceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,31 +40,38 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "SchemaA.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/importswithinheritance/c-type.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/importswithinheritance/c-type_noschema.xml");
}
+ @Override
protected String getControlRootURI() {
return "SchemaCNamespace";
}
+ @Override
protected String getControlRootName() {
return "childType";
}
+ @Override
protected String getRootInterfaceName() {
return "ChildType";
}
+ @Override
protected List defineTypes() {
try {
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -76,10 +83,12 @@
return null;
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/importswithinheritance/";
}
+ @Override
protected List getPackages() {
List packages = new ArrayList();
packages.add("schemacnamespace");
@@ -88,6 +97,7 @@
return packages;
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception {
URL url = new URL(getSchemaLocation() + getSchemaName());
InputStream is = url.openStream();
@@ -98,6 +108,7 @@
classGenerator.generate(ss, tmpDirName, schemaResolver);
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveIncludeWithExtensionTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveIncludeWithExtensionTestCases.java
index bde05a7..fd3ef8a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveIncludeWithExtensionTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveIncludeWithExtensionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
super(name);
}
+ @Override
protected List defineTypes() {
try {
@@ -54,50 +55,61 @@
}
}
+ @Override
protected String getUnrelatedSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/OrderBookingPO.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/includeWithExtension/";
}
+ @Override
protected String getSchemaName() {
return "WithInclude.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/includeWithExtension/withInclude.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/includeWithExtension/withIncludeNoTypes.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/includeWithExtension/withInclude.xml");
}
+ @Override
protected String getControlRootURI() {
return "my.uri";
}
+ @Override
protected String getControlRootName() {
return "root";
}
+ @Override
protected String getRootInterfaceName() {
return "ChildType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("uri/my");
return packages;
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception{
String xsd = FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/includeWithExtension/WithInclude.xsd";
@@ -116,6 +128,7 @@
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
@@ -142,6 +155,7 @@
typeHelper.defineOpenContentProperty(getControlRootURI(), rootPropDO);
}
+ @Override
public void verifyAfterLoad(XMLDocument doc){
DataObject rootDO = doc.getRootObject();
rootDO.getType();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveInheritanceBug6043501TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveInheritanceBug6043501TestCases.java
index 12cc8f9..efebc18 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveInheritanceBug6043501TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveInheritanceBug6043501TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,30 +37,37 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "CompanyBug6043501.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/companyBug6043501.xml");
}
+ @Override
protected String getControlWriteFileName(){
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/companyBug6043501Write.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/companyBug6043501NoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://testUri";
}
+ @Override
protected String getControlRootName() {
return "company";
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception{
URL url = new URL(getSchemaLocation() + getSchemaName());
InputStream is = url.openStream();
@@ -73,10 +80,12 @@
classGenerator.generate(ss, tmpDirName, schemaResolver);
}
+ @Override
protected String getRootInterfaceName() {
return "CompanyType";
}
+ @Override
protected List defineTypes() {
try {
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -88,10 +97,12 @@
}
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/schemas/";
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnPropertyManyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnPropertyManyTestCases.java
index 283814f..75d841f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnPropertyManyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnPropertyManyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
@@ -44,30 +45,37 @@
anUnmarshaller.setAttachmentUnmarshaller(anAttachmentUnmarshaller);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnPropertyManyCase.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithMimeTypeOnPropertyManyCase.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithMimeTypeOnPropertyManyCaseNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://www.example.org";
}
+ @Override
protected String getControlRootName() {
return "employeeType";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
SDOType bytesType = (SDOType) typeHelper.getType("commonj.sdo", "Bytes");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnPropertyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnPropertyTestCases.java
index 42cde16..0154191 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnPropertyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnPropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
@@ -44,30 +45,37 @@
anUnmarshaller.setAttachmentUnmarshaller(anAttachmentUnmarshaller);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnProperty.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithMimeTypeOnProperty.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithMimeTypeOnPropertyNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://www.example.org";
}
+ @Override
protected String getControlRootName() {
return "employeeType";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.STRING);
SDOType bytesType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.BYTES);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnXSDManyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnXSDManyTestCases.java
index d86ae61..536a77b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnXSDManyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnXSDManyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
@@ -44,30 +45,37 @@
anUnmarshaller.setAttachmentUnmarshaller(anAttachmentUnmarshaller);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnXSDManyCase.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithMimeTypeOnXSDManyCase.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithMimeTypeOnXSDManyCaseNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://www.example.org";
}
+ @Override
protected String getControlRootName() {
return "employeeType";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
public void registerTypes() {
SDOType bytesType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.BYTES);
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnXSDTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnXSDTestCases.java
index 8ba1818..890677b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnXSDTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveMimeTypeOnXSDTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
@@ -44,31 +45,38 @@
anUnmarshaller.setAttachmentUnmarshaller(anAttachmentUnmarshaller);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnXSD.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithMimeTypeOnXSD.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
//return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithMimeTypeOnXSD.xml");
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/EmployeeWithMimeTypeOnXSDNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employeeType";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
public void registerTypes() {
SDOType bytesType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.BYTES);
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNamespacesBugTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNamespacesBugTestCases.java
index 42b0280..c450d9b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNamespacesBugTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNamespacesBugTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
TestRunner.main(arguments);
}
+ @Override
protected List defineTypes() {
List allTypes = new ArrayList();
List types1 = xsdHelper.define(getSchema("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/namespaces/simpleSDOSchema.xsd"));
@@ -46,30 +47,37 @@
return allTypes;
}
+ @Override
protected String getSchemaName() {
return "";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/namespaces/namespacesBug.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/namespaces/namespacesBugWrite.xml");
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return getControlWriteFileName();
}
+ @Override
protected String getControlRootURI() {
return "http://www.example.org/";
}
+ @Override
protected String getControlRootName() {
return "arg0";
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception {
String xsdString = getSchema("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/namespaces/simpleSDOSchema.xsd");
StringReader reader = new StringReader(xsdString);
@@ -81,16 +89,19 @@
classGenerator.generate(reader, tmpDirName);
}
+ @Override
protected List getPackages() {
List packages = new ArrayList();
packages.add("myPackage");
return packages;
}
+ @Override
protected String getRootInterfaceName() {
return "MySDO";
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableIsSetNodeNullPolicyFalseTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableIsSetNodeNullPolicyFalseTestCases.java
index 070a0cb..e353e09 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableIsSetNodeNullPolicyFalseTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableIsSetNodeNullPolicyFalseTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,50 +30,61 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectIsSetNodeNullPolicyFalseElement.xsd";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectIsSetNodeNullPolicyFalseElement.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectIsSetNodeNullPolicyFalseElement.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectIsSetNodeNullPolicyFalseElementNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
//return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectOptionalNodeNullPolicyElementNoSchema.xml";
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectIsSetNodeNullPolicyFalseElementNoSchema.xml";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get("id");
@@ -100,6 +111,7 @@
assertFalse(isSet); // 20071002
}
+ @Override
public void registerTypes() {
SDOType intType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.INT);
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableIsSetNodeNullPolicyTrueTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableIsSetNodeNullPolicyTrueTestCases.java
index 6726bce..2c22d77 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableIsSetNodeNullPolicyTrueTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableIsSetNodeNullPolicyTrueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,49 +29,60 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectIsSetNodeNullPolicyTrueElement.xsd";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectIsSetNodeNullPolicyTrueElement.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectIsSetNodeNullPolicyTrueElementWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectIsSetNodeNullPolicyTrueElementNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectIsSetNodeNullPolicyTrueElementNoSchema.xml";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get("id");
@@ -101,6 +112,7 @@
assertTrue(isSet);
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.STRING);
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableOptionalNodeNullPolicyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableOptionalNodeNullPolicyTestCases.java
index a0ec7d7..5a358a9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableOptionalNodeNullPolicyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveNillableOptionalNodeNullPolicyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,45 +29,55 @@
super(name);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectOptionalNodeNullPolicyElement.xsd";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectOptionalNodeNullPolicyElement.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectOptionalNodeNullPolicyElementWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectOptionalNodeNullPolicyElementWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nillable/DirectOptionalNodeNullPolicyElementNoSchema.xml";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get("id");
@@ -98,6 +108,7 @@
assertTrue(isSet);
}
+ @Override
public void registerTypes() {
SDOType intType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.INT);
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveOpenContentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveOpenContentTestCases.java
index 3e58ec2..d358f90 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveOpenContentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveOpenContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,37 +34,45 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/CustomerOpenContent.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElementOpenContent.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElementOpenContentNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "customer";
}
+ @Override
protected String getRootInterfaceName() {
return "CustomerType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.STRING);
SDOType addressType = (SDOType) registerAddressType();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveOrderBookingTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveOrderBookingTestCases.java
index 7df6eb5..b22d015 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveOrderBookingTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveOrderBookingTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,39 +44,48 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "OrderBooking.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/orderbooking/orderbooking.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/orderbooking/orderbooking.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/orderbooking/orderbookingNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://www.globalcompany.com/ns/OrderBooking";
}
+ @Override
protected String getControlRootName() {
return "SOAOrderBookingProcessRequest";
}
+ @Override
protected String getUnrelatedSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithInstanceClass.xsd";
}
+ @Override
protected String getRootInterfaceName() {
return "SOAOrderBookingProcessRequest";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
// Note the first package at index 0 must contain the getRootInterfaceName()
@@ -86,6 +95,7 @@
return packages;
}
+ @Override
public void testLoadFromAndSaveAfterDefineMultipleSchemas() throws Exception {
try {
List types = defineTypes();
@@ -105,6 +115,7 @@
}
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception {
URL url = new URL(getSchemaLocation() + getSchemaName());
InputStream is = url.openStream();
@@ -118,6 +129,7 @@
}
+ @Override
protected List defineTypes() {
try {
//String location = getSchemaLocation() + getSchemaName();
@@ -141,10 +153,12 @@
}
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/orderbooking/";
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
super.testNoSchemaLoadFromInputStreamSaveDataObjectToString();
Type aType = typeHelper.getType("http://www.globalcompany.com/ns/OrderBooking/rules", "approve");
@@ -154,6 +168,7 @@
assertEquals(mangledClassName, className);
}
+ @Override
public void registerTypes() {
Type intType = typeHelper.getType("commonj.sdo", "Int");
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderComplexDefaultNSTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderComplexDefaultNSTestCases.java
index 190d546..e7e65fe 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderComplexDefaultNSTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderComplexDefaultNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
TestRunner.main(arguments);
}
+ @Override
protected void verifyAfterLoad(XMLDocument document){
super.verifyAfterLoad(document);
DataObject rootDO = document.getRootObject();
@@ -45,6 +46,7 @@
}
//override here to use a different verify after load method in this case
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
registerTypes();
FileInputStream inputStream = new FileInputStream(getNoSchemaControlFileName());
@@ -60,41 +62,50 @@
super.verifyAfterLoad(document);
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderComplexNSNoSchema.xml";
}
+ @Override
protected String getControlDataObjectFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderComplexNSDataObject.xml";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderComplexNS.xml";
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderComplexDefaultNamespace.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "purchaseOrder";
}
+ @Override
protected String getRootInterfaceName() {
return "PurchaseOrderType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void registerTypes() {
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderComplexTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderComplexTestCases.java
index 7f9b1bd..0900a5f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderComplexTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderComplexTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,41 +38,50 @@
TestRunner.main(arguments);
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderComplexNSNoSchema.xml";
}
+ @Override
protected String getControlDataObjectFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderComplexNSDataObject.xml";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderComplexNS.xml";
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderComplex.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "purchaseOrder";
}
+ @Override
protected String getRootInterfaceName() {
return "PurchaseOrderType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void registerTypes() {
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
@@ -301,6 +310,7 @@
return typeHelper.define(itemsType);
}
+ @Override
protected void compareXML(String controlFileName, String testString, boolean compareNodes) throws Exception {
super.compareXML(controlFileName, testString, compareNodes);
XMLMarshaller marshaller = ((SDOXMLHelper)xmlHelper).getXmlMarshaller();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderTestCases.java
index 99acdc2..9a65ea7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,37 +35,45 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderNS.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderNSNoSchema.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrder.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "purchaseOrder";
}
+ @Override
protected String getRootInterfaceName() {
return "PurchaseOrderType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void registerTypes() {
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderWChangeSummaryTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderWChangeSummaryTestCases.java
index bea11db..cb120b5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderWChangeSummaryTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderWChangeSummaryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,37 +38,45 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderWChangeSummaryNS.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderWChangeSummaryNSNoSchema.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderWChangeSummary.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "purchaseOrder";
}
+ @Override
protected String getRootInterfaceName() {
return "PurchaseOrderType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void registerTypes() {
SDOType changeSummaryType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY);
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderWithAnnotations.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderWithAnnotations.java
index 2968981..4e3aa61 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderWithAnnotations.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSavePurchaseOrderWithAnnotations.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,44 +48,54 @@
TestRunner.main(arguments);
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderWithInstanceClassNoSchema.xml";
}
+ @Override
protected String getControlDataObjectFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderWithInstanceClassWrite.xml";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderWithInstanceClass.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/schemas/purchaseOrderWithInstanceClassWrite.xml";
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithInstanceClass.xsd";
}
+ @Override
protected String getControlRootURI() {
return null;
}
+ @Override
protected String getControlRootName() {
return "purchaseOrder";
}
+ @Override
protected String getRootInterfaceName() {
return "PurchaseOrder";
}
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(CUSTOM_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
registerTypes();
FileInputStream inputStream = new FileInputStream(getNoSchemaControlFileName());
@@ -97,6 +107,7 @@
compareXML(getNoSchemaControlWriteFileName(), writer.toString());//, false);
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
DataObject rootObject = doc.getRootObject();
@@ -116,6 +127,7 @@
}
+ @Override
protected List defineTypes() {
List types = super.defineTypes();
SDOType itemType = (SDOType)typeHelper.getType(null, "ItemSDO");
@@ -153,6 +165,7 @@
return types;
}
+ @Override
protected void registerTypes() {
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSchemaTypesEmptyStringTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSchemaTypesEmptyStringTestCases.java
index 23a23b9..38f2a03 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSchemaTypesEmptyStringTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSchemaTypesEmptyStringTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,14 +37,17 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/schemaTypesEmpty.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/schemaTypesEmptyNoSchema.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
assertNotNull(document);
assertNotNull(document.getRootObject());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSchemaTypesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSchemaTypesTestCases.java
index 7f7c06d..ff4c03b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSchemaTypesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSchemaTypesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,31 +32,38 @@
super(name);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/schemaTypes.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/schemaTypesNoSchema.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/SchemaTypes.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "Test";
}
+ @Override
protected String getRootInterfaceName() {
return "MyTestType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
@@ -68,6 +75,7 @@
TestRunner.main(arguments);
}
+ @Override
protected void registerTypes() {
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSimpleAttributeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSimpleAttributeTestCases.java
index be7ae47..db8f62e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSimpleAttributeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSimpleAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,33 +33,40 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/Customer.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleAttribute.xml");
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "customer";
}
+ @Override
protected String getRootInterfaceName() {
return "CustomerType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
public void registerTypes() {
Type intType = typeHelper.getType("commonj.sdo", "Int");
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSimpleElementTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSimpleElementTestCases.java
index a2a4cc5..0232ec3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSimpleElementTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveSimpleElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,37 +28,45 @@
super(name);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/Customer.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElement.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElementNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "customer";
}
+ @Override
protected String getRootInterfaceName() {
return "CustomerType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveTestCases.java
index 1fc58ff..69e851d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,9 +67,9 @@
compileFiles(tmpDirName, getPackages());
URL[] urls = new URL[1];
- urls[0] = f.toURL();
+ urls[0] = f.toURI().toURL();
URLClassLoader myURLLoader = new URLClassLoader(urls);
- String package1 = (String)getPackages().get(0);
+ String package1 = getPackages().get(0);
String className = package1 + "/" + getRootInterfaceName();
className = className.replaceAll("/", ".");
@@ -95,6 +95,7 @@
// First package should be the package that contains the class for the get root interface name class
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
// Override this function if your targetNamespace is defined or you use the sdoJava:package annotation
@@ -140,6 +141,7 @@
assertEquals("CompileUtil returned a non-zero exit value.", 0, returnVal);
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
// TODO: hard coded path should be parameterized as an option to the test suite
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveValuePropTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveValuePropTestCases.java
index 4eece2c..064e4d3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveValuePropTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveValuePropTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,50 +43,61 @@
TestRunner.main(arguments);
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/valuePropNoSchema.xml";
}
+ @Override
protected String getControlDataObjectFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/valueProp.xml";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/valueProp.xml";
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/helper/xmlhelper/ValueProp.xsd";
}
+ @Override
protected String getControlRootURI() {
return "urn:customer-example";
}
+ @Override
protected String getUnrelatedSchemaName(){
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithInstanceClass.xsd";
}
+ @Override
protected String getControlRootName() {
return "customer";
}
+ @Override
protected String getRootInterfaceName() {
return "CustomerType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("customer_example");
return packages;
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
//do nothing, this test doesn't apply
//we would have to do the following to make this work in current code
}
+ @Override
public void registerTypes(){
//do nothing because testNoSchemaLoadFromInputStreamSaveDataObjectToString is not run for this model
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithDataObjectDataTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithDataObjectDataTypeTestCases.java
index d4b9a1b..e9e5e39 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithDataObjectDataTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithDataObjectDataTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,22 +30,27 @@
super(name);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/dataObjectDataType.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/DataObjectDataType.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "rootType";
}
+ @Override
protected String getRootInterfaceName() {
return "RootType";
}
@@ -56,12 +61,14 @@
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void registerTypes() {
((SDOTypeHelper)typeHelper).reset();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithDefaultsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithDefaultsTestCases.java
index 9b5ca23..a4a8e71 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithDefaultsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithDefaultsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,22 +38,27 @@
TestRunner.main(arguments);
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/defaultvalue/purchaseOrderComplexDefaultValueNSNoSchema.xml";
}
+ @Override
protected String getControlDataObjectFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/defaultvalue/purchaseOrderComplexDefaultValueNSDataObject.xml";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/defaultvalue/purchaseOrderComplexDefaultValueNS.xml";
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderComplexDefaultValue.xsd";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
// TODO: the noSchema test will continue to fail until attributes are working with IsSetOptionalNodeNullPolicy
super.verifyAfterLoad(doc);
@@ -111,6 +116,7 @@
address.unset("country");
}
+ @Override
protected Type registerAddressType() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
DataObject addressType = dataFactory.create("commonj.sdo", "Type");
@@ -133,6 +139,7 @@
return typeHelper.define(addressType);
}
+ @Override
protected Type registerItemType() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
//Type intType = typeHelper.getType("commonj.sdo", "Int");
@@ -160,6 +167,7 @@
return typeHelper.define(itemType);
}
+ @Override
protected Type registerCustomerType() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
DataObject customerType = dataFactory.create("commonj.sdo", "Type");
@@ -174,6 +182,7 @@
return typeHelper.define(customerType);
}
+ @Override
protected Type registerCdnAddressType() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
DataObject addressType = dataFactory.create("commonj.sdo", "Type");
@@ -191,6 +200,7 @@
return typeHelper.define(addressType);
}
+ @Override
protected Type registerUSAddressType() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
Type intType = typeHelper.getType("commonj.sdo", "Int");
@@ -208,6 +218,7 @@
return typeHelper.define(addressType);
}
+ @Override
protected Type registerCdnMailingAddressType() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
DataObject addressType = dataFactory.create("commonj.sdo", "Type");
@@ -223,6 +234,7 @@
return typeHelper.define(addressType);
}
+ @Override
protected void registerTypes() {
Type intType = typeHelper.getType("commonj.sdo", "Int");
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithImportsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithImportsTestCases.java
index b13679b..4b923d0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithImportsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithImportsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
super(name);
}
+ @Override
protected List defineTypes() {
try {
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -48,45 +49,55 @@
}
}
+ @Override
protected String getUnrelatedSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/OrderBookingPO.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/schemas/";
}
+ @Override
protected String getSchemaName() {
return "OrderBookingRequest.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/orderBookingRequest.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
//return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/orderBookingRequestNoSchema.xml";
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/orderBookingRequestNoSchema.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/orderBookingRequestWrite.xml");
}
+ @Override
protected String getControlRootURI() {
return "http://www.globalcompany.com/ns/OrderBooking";
}
+ @Override
protected String getControlRootName() {
return "SOAOrderBookingProcessRequest";
}
+ @Override
protected String getRootInterfaceName() {
return "SOAOrderBookingProcessRequest";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("com/globalcompany/ns/orderbooking");
@@ -94,6 +105,7 @@
return packages;
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception{
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -113,6 +125,7 @@
TestRunner.main(arguments);
}
+ @Override
public void registerTypes() {
Type intType = typeHelper.getType("commonj.sdo", "Int");
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithOptionsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithOptionsTestCases.java
index 19e7ec0..a918422 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithOptionsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithOptionsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -175,13 +175,13 @@
document1 = builder.parse(new File(getControlFileName()));
document1.toString();
//source = new DOMSource(document1);
- XMLDocument document = ((SDOXMLHelper)xmlHelper).load(new FileInputStream(getControlFileName()), null, getOptions());
+ XMLDocument document = xmlHelper.load(new FileInputStream(getControlFileName()), null, getOptions());
verifyAfterLoad(document);
ByteArrayOutputStream outstream = new ByteArrayOutputStream();
StreamResult result = new StreamResult(outstream);
- ((SDOXMLHelper)xmlHelper).save(document, result, null);
+ xmlHelper.save(document, result, null);
compareXML(getControlWriteFileName(), result.getOutputStream().toString());
}
@@ -203,14 +203,14 @@
source = new DOMSource(document1);
- XMLDocument document = ((SDOXMLHelper)xmlHelper).load(source, null, getOptions());
+ XMLDocument document = xmlHelper.load(source, null, getOptions());
verifyAfterLoad(document);
ByteArrayOutputStream outstream = new ByteArrayOutputStream();
StreamResult result = new StreamResult(outstream);
- ((SDOXMLHelper)xmlHelper).save(document, result, null);
+ xmlHelper.save(document, result, null);
compareXML(getControlWriteFileName(), result.getOutputStream().toString());
}
@@ -222,13 +222,13 @@
FileInputStream inputStream = new FileInputStream(getControlFileName());
source = new SAXSource(new InputSource(inputStream));
- XMLDocument document = ((SDOXMLHelper)xmlHelper).load(source, null, getOptions());
+ XMLDocument document = xmlHelper.load(source, null, getOptions());
verifyAfterLoad(document);
ByteArrayOutputStream outstream = new ByteArrayOutputStream();
StreamResult result = new StreamResult(outstream);
- ((SDOXMLHelper)xmlHelper).save(document, result, null);
+ xmlHelper.save(document, result, null);
compareXML(getControlWriteFileName(), result.getOutputStream().toString());
}
@@ -242,14 +242,14 @@
source = new StreamSource(inputStream);
- XMLDocument document = ((SDOXMLHelper)xmlHelper).load(source, null, getOptions());
+ XMLDocument document = xmlHelper.load(source, null, getOptions());
verifyAfterLoad(document);
ByteArrayOutputStream outstream = new ByteArrayOutputStream();
StreamResult result = new StreamResult(outstream);
- ((SDOXMLHelper)xmlHelper).save(document, result, null);
+ xmlHelper.save(document, result, null);
compareXML(getControlWriteFileName(), result.getOutputStream().toString());
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithReadOnlyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithReadOnlyTestCases.java
index e01f7cc..ccd8a00 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithReadOnlyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithReadOnlyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,33 +37,40 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/readonly.xml";
}
+ @Override
protected String getSchemaName() {
return "org/eclipse/persistence/testing/sdo/schemas/ReadOnly.xsd";
}
+ @Override
protected String getControlRootURI() {
return "myns";
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("myns");
return packages;
}
+ @Override
protected void registerTypes() {
Type stringType = SDOConstants.SDO_STRING;
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithTypeBug6522867TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithTypeBug6522867TestCases.java
index 555a5f4..aac926a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithTypeBug6522867TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveWithTypeBug6522867TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,41 +34,50 @@
TestRunner.main(arguments);
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderLocallyDeclaredNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderLocallyDeclaredNoSchemaWrite.xml";
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderLocallyDeclared.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderLocallyDeclaredWrite.xml";
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderComplex.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "items";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected Object getOptions() {
Type theType = typeHelper.getType("http://www.example.org", "Items");
@@ -87,6 +96,7 @@
public void testClassGenerationLoadAndSave() throws Exception {
}
+ @Override
protected void registerTypes() {
Type intType = typeHelper.getType("commonj.sdo", "Int");
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveXMLEncodingAndVersionTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveXMLEncodingAndVersionTestCases.java
index e68ef6d..3288a14 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveXMLEncodingAndVersionTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/LoadAndSaveXMLEncodingAndVersionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,41 +35,50 @@
super(name);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/Customer.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElementEncoding.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElementEncodingNoSchema.xml");
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected String getControlDataObjectFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElement.xml");
}
+ @Override
protected String getControlRootName() {
return "customer";
}
+ @Override
protected String getRootInterfaceName() {
return "CustomerType";
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
@@ -99,6 +108,7 @@
TestRunner.main(arguments);
}
+ @Override
protected void compareXML(String controlFileName, String testString, boolean compareNodes) throws Exception {
String controlString = getControlString(controlFileName);
log("Expected:" + controlString);
@@ -107,6 +117,7 @@
assertEquals(removeCopyrightFromString(removeWhiteSpaceFromString(controlString)), removeWhiteSpaceFromString(testString));
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
//Only check version, not encoding since some parsers don't support encoding
assertTrue(document.getXMLVersion().equals(LoadAndSaveXMLEncodingAndVersionTestCases.VERSION));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildCreateSimpleNestedManyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildCreateSimpleNestedManyTestCases.java
index 213cc1f..9c8b612 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildCreateSimpleNestedManyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildCreateSimpleNestedManyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,14 +31,17 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_create_simple.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_create_simple_noschema.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -64,7 +67,7 @@
ChangeSummary addressCS = address.getChangeSummary();
assertEquals(addressCS, managerCS);
assertTrue(managerCS.isLogging());
- assertTrue(((SDOChangeSummary)managerCS).isLogging());
+ assertTrue(managerCS.isLogging());
assertTrue(managerCS.isCreated(address));
assertEquals(0, managerCS.getOldValues(address).size());
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoadAndSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoadAndSaveTestCases.java
index 1064087..d5fcdc1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoadAndSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoadAndSaveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,29 +29,35 @@
super(name);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/Team_cs_on_child.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "team";
}
+ @Override
protected String getRootInterfaceName() {
return "Team";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoggingOffLoadAndSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoggingOffLoadAndSaveTestCases.java
index 1df8ea5..959cc1b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoggingOffLoadAndSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoggingOffLoadAndSaveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,14 +30,17 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_log_off.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_log_off_noschema.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -47,6 +50,6 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertNotNull(managerCS);
assertFalse(managerCS.isLogging());
- assertFalse(((SDOChangeSummary)managerCS).isLogging());
+ assertFalse(managerCS.isLogging());
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoggingOnLoadAndSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoggingOnLoadAndSaveTestCases.java
index e36d4a2..56638d0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoggingOnLoadAndSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryChildLoggingOnLoadAndSaveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,18 +32,22 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_log_default.xml");
}
+ @Override
protected String getControlDataObjectFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_log_default.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_log_default_noschema.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -53,6 +57,6 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertNotNull(managerCS);
assertTrue(managerCS.isLogging());
- assertTrue(((SDOChangeSummary)managerCS).isLogging());
+ assertTrue(managerCS.isLogging());
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootCreateInvalidTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootCreateInvalidTestCases.java
index edd1717..386529c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootCreateInvalidTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootCreateInvalidTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,11 +27,13 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_create_error.xml");
}
+ @Override
public void testLoadFromAndSaveAfterDefineMultipleSchemas() throws Exception {
try {
super.testLoadFromAndSaveAfterDefineMultipleSchemas();
@@ -42,6 +44,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testClassGenerationLoadAndSave() throws Exception {
try {
super.testClassGenerationLoadAndSave();
@@ -52,6 +55,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testLoadFromDomSourceWithURIAndOptionsSaveDataObjectToStreamResult() throws Exception {
try {
super.testLoadFromDomSourceWithURIAndOptionsSaveDataObjectToStreamResult();
@@ -62,6 +66,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testLoadFromFileReaderWithURIAndOptionsStreamSaveDataObjectToWriter() throws Exception {
try {
super.testLoadFromFileReaderWithURIAndOptionsStreamSaveDataObjectToWriter();
@@ -72,6 +77,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testLoadFromInputStreamSaveDocumentToOutputStream() throws Exception {
try {
super.testLoadFromInputStreamSaveDocumentToOutputStream();
@@ -82,6 +88,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testLoadFromInputStreamWithURIAndOptionsSaveDataObjectToOutputStream() throws Exception {
try {
super.testLoadFromInputStreamWithURIAndOptionsSaveDataObjectToOutputStream();
@@ -92,6 +99,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testLoadFromInputStreamWithURIAndOptionsSaveDataObjectToStreamResult() throws Exception {
try {
super.testLoadFromInputStreamWithURIAndOptionsSaveDataObjectToStreamResult();
@@ -102,6 +110,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testLoadFromSAXSourceWithURIAndOptionsSaveDataObjectToStreamResult() throws Exception {
try {
super.testLoadFromSAXSourceWithURIAndOptionsSaveDataObjectToStreamResult();
@@ -112,6 +121,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testLoadFromStreamSourceWithURIAndOptionsSaveDataObjectToStreamResult() throws Exception {
try {
super.testLoadFromStreamSourceWithURIAndOptionsSaveDataObjectToStreamResult();
@@ -122,6 +132,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testLoadFromStringSaveDocumentToWriter() throws Exception {
try {
super.testLoadFromStringSaveDocumentToWriter();
@@ -132,6 +143,7 @@
fail("An SDOException should have occurred.");
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
try {
super.testNoSchemaLoadFromInputStreamSaveDataObjectToString();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoadAndSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoadAndSaveTestCases.java
index 8f812b2..fe67c5f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoadAndSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoadAndSaveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,29 +31,35 @@
super(name);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/Team_cs_on_root.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "root";
}
+ @Override
protected String getRootInterfaceName() {
return "Team";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void registerTypes() {
SDOType changeSummaryType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY);
SDOType propertyType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.PROPERTY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoggingOffLoadAndSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoggingOffLoadAndSaveTestCases.java
index 30bd9d3..26894a7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoggingOffLoadAndSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoggingOffLoadAndSaveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,11 +30,13 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_log_off.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -44,6 +46,6 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertEquals(teamCS, managerCS);
assertFalse(teamCS.isLogging());
- assertFalse(((SDOChangeSummary)teamCS).isLogging());
+ assertFalse(teamCS.isLogging());
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoggingOnLoadAndSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoggingOnLoadAndSaveTestCases.java
index 1e996d3..0308685 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoggingOnLoadAndSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootLoggingOnLoadAndSaveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,15 +30,18 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_log_default.xml");
}
+ @Override
protected String getControlDataObjectFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_log_default.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -48,6 +51,6 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertEquals(teamCS, managerCS);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateManyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateManyTestCases.java
index a1181ef..58bc7df 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateManyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateManyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,11 +32,13 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_create_simple_many.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -66,7 +68,7 @@
assertEquals(teamCS, addressCS);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
assertTrue(teamCS.isCreated(address));
assertFalse(teamCS.isCreated(manager));
assertEquals(0, teamCS.getOldValues(address).size());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateNestedTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateNestedTestCases.java
index 13d51a2..35dc78b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateNestedTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,11 +30,13 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_create_simple_nested.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -46,7 +48,7 @@
ChangeSummary addressCS = address.getChangeSummary();
assertEquals(teamCS, addressCS);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
assertTrue(teamCS.isCreated(address));
assertFalse(teamCS.isCreated(manager));
assertEquals(0, teamCS.getOldValues(address).size());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateTestCases.java
index 3f33b4b..a93af14 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/ChangeSummaryRootSimpleCreateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,11 +30,13 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_create_simple.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -44,7 +46,7 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertEquals(teamCS, managerCS);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
assertTrue(teamCS.isCreated(manager));
assertEquals(0, teamCS.getOldValues(manager).size());
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/LoadAndSaveSetNullPropertyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/LoadAndSaveSetNullPropertyTestCases.java
index 466e36f..8519659 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/LoadAndSaveSetNullPropertyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/LoadAndSaveSetNullPropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,12 +35,14 @@
TestRunner.main(arguments);
}
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
DataObject rootDO = document.getRootObject();
@@ -73,22 +75,27 @@
assertNull(oldValueComplexNillable.getValue());
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/SetNullProperty.xml";
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/SetNullProperty.xsd";
}
+ @Override
protected String getControlRootName() {
return "theRoot";
}
+ @Override
protected String getRootInterfaceName() {
return "RootType";
}
+ @Override
public void registerTypes() {
SDOType changeSummaryType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY);
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryCreateBug6120161TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryCreateBug6120161TestCases.java
index d8b9089..c1051e7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryCreateBug6120161TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryCreateBug6120161TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,35 +40,43 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6120161/HRAppService.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6120161/bug6120161.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6120161/bug6120161Write.xml");
}
+ @Override
protected String getSchemaLocation() {
return (FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6120161/");
}
+ @Override
protected String getControlRootName() {
return "processCSDeptElement";
}
+ @Override
protected String getControlRootURI() {
return "http://example.com/app/";
}
+ @Override
protected String getRootInterfaceName() {
return "ProcessCSDeptElement";
}
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("com/example/app");
@@ -77,6 +85,7 @@
return packages;
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception {
String xsdString = getSchema(getSchemaName());
StringReader reader = new StringReader(xsdString);
@@ -89,10 +98,11 @@
classGenerator.generate(reader, cw, sr, true);
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
DataObject root = doc.getRootObject();
- DataObject data = (DataObject)root.getDataObject("processData");
+ DataObject data = root.getDataObject("processData");
List dataObjects = data.getList("Value");
ChangeSummary changeSummary = data.getChangeSummary();
@@ -146,6 +156,7 @@
*/
}
+ @Override
public void registerTypes() {
}
@@ -169,6 +180,7 @@
fail("DOESNT CONTAIN: " + empName);
}
+ @Override
protected List defineTypes() {
try {
FileInputStream inputStream = new FileInputStream(getSchemaName());
@@ -215,6 +227,7 @@
}
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() {
//do nothing
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryCreateBug6346754TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryCreateBug6346754TestCases.java
index af36cef..faafebc 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryCreateBug6346754TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryCreateBug6346754TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,31 +36,38 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6346754/SupplierService.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6346754/bug6346754.xml");
}
+ @Override
protected String getSchemaLocation() {
return (FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6346754/");
}
+ @Override
protected String getControlRootName() {
return "processData";
}
+ @Override
protected String getControlRootURI() {
return "http://example.com/supplier/service/";
}
+ @Override
protected String getRootInterfaceName() {
return "ProcessData";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("mypackage/process");
@@ -70,6 +77,7 @@
return packages;
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception {
String xsdString = getSchema(getSchemaName());
StringReader reader = new StringReader(xsdString);
@@ -83,9 +91,11 @@
}
+ @Override
public void registerTypes() {
}
+ @Override
protected List defineTypes() {
try {
FileInputStream inputStream = new FileInputStream(getSchemaName());
@@ -100,6 +110,7 @@
return null;
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() {
//do nothing
//running this test doesn't really add much and would need to manually create close to 100 types
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryRootCreateAlreadySetTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryRootCreateAlreadySetTestCases.java
index 42849c5..cce612a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryRootCreateAlreadySetTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/create/ChangeSummaryRootCreateAlreadySetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,10 +34,12 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_create_simple_many_already_set.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -66,7 +68,7 @@
}
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
assertTrue(teamCS.isCreated(address));
assertFalse(teamCS.isCreated(manager));
assertEquals(0, teamCS.getOldValues(address).size());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryChildSimpleDeleteTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryChildSimpleDeleteTestCases.java
index 1467206..fab329c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryChildSimpleDeleteTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryChildSimpleDeleteTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,14 +35,17 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_delete_simple.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_delete_simple_noschema.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -52,7 +55,7 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertNotNull(managerCS);
assertTrue(managerCS.isLogging());
- assertTrue(((SDOChangeSummary)managerCS).isLogging());
+ assertTrue(managerCS.isLogging());
int deletedSize = ((SDOChangeSummary)managerCS).getDeleted().size();
assertEquals(3, deletedSize);
@@ -61,10 +64,10 @@
Iterator iter = ((SDOChangeSummary)managerCS).getDeleted().iterator();
while (iter.hasNext()) {
SDODataObject nextDeleted = (SDODataObject)iter.next();
- assertEquals(nextDeleted.getInstanceProperties().size(), ((SDOChangeSummary)managerCS).getOldValues(nextDeleted).size());
+ assertEquals(nextDeleted.getInstanceProperties().size(), managerCS.getOldValues(nextDeleted).size());
}
- assertEquals(2, ((SDOChangeSummary)managerCS).getOldValues(manager).size());
+ assertEquals(2, managerCS.getOldValues(manager).size());
List teamOldValues = managerCS.getOldValues(manager);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryRootDetachAndDeleteTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryRootDetachAndDeleteTestCases.java
index fbcc1c7..97114f3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryRootDetachAndDeleteTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryRootDetachAndDeleteTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,11 +33,13 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_detach_delete_simple.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -51,7 +53,7 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertEquals(teamCS, managerCS);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
assertEquals(3, ((SDOChangeSummary)teamCS).getDeleted().size());//phone, address
assertTrue(teamCS.isModified(manager));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryRootSimpleDeleteTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryRootSimpleDeleteTestCases.java
index a09e559..83deddc 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryRootSimpleDeleteTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/ChangeSummaryRootSimpleDeleteTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,11 +35,13 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_delete_simple.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -53,7 +55,7 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertEquals(teamCS, managerCS);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
assertEquals(3, ((SDOChangeSummary)teamCS).getDeleted().size());
assertTrue(teamCS.isModified(manager));
@@ -61,9 +63,9 @@
Iterator iter = ((SDOChangeSummary)managerCS).getDeleted().iterator();
while (iter.hasNext()) {
SDODataObject nextDeleted = (SDODataObject)iter.next();
- assertEquals(nextDeleted.getInstanceProperties().size(), ((SDOChangeSummary)managerCS).getOldValues(nextDeleted).size());
+ assertEquals(nextDeleted.getInstanceProperties().size(), managerCS.getOldValues(nextDeleted).size());
}
- assertEquals(2, ((SDOChangeSummary)managerCS).getOldValues(manager).size());
+ assertEquals(2, managerCS.getOldValues(manager).size());
List teamOldValues = teamCS.getOldValues(manager);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/LoadAndSaveBug6680769TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/LoadAndSaveBug6680769TestCases.java
index 5256602..28f732f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/LoadAndSaveBug6680769TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/delete/LoadAndSaveBug6680769TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,34 +40,42 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6680769/bug6680769.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6680769/bug6680769write.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6680769/bug6680769noschema.xml");
}
+ @Override
protected String getSchemaName() {
return "root.xsd";
}
+ @Override
protected String getControlRootURI() {
return "http://www.example.org/root";
}
+ @Override
protected String getControlRootName() {
return "root";
}
+ @Override
protected String getRootInterfaceName() {
return "Root";
}
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("org/example/root");
@@ -76,6 +84,7 @@
return packages;
}
+ @Override
protected void registerTypes() {
SDOType changeSummaryType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY);
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
@@ -114,10 +123,12 @@
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6680769/";
}
+ @Override
protected List defineTypes() {
try {
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -130,6 +141,7 @@
}
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception{
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -144,6 +156,7 @@
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
DataObject rootDO = doc.getRootObject();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryChildLoggingOnModifyComplexAtCSLoadAndSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryChildLoggingOnModifyComplexAtCSLoadAndSaveTestCases.java
index 1914d2b..2326cea 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryChildLoggingOnModifyComplexAtCSLoadAndSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryChildLoggingOnModifyComplexAtCSLoadAndSaveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,14 +38,17 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_modify_complex_single.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_cschild_modify_complex_single_noschema.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -58,7 +61,7 @@
ChangeSummary addressCS = address.getChangeSummary();
assertNotNull(addressCS);
assertTrue(managerCS.isLogging());
- assertTrue(((SDOChangeSummary)managerCS).isLogging());
+ assertTrue(managerCS.isLogging());
assertEquals(addressCS, managerCS);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryModifyBug6346754TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryModifyBug6346754TestCases.java
index ee36a2c..13568f9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryModifyBug6346754TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryModifyBug6346754TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,31 +35,38 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6346754/SupplierService.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6346754/bug6346754modify.xml");
}
+ @Override
protected String getSchemaLocation() {
return (FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/bug6346754/");
}
+ @Override
protected String getControlRootName() {
return "processData";
}
+ @Override
protected String getControlRootURI() {
return "http://example.com/supplier/service/";
}
+ @Override
protected String getRootInterfaceName() {
return "ProcessData";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("mypackage/process");
@@ -69,6 +76,7 @@
return packages;
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception {
String xsdString = getSchema(getSchemaName());
StringReader reader = new StringReader(xsdString);
@@ -81,9 +89,11 @@
classGenerator.generate(reader, cw, sr, true);
}
+ @Override
public void registerTypes() {
}
+ @Override
protected List defineTypes() {
try {
FileInputStream inputStream = new FileInputStream(getSchemaName());
@@ -98,6 +108,7 @@
return null;
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() {
//do nothing
//running this test doesn't really add much and would need to manually create close to 100 types
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryRootLoggingOnModifyComplexAtCSLoadAndSaveTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryRootLoggingOnModifyComplexAtCSLoadAndSaveTestCases.java
index 89ecce5..45f0b34 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryRootLoggingOnModifyComplexAtCSLoadAndSaveTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/ChangeSummaryRootLoggingOnModifyComplexAtCSLoadAndSaveTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,11 +38,13 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_modify_complex_single.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
ChangeSummary teamCS = document.getRootObject().getChangeSummary();
@@ -51,7 +53,7 @@
assertNotNull(manager);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
assertFalse(teamCS.isCreated(manager));
assertTrue(teamCS.isModified(manager));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/SDOChangeSummaryUnsetTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/SDOChangeSummaryUnsetTestCases.java
index 37af76c..7612071 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/SDOChangeSummaryUnsetTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/modify/SDOChangeSummaryUnsetTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,11 +29,13 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/team_csroot_unset.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
/* DataObject managerDO = document.getRootObject().getDataObject("manager");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryCreateOpenContentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryCreateOpenContentTestCases.java
index 7083e3a..9f35f48 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryCreateOpenContentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryCreateOpenContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,14 +37,17 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/open/team_csroot_create_open.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/open/team_csroot_create_open.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
@@ -57,7 +60,7 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertEquals(teamCS, managerCS);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
DataObject address = manager.getDataObject("address");
assertNotNull(address);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryDeleteOpenContentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryDeleteOpenContentTestCases.java
index 6724c6c..1a3282b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryDeleteOpenContentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryDeleteOpenContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,10 +37,12 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/open/team_csroot_delete_open.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
@@ -51,7 +53,7 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertEquals(teamCS, managerCS);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
List yards = manager.getList("theYard");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryModifyOpenContentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryModifyOpenContentTestCases.java
index cf2cb05..49ec209 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryModifyOpenContentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryModifyOpenContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,11 +37,13 @@
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/open/team_csroot_modify_open.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
@@ -52,7 +54,7 @@
ChangeSummary managerCS = manager.getChangeSummary();
assertEquals(teamCS, managerCS);
assertTrue(teamCS.isLogging());
- assertTrue(((SDOChangeSummary)teamCS).isLogging());
+ assertTrue(teamCS.isLogging());
//DataObject yard = manager.getDataObject("theYard");
List yards = manager.getList("theYard");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryUnsetOpenContentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryUnsetOpenContentTestCases.java
index b8f1ccb..4cc1fd5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryUnsetOpenContentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/changesummary/open/ChangeSummaryUnsetOpenContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,10 +33,12 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/open/team_csroot_unset_open.xml");
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/mixed/LoadAndSaveMixedContentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/mixed/LoadAndSaveMixedContentTestCases.java
index 2a10a7c..54e4548 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/mixed/LoadAndSaveMixedContentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/mixed/LoadAndSaveMixedContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,10 +48,12 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return "Employee.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/mixed/Employee.xml");
}
@@ -60,27 +62,33 @@
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/mixed/");
}
+ @Override
protected String getNoSchemaControlFileName() {
return getControlFileName();
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/mixed/";
}
+ @Override
protected String getControlRootURI() {
return "http://www.example.org";
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
@@ -121,6 +129,7 @@
compareXML(getControlWriteFileName(), writer.toString());
}
+ @Override
protected void generateClasses(String tmpDirName) throws Exception {
URL url = new URL(getSchemaLocation() + getSchemaName());
InputStream is = url.openStream();
@@ -131,6 +140,7 @@
classGenerator.generate(ss, tmpDirName, schemaResolver);
}
+ @Override
protected List defineTypes() {
try {
URL url = new URL(getSchemaLocation() + getSchemaName());
@@ -148,6 +158,7 @@
}
}
+ @Override
public void registerTypes() {
Type intType = typeHelper.getType("commonj.sdo", "Int");
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nillable/ListPropertyNillableElementTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nillable/ListPropertyNillableElementTestCases.java
index 8540f2c..e6ea95c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nillable/ListPropertyNillableElementTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nillable/ListPropertyNillableElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -256,6 +256,7 @@
this.schemas = schemas;
}
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
if (namespace.equals("http://www.example.org")) {
return new DOMSource(schemas[0], SCHEMA_NAME);
@@ -263,6 +264,7 @@
return null;
}
+ @Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
return null;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableOptionalWithDefaultSetNullTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableOptionalWithDefaultSetNullTestCases.java
index 472f783..1657521 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableOptionalWithDefaultSetNullTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableOptionalWithDefaultSetNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,26 +37,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableOptionalWithDefaultSetNull.xml";
}
+ @Override
protected String getControlWriteFileName() {
return getControlFileName();
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableOptionalWithDefaultSetNullNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return getNoSchemaControlFileName();
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableOptionalWithDefaultTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableOptionalWithDefaultTestCases.java
index 5b8ebf9..f610d71 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableOptionalWithDefaultTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableOptionalWithDefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,34 +49,41 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectIsSetNillableOptionalNodeNullPolicyWithDefaultsElement.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value;
@@ -93,6 +100,7 @@
assertTrue(isSet);
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetDefaultTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetDefaultTestCases.java
index 489f20e..09a0086 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetDefaultTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetDefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,26 +37,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithDefaultSetDefault.xml";
}
+ @Override
protected String getControlWriteFileName() {
return getControlFileName();
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithDefaultSetDefaultNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return getNoSchemaControlFileName();
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNOPTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNOPTestCases.java
index 051a093..907485a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNOPTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNOPTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,26 +37,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithDefaultSetNOP.xml";
}
+ @Override
protected String getControlWriteFileName() {
return getControlFileName();
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithDefaultSetNOPNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return getNoSchemaControlFileName();
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNonNullTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNonNullTestCases.java
index a06ebfd..1d32f9a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNonNullTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,26 +37,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithDefaultSetNonNull.xml";
}
+ @Override
protected String getControlWriteFileName() {
return getControlFileName();
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithDefaultSetNonNullNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return getNoSchemaControlFileName();
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNullTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNullTestCases.java
index 0f5ff55..58d9732 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNullTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultSetNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,26 +37,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithDefaultSetNull.xml";
}
+ @Override
protected String getControlWriteFileName() {
return getControlFileName();
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithDefaultSetNullNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return getNoSchemaControlFileName();
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultTestCases.java
index d747359..f88773e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithDefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,34 +49,41 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectIsSetNillableNodeNullPolicyWithDefaultsElement.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value;
@@ -93,6 +100,7 @@
assertTrue(isSet);
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNOPTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNOPTestCases.java
index 22499a1..76b26d8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNOPTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNOPTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,26 +38,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithoutDefaultSetNOP.xml";
}
+ @Override
protected String getControlWriteFileName() {
return getControlFileName();
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithoutDefaultSetNOPNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return getNoSchemaControlFileName();
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNonNullTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNonNullTestCases.java
index ad43d7c..54de4df 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNonNullTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,26 +38,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithoutDefaultSetNonNull.xml";
}
+ @Override
protected String getControlWriteFileName() {
return getControlFileName();
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithoutDefaultSetNonNullNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return getNoSchemaControlFileName();
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNullTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNullTestCases.java
index 3ae40bb..547665b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNullTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultSetNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,26 +38,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithoutDefaultSetNull.xml";
}
+ @Override
protected String getControlWriteFileName() {
return getControlFileName();
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetNillableWithoutDefaultSetNullNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return getNoSchemaControlFileName();
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultTestCases.java
index 74ef7aa..b21bf92 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetNillableWithoutDefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,33 +50,40 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectIsSetNillableNodeNullPolicyWithoutDefaultsElement.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value;
@@ -93,6 +100,7 @@
assertTrue(isSet);
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultSetNOPTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultSetNOPTestCases.java
index 44c5c0c..61822a1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultSetNOPTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultSetNOPTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,26 +38,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultSetNOP.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultSetNOPWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultSetNOPWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultSetNOPNoSchema.xml";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultTestCases.java
index c552cdb..c197b0e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalAttributeWithoutDefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,33 +50,40 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectIsSetOptionalNodeNullPolicyWithoutDefaultsAttribute.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value;
@@ -103,6 +110,7 @@
assertTrue(isSet);
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetDefaultTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetDefaultTestCases.java
index 5e2c075..85aaef7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetDefaultTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetDefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,26 +36,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetDefault.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetDefaultWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetDefaultWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetDefaultNoSchema.xml";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNOPTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNOPTestCases.java
index 3991124..c0e70f4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNOPTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNOPTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,26 +36,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNOP.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNOPWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNOPWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNOPNoSchema.xml";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNonNullTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNonNullTestCases.java
index 0c119d2..3c03690 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNonNullTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,26 +36,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNonNull.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNonNullWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNonNullWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNonNullNoSchema.xml";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNullTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNullTestCases.java
index 1005d90..675d0a9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNullTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultSetNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,26 +35,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNull.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNullWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNullWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithDefaultSetNullNoSchema.xml";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultTestCases.java
index f61ff98..812fcc7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithDefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,33 +48,40 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectIsSetOptionalNodeNullPolicyWithDefaultsElement.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value;
@@ -102,6 +109,7 @@
assertTrue(isSet);
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultNumericPrimsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultNumericPrimsTestCases.java
index 433cb12..99013fd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultNumericPrimsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultNumericPrimsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -47,33 +47,40 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectIsSetOptionalNodeNullPolicyWithoutDefaultsNumericPrimsElement.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value;
@@ -100,6 +107,7 @@
assertTrue(isSet);
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType(SDO_URL, STRING);
Type intType = typeHelper.getType(SDO_URL, INT);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPNumericPrimsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPNumericPrimsTestCases.java
index 717a27d..f22dd99 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPNumericPrimsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPNumericPrimsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,26 +35,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPNumericPrims.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPNumericPrimsWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPNumericPrimsWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPNumericPrimsNoSchema.xml";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPTestCases.java
index c90ebfa..9ffc8b6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,26 +36,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOP.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNOPNoSchema.xml";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNonNullTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNonNullTestCases.java
index 1f1c861..308db08 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNonNullTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNonNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,26 +36,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNonNull.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNonNullWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNonNullWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNonNullNoSchema.xml";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNullTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNullTestCases.java
index db54bc4..8e6cf2c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNullTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultSetNullTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,26 +36,32 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNull.xml";
}
+ @Override
protected String getControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNullWrite.xml";
}
+ @Override
protected String getNoSchemaControlWriteFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNullWriteNoSchema.xml";
}
+ @Override
protected String getNoSchemaControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/nodenullpolicy/IsSetOptionalWithoutDefaultSetNullNoSchema.xml";
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value = doc.getRootObject().get(ID_NAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultTestCases.java
index e593501..64863da 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/nodenullpolicy/IsSetOptionalWithoutDefaultTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,33 +48,40 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/schemas/DirectIsSetOptionalNodeNullPolicyWithoutDefaultsElement.xsd";
}
+ @Override
protected String getControlRootURI() {
return NON_DEFAULT_URI;
}
+ @Override
protected String getControlRootName() {
return "employee";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
protected void verifyAfterLoad(XMLDocument doc) {
super.verifyAfterLoad(doc);
Object value;
@@ -101,6 +108,7 @@
assertTrue(isSet);
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/CompanyTypeImpl.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/CompanyTypeImpl.java
index c15fda7..de04eea 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/CompanyTypeImpl.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/CompanyTypeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,18 +24,22 @@
public CompanyTypeImpl() {}
+ @Override
public java.lang.String getCompanyName() {
return getString(START_PROPERTY_INDEX + 0);
}
+ @Override
public void setCompanyName(java.lang.String value) {
set(START_PROPERTY_INDEX + 0 , value);
}
+ @Override
public boolean getPublic() {
return getBoolean(START_PROPERTY_INDEX + 1);
}
+ @Override
public void setPublic(boolean value) {
set(START_PROPERTY_INDEX + 1 , value);
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/LoadAndSaveStaticClassesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/LoadAndSaveStaticClassesTestCases.java
index 1f92b2b..10f34ac 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/LoadAndSaveStaticClassesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/LoadAndSaveStaticClassesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,50 +43,61 @@
TestRunner.main(arguments);
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
}
+ @Override
protected String getControlFileName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/Company.xml";
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/Company.xsd";
}
+ @Override
protected String getNoSchemaControlFileName() {
return getControlFileName();
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/staticclasses/";
}
+ @Override
protected String getControlRootURI() {
return "http://theUri";
}
+ @Override
protected String getControlRootName() {
return "company";
}
+ @Override
protected String getRootInterfaceName() {
return "CompanyType";
}
// Override package generation based on the JAXB 2.0 algorithm in SDOUtil.java
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add(NON_DEFAULT_JAVA_PACKAGE_DIR);
return packages;
}
+ @Override
public void testClassGenerationLoadAndSave(){
//not applicable since we have static classes there is no need to generate
}
+ @Override
public void registerTypes() {
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
SDOType booleanType = (SDOType) typeHelper.getType("commonj.sdo", "Boolean");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/CollectionValueTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/CollectionValueTestCases.java
index 3e1b9ce..6de5ede 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/CollectionValueTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/CollectionValueTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,33 +44,41 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return getSchemaLocation() + "SubstitutionGroupCollection.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/collection_value.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/collection_value.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return "";
}
+ @Override
protected String getControlRootURI() {
return "TEST/NS";
}
+ @Override
protected String getControlRootName() {
return "employee-data";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
}
@@ -97,13 +105,16 @@
}
}*/
+ @Override
protected String getSchemaLocation() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/";
}
+ @Override
public void registerTypes() {
}
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("test/ns");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/SingleValueBaseTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/SingleValueBaseTypeTestCases.java
index b52e7e7..de17f50 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/SingleValueBaseTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/SingleValueBaseTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,33 +44,41 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return getSchemaLocation() + "SubstitutionGroup.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/single_value_base.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/single_value_base.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return "";
}
+ @Override
protected String getControlRootURI() {
return "TEST/NS";
}
+ @Override
protected String getControlRootName() {
return "employee-data";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
}
@@ -97,13 +105,16 @@
}
}*/
+ @Override
protected String getSchemaLocation() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/";
}
+ @Override
public void registerTypes() {
}
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("test/ns");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/SingleValueNonBaseTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/SingleValueNonBaseTypeTestCases.java
index 0ea18e1..7ea36ac 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/SingleValueNonBaseTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/SingleValueNonBaseTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,44 +44,55 @@
TestRunner.main(arguments);
}
+ @Override
protected String getSchemaName() {
return getSchemaLocation() + "SubstitutionGroup.xsd";
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/single_value_non_base.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/single_value_non_base.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return "";
}
+ @Override
protected String getControlRootURI() {
return "TEST/NS";
}
+ @Override
protected String getControlRootName() {
return "employee-data";
}
+ @Override
protected String getRootInterfaceName() {
return "EmployeeType";
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
}
+ @Override
protected String getSchemaLocation() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/substitutiongroups/";
}
+ @Override
public void registerTypes() {
}
+ @Override
protected List<String> getPackages() {
List<String> packages = new ArrayList<String>();
packages.add("test/ns");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/AllUnknownTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/AllUnknownTestCases.java
index f0fbcef..c5ee4db 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/AllUnknownTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/AllUnknownTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,18 +28,22 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/purchaseOrder.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/purchaseOrder_allUnknown_write.xml");
}
+ @Override
protected String getSchemaName() {
return null;
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
assertNull(document.getRootObject().getContainer());
DataObject po = document.getRootObject();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/LoadAndSaveNestedSchemaTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/LoadAndSaveNestedSchemaTypeTestCases.java
index 29e8c43..1260c74 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/LoadAndSaveNestedSchemaTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/LoadAndSaveNestedSchemaTypeTestCases.java
@@ -31,14 +31,17 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/nestedSchemaTypes.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/PurchaseOrder.xsd";
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
assertNull(document.getRootObject().getContainer());
DataObject root = document.getRootObject();
@@ -60,7 +63,7 @@
assertNotNull(prop);
assertEquals(SDOConstants.SDO_INT, prop.getType());
assertTrue(value instanceof Integer);
- assertEquals(Integer.valueOf(10), ((Integer)value));
+ assertEquals(Integer.valueOf(10), value);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/NotOpenWithUnknownContentNestedTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/NotOpenWithUnknownContentNestedTestCases.java
index 74fa25b..9485524 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/NotOpenWithUnknownContentNestedTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/NotOpenWithUnknownContentNestedTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,16 +26,19 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/poWithLineItemWithUnknown.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/poWithLineItemWithUnknownWrite.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/PurchaseOrder.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/NotOpenWithUnknownContentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/NotOpenWithUnknownContentTestCases.java
index de10759..3e59127 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/NotOpenWithUnknownContentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/NotOpenWithUnknownContentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,16 +26,19 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/lineItemWithUnknown.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/lineItemWithUnknownWrite.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/PurchaseOrder.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/RootUnknownTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/RootUnknownTestCases.java
index 08707f5..fcc8a47 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/RootUnknownTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/RootUnknownTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,13 +29,16 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/purchaseOrderWrappedInUnknown.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/PurchaseOrder.xsd";
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
DataObject root = document.getRootObject();
assertNull(root.getContainer());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/RootUnknownWithCSTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/RootUnknownWithCSTestCases.java
index 189de50..64b58d9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/RootUnknownWithCSTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/RootUnknownWithCSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,14 +31,17 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/purchaseOrderWrappedInUnknownCS.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/PurchaseOrderCS.xsd";
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
DataObject root = document.getRootObject();
assertNull(root.getContainer());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/SomeKnownSomeUnknownTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/SomeKnownSomeUnknownTestCases.java
index 0b4400c..fb41a03 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/SomeKnownSomeUnknownTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/loadandsave/withoutxsd/SomeKnownSomeUnknownTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,18 +32,22 @@
TestRunner.main(arguments);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/purchaseOrder.xml");
}
+ @Override
protected String getControlWriteFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/purchaseOrder_write.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/withoutxsd/PurchaseOrder.xsd";
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
assertNull(document.getRootObject().getContainer());
DataObject po = document.getRootObject();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SavePurchaseOrderTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SavePurchaseOrderTestCases.java
index 7b58b28..c63ce5f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SavePurchaseOrderTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SavePurchaseOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,22 +24,27 @@
super(name);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderNS.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/purchaseOrderNSNoSchema.xml");
}
+ @Override
protected String getSchemaName() {
return "./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrder.xsd";
}
+ @Override
protected String getControlRootName() {
return "purchaseOrder";
}
+ @Override
protected XMLDocument getXMLDocumentToSave() {
DataObject purchaseOrder = dataFactory.create(getControlRootURI(), "PurchaseOrderType");
@@ -97,6 +102,7 @@
return doc;
}
+ @Override
protected void registerTypes() {
Type intType = typeHelper.getType("commonj.sdo", "Int");
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SaveSimpleAttributeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SaveSimpleAttributeTestCases.java
index 0d193d6..adcc4b9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SaveSimpleAttributeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SaveSimpleAttributeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,10 +24,12 @@
super(name);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleAttribute.xml");
}
+ @Override
protected XMLDocument getXMLDocumentToSave() {
DataObject dataObject = dataFactory.create(getControlRootURI(), CONTROL_ROOT_TYPE);
Property customerIDProp = dataObject.getInstanceProperty(CUSTOMERID);
@@ -39,6 +41,7 @@
return doc;
}
+ @Override
public void registerTypes() {
Type intType = typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SaveSimpleElementTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SaveSimpleElementTestCases.java
index 20e4833..4761a3c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SaveSimpleElementTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/save/SaveSimpleElementTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -24,14 +24,17 @@
super(name);
}
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElement.xml");
}
+ @Override
protected String getNoSchemaControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/simpleElementNoSchema.xml");
}
+ @Override
protected XMLDocument getXMLDocumentToSave() {
DataObject dataObject = dataFactory.create(getControlRootURI(), CONTROL_ROOT_TYPE);
Property firstNameProp = dataObject.getInstanceProperty(FIRSTNAME);
@@ -43,6 +46,7 @@
return doc;
}
+ @Override
public void registerTypes() {
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/threadsafety/SDOXMLHelperThreadSafetyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/threadsafety/SDOXMLHelperThreadSafetyTestCases.java
index b3483d9..34f324d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/threadsafety/SDOXMLHelperThreadSafetyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xmlhelper/threadsafety/SDOXMLHelperThreadSafetyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -107,6 +107,7 @@
public XMLMarshaller marshaller;
public XMLUnmarshaller unmarshaller;
+ @Override
public void run() {
System.out.println(Thread.currentThread());
SDOXMLHelperDelegator xmlHelper = (SDOXMLHelperDelegator) SDOXMLHelper.INSTANCE;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/SDOXSDHelperTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/SDOXSDHelperTestSuite.java
index 106a16a..bfbf805 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/SDOXSDHelperTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/SDOXSDHelperTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,8 +28,8 @@
public static Test suite() {
TestSuite suite = new TestSuite("All XSDHelper Tests");
- suite.addTest(new XSDHelperDefineTestSuite().suite());
- suite.addTest(new XSDHelperGenerateTestSuite().suite());
+ suite.addTest(XSDHelperDefineTestSuite.suite());
+ suite.addTest(XSDHelperGenerateTestSuite.suite());
suite.addTestSuite(SDOXSDHelperExceptionTestCases.class);
return suite;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/AttributeGroupTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/AttributeGroupTestCases.java
index d817def..77858a1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/AttributeGroupTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/AttributeGroupTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,10 +28,12 @@
TestRunner.run(AttributeGroupTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/soap_encoding_1.1.xsd";
}
+ @Override
public void testDefine() {
//String xsdSchema = getSchema(getSchemaToDefine());
InputStream is = getSchemaInputStream(getSchemaToDefine());
@@ -48,6 +50,7 @@
//compare(getControlTypes(), types);
}
+ @Override
public List getControlTypes()
{
return new ArrayList();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexImportsAndIncludesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexImportsAndIncludesTestCases.java
index dd2397c..e01bba8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexImportsAndIncludesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ComplexImportsAndIncludesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -69,6 +69,7 @@
}
}
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
if (schemaLocation == null) {
return null;
@@ -111,6 +112,7 @@
* @param systemId
* @return null
*/
+ @Override
public InputSource resolveEntity(String publicId, String systemId) {
return null;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicElementRefErrorTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicElementRefErrorTestCases.java
index 42d9cd7..ee38ad4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicElementRefErrorTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicElementRefErrorTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,14 +35,17 @@
TestRunner.run(CyclicElementRefErrorTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/Cyclic1ElementRefError.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/";
}
+ @Override
public void testDefine() {
DefaultSchemaResolver schemaResolver = new DefaultSchemaResolver();
@@ -59,6 +62,7 @@
}
+ @Override
public List<SDOType> getControlTypes() {
return new ArrayList<SDOType>();
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicElementRefTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicElementRefTestCases.java
index b29c603..e20e573 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicElementRefTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicElementRefTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,10 +40,12 @@
TestRunner.run(CyclicElementRefTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/Cyclic1ElementRef.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/";
}
@@ -52,6 +54,7 @@
* Success case - all types should be defined successfully with no infinite
* looping or multiple schema processing.
*/
+ @Override
public void testDefine() {
testDefine(new StreamSource(getSchemaToDefine()), new DefaultSchemaResolver());
}
@@ -72,6 +75,7 @@
}
+ @Override
public List<SDOType> getControlTypes() {
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
SDOType intType = (SDOType) typeHelper.getType("commonj.sdo", "Int");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicImportsDefineTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicImportsDefineTestCases.java
index 1fc38ee..6e24f6b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicImportsDefineTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicImportsDefineTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,10 +42,12 @@
TestRunner.run(CyclicImportsDefineTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/Cyclic1.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/";
}
@@ -119,6 +121,7 @@
* Success case - all types should be defined successfully with no infinite
* looping or multiple schema processing.
*/
+ @Override
public void testDefine() {
testDefine(new StreamSource(getSchemaToDefine()), new DefaultSchemaResolver());
}
@@ -155,6 +158,7 @@
}
}
+ @Override
public List<Type> getControlTypes() {
SDOType intType = (SDOType) typeHelper.getType("commonj.sdo", "Int");
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicSchemaResolver.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicSchemaResolver.java
index a815221..96e35ba 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicSchemaResolver.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/CyclicSchemaResolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
import org.eclipse.persistence.sdo.helper.DefaultSchemaResolver;
public class CyclicSchemaResolver extends DefaultSchemaResolver {
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
if (schemaLocation != null && !schemaLocation.equals("")) {
return super.resolveSchema(sourceXSD, namespace, schemaLocation);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineFailsDontRegisterTypesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineFailsDontRegisterTypesTestCases.java
index f9c3a6f..ac5e733 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineFailsDontRegisterTypesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineFailsDontRegisterTypesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,10 +31,12 @@
TestRunner.run(DefineFailsDontRegisterTypesTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineFails.xsd";
}
+ @Override
public void testDefine() {
InputStream is = getSchemaInputStream(getSchemaToDefine());
int sizeBefore = ((SDOTypeHelper)typeHelper).getTypesHashMap().size();
@@ -55,9 +57,10 @@
assertNull(typeHelper.getType("http://www.example.org", "customer-type"));
assertNull(typeHelper.getType("http://www.example.org", "bad-type"));
- assertNull(((SDOXSDHelper)xsdHelper).getGlobalProperty("http://www.example.org", "customer", true));
+ assertNull(xsdHelper.getGlobalProperty("http://www.example.org", "customer", true));
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
return types;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithBuiltInSchemaLocationTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithBuiltInSchemaLocationTestCases.java
index c4490a6..94f2737 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithBuiltInSchemaLocationTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithBuiltInSchemaLocationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,14 +31,17 @@
TestRunner.run(DefineWithBuiltInSchemaLocationTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithBuiltInSchemaLocations.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/";
}
+ @Override
public List<Type> getControlTypes() {
SDOType intType = (SDOType) typeHelper.getType("commonj.sdo", "Int");
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsExceptionTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsExceptionTestCases.java
index decfb6c..9485746 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsExceptionTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsExceptionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -54,19 +54,23 @@
}
// As this schema tree is designed to fail - override normal Type testing
+ @Override
public String getSchemaToDefine() { return null; }
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/exception/";
}
// As this schema tree is designed to fail - override normal Type testing
+ @Override
public List<Type> getControlTypes() {
return new ArrayList<Type>();
}
// As this schema tree is designed to fail - override normal Type testing
+ @Override
public void testDefine() {}
/**
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsNoSchemaLocationTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsNoSchemaLocationTestCases.java
index b6c8720..ebbb9b1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsNoSchemaLocationTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsNoSchemaLocationTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
TestRunner.run(DefineWithImportsNoSchemaLocationTestCases.class);
}
+ @Override
public void testDefine() {
InputStream is = getSchemaInputStream(getSchemaToDefine());
@@ -58,14 +59,17 @@
compare(getControlTypes(), types);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsWithNamespacesNoSchemaLocations.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/";
}
+ @Override
public List<Type> getControlTypes() {
String uri = "my.uri";
String uri2 = "my.uri2";
@@ -138,6 +142,7 @@
this.schemaLocationBase = schemaLocation;
}
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
try {
if (namespace.equals("my.uri3")) {
@@ -165,6 +170,7 @@
* @param systemId
* @return null
*/
+ @Override
public InputSource resolveEntity(String publicId, String systemId) {
return null;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsTestCases.java
index 078b857..121df23 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithImportsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,14 +39,17 @@
public static void main(String[] args) {
TestRunner.run(DefineWithImportsTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsWithNamespaces.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/";
}
+ @Override
public List<Type> getControlTypes() {
SDOType intType = (SDOType) typeHelper.getType("commonj.sdo", "Int");
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithIncludesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithIncludesTestCases.java
index 2d2b55e..23de59f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithIncludesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithIncludesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,14 +33,17 @@
TestRunner.run(DefineWithIncludesTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/IncludesWithNamespaces.xsd";
}
+ @Override
protected String getSchemaLocation() {
return FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/";
}
+ @Override
public List<Type> getControlTypes() {
SDOType intType = (SDOType) typeHelper.getType("commonj.sdo", "Int");
SDOType stringType = (SDOType) typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithNestedNamespacesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithNestedNamespacesTestCases.java
index a86c896..2fcb34e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithNestedNamespacesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/DefineWithNestedNamespacesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,10 +32,12 @@
TestRunner.run(DefineWithNestedNamespacesTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/namespaces/nestedNamespaces.xsd";
}
+ @Override
public List getControlTypes() {
// create a new Type for Address
DataObject AddressDO = dataFactory.create("commonj.sdo", "Type");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ExtendTypeWithSimpleContentTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ExtendTypeWithSimpleContentTest.java
index 7e2193c..b5892be 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ExtendTypeWithSimpleContentTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ExtendTypeWithSimpleContentTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
super(name);
}
+ @Override
public void testDefine() {
try {
DefaultSchemaResolver schemaResolver = new DefaultSchemaResolver();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ImportTypeWithSameNameAsElementTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ImportTypeWithSameNameAsElementTestSuite.java
index 11c7a03..bf8454c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ImportTypeWithSameNameAsElementTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/ImportTypeWithSameNameAsElementTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
super(name);
}
+ @Override
public void testDefine() {
try {
Source xsdSource = new StreamSource(getSchemaToDefine());
@@ -70,6 +71,7 @@
// SchemaResolver implementation
class CustomSchemaResolver extends DefaultSchemaResolver {
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
setBaseSchemaLocation(getSchemaLocation());
return super.resolveSchema(sourceXSD, namespace, schemaLocation);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/MultipleDefineSameTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/MultipleDefineSameTypeTestCases.java
index eddd584..ee65ee9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/MultipleDefineSameTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/MultipleDefineSameTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
TestRunner.main(arguments);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrder.xsd";
}
@@ -134,6 +135,7 @@
//}
}*/
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = "http://www.example.org";
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderComplexDefineTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderComplexDefineTestCases.java
index adda8f2..ade7a14 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderComplexDefineTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderComplexDefineTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
super(name);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderComplex.xsd";
}
@@ -36,6 +37,7 @@
TestRunner.run(PurchaseOrderComplexDefineTestCases.class);
}
+ @Override
public List getControlTypes() {
java.util.List types = new ArrayList();
String uri = NON_DEFAULT_URI;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderDefineTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderDefineTestCases.java
index 8367dbe..807a211 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderDefineTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderDefineTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,10 +32,12 @@
TestRunner.run(PurchaseOrderDefineTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrder.xsd";
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = null;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderWithAnnotationsDefineTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderWithAnnotationsDefineTestCases.java
index e72e5ab..07ef1ef 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderWithAnnotationsDefineTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/PurchaseOrderWithAnnotationsDefineTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
super(name);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithAnnotations.xsd";
}
@@ -36,6 +37,7 @@
TestRunner.run(PurchaseOrderWithAnnotationsDefineTestCases.class);
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = null;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/SchemaResolverSystemIdTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/SchemaResolverSystemIdTestCases.java
index 99cab96..9e4ec8c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/SchemaResolverSystemIdTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/SchemaResolverSystemIdTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,10 +46,12 @@
TestRunner.run(SchemaResolverSystemIdTestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return "";
}
+ @Override
public void testDefine() {
StreamSource source = new StreamSource("xyz:zxy");
List types = ((SDOXSDHelper)xsdHelper).define(source, new MySchemaResolver());
@@ -115,10 +117,12 @@
public static class MySchemaResolver implements SchemaResolver {
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
return null;
}
+ @Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
String schema = "<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
"<xsd:complexType name=\"employee-type\">" +
@@ -138,16 +142,19 @@
private String systemId;
+ @Override
public String getSystemId() {
return systemId;
}
+ @Override
public void setSystemId(String systemId) {
this.systemId = systemId;
}
}
+ @Override
public List getControlTypes()
{
return new ArrayList();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/TypePropertyIndexTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/TypePropertyIndexTest.java
index a7677e3..4c42538 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/TypePropertyIndexTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/TypePropertyIndexTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -80,10 +80,12 @@
this.schemaLocationBase = schemaLocation;
}
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
return TypePropertyIndexTest.getResourceAsStreamSource(schemaLocationBase + schemaLocation);
}
+ @Override
public InputSource resolveEntity(String publicId, String systemId) {
return null;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/XSDHelperDefineTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/XSDHelperDefineTestCases.java
index e0d922f..fb28b27 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/XSDHelperDefineTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/XSDHelperDefineTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -75,7 +75,7 @@
List controlProps = control.getDeclaredProperties();
for (int j = 0; j < controlProps.size(); j++) {
SDOProperty controlProp = (SDOProperty)controlProps.get(j);
- SDOProperty generatedProp = (SDOProperty)generated.getProperty(controlProp.getName());
+ SDOProperty generatedProp = generated.getProperty(controlProp.getName());
assertEquals(controlProp.isMany(), generatedProp.isMany());
//assertEquals(controlProp.isAttribute(), generatedProp.isAttribute());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/XSDHelperDefineTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/XSDHelperDefineTestSuite.java
index a93a7a9..3a4bae9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/XSDHelperDefineTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/XSDHelperDefineTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,11 +33,11 @@
public static Test suite() {
TestSuite suite = new TestSuite("All XSDHelper Define Tests");
- suite.addTest(new SDOSimpleTypeXSDTestSuite().suite());
- suite.addTest(new SDOComplexTypeXSDTestSuite().suite());
- suite.addTest(new SDOAttributeXSDTestSuite().suite());
- suite.addTest(new SDOElementXSDTestSuite().suite());
- suite.addTest(new ComplexDefineTestSuite().suite());
+ suite.addTest(SDOSimpleTypeXSDTestSuite.suite());
+ suite.addTest(SDOComplexTypeXSDTestSuite.suite());
+ suite.addTest(SDOAttributeXSDTestSuite.suite());
+ suite.addTest(SDOElementXSDTestSuite.suite());
+ suite.addTest(ComplexDefineTestSuite.suite());
suite.addTestSuite(ImportTypeWithSameNameAsElementTestSuite.class);
suite.addTestSuite(ExtendTypeWithSimpleContentTest.class);
suite.addTestSuite(RedefineTestCases.class);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/XSDHelperComplexTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/XSDHelperComplexTypeTestCases.java
index 89ef6d7..7b03050 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/XSDHelperComplexTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/XSDHelperComplexTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -513,7 +513,7 @@
//Property aPro = (SDOProperty)aType.getDeclaredProperties().get(0);
assertEquals(aPro.getName(), "myAttribute");
- Type proType = (Type)aPro.getType();
+ Type proType = aPro.getType();
assertEquals(proType, SDOConstants.SDO_STRING);
// check if it has no alias names
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/XSDHelperElementTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/XSDHelperElementTestCases.java
index a63f682..8183157 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/XSDHelperElementTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/XSDHelperElementTestCases.java
@@ -18,6 +18,7 @@
import commonj.sdo.Type;
import java.util.List;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -41,7 +42,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(types.size(), 2);
+ assertEquals(types.size(), 2);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -49,36 +50,36 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
- this.assertEquals(aType.getProperties().size(), 1);
+ assertEquals(properties.size(), 1);
+ assertEquals(aType.getProperties().size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "elementTest");
+ assertEquals(p.getType().getName(), "elementTest");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value
- this.assertNull(p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
- this.assertTrue(p.isContainment());
+ assertTrue(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -88,7 +89,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(2, types.size());
+ assertEquals(2, types.size());
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -96,35 +97,35 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
+ assertEquals(properties.size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "SDO_NAME");
+ assertEquals(p.getName(), "SDO_NAME");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "elementTest");
+ assertEquals(p.getType().getName(), "elementTest");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value
- this.assertNull(p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
- this.assertTrue(p.isContainment());
+ assertTrue(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -134,7 +135,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(types.size(), 2);
+ assertEquals(types.size(), 2);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -142,43 +143,43 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
+ assertEquals(properties.size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "elementTest");
+ assertEquals(p.getType().getName(), "elementTest");
// check alias name
- this.assertEquals(1, p.getAliasNames().size());
- this.assertEquals(p.getAliasNames().get(0), "ALIAS_NAME");
+ assertEquals(1, p.getAliasNames().size());
+ assertEquals(p.getAliasNames().get(0), "ALIAS_NAME");
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value
- this.assertNull(p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
- this.assertTrue(p.isContainment());
+ assertTrue(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
public void testElementWithNameCollisions() {
String xsdSchema = getSchema("org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/ElementWithNameCollisions.xsd");
List types = xsdHelper.define(xsdSchema);
- this.assertEquals(4, types.size());
+ assertEquals(4, types.size());
for (int i = 0; i < types.size(); i++) {
SDOType nextType = (SDOType)types.get(i);
@@ -210,7 +211,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has one type
- this.assertEquals(2, types.size());
+ assertEquals(2, types.size());
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -218,38 +219,38 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
- this.assertEquals(aType.getProperties().size(), 1);
+ assertEquals(properties.size(), 1);
+ assertEquals(aType.getProperties().size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myElement");
+ assertEquals(p.getName(), "myElement");
// check if Property's Type is as schema
//TODO: myElement or my-int
- this.assertEquals(p.getType().getName(), "myElement");
+ assertEquals(p.getType().getName(), "myElement");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! facing same problem as attribute's test !!
- this.assertEquals((Integer)p.getDefault(), Integer.valueOf(3));
+ assertEquals(p.getDefault(), Integer.valueOf(3));
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
- this.assertFalse(p.isContainment());
+ assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -263,7 +264,7 @@
Property p = (Property)myTestType.getDeclaredProperties().get(0);
// check if it many
- this.assertTrue(p.isMany());
+ assertTrue(p.isMany());
}
public void testElementWithMaxOccurance() {
@@ -272,7 +273,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(types.size(), 2);
+ assertEquals(types.size(), 2);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -280,36 +281,36 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
- this.assertEquals(1, aType.getProperties().size());
+ assertEquals(properties.size(), 1);
+ assertEquals(1, aType.getProperties().size());
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "elementTest");
+ assertEquals(p.getType().getName(), "elementTest");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value
- this.assertNull(p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
//TODO: what should containment be
//this.assertFalse(p.isContainment());
// check if it many
- this.assertTrue(p.isMany());
+ assertTrue(p.isMany());
}
@@ -319,7 +320,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(types.size(), 2);
+ assertEquals(types.size(), 2);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -327,36 +328,36 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
- this.assertEquals(1, aType.getProperties().size());
+ assertEquals(properties.size(), 1);
+ assertEquals(1, aType.getProperties().size());
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "elementTest");
+ assertEquals(p.getType().getName(), "elementTest");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value
- this.assertNull(p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
//TODO: what should containment be
//this.assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -366,7 +367,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has one type
- this.assertEquals(types.size(), 3);
+ assertEquals(types.size(), 3);
//Type aType = (Type)types.get(0);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
@@ -379,31 +380,31 @@
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
+ assertEquals(properties.size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "otherTest");
+ assertEquals(p.getName(), "otherTest");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "myTestType");
+ assertEquals(p.getType().getName(), "myTestType");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "mySubstitute");
+ assertEquals(p.getContainingType().getName(), "mySubstitute");
// check default value
- this.assertNull(p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
//TODO: what should containment be
//this.assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -413,7 +414,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(types.size(), 2);
+ assertEquals(types.size(), 2);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -421,36 +422,36 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
- this.assertEquals(aType.getProperties().size(), 1);
+ assertEquals(properties.size(), 1);
+ assertEquals(aType.getProperties().size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "my-int");
+ assertEquals(p.getType().getName(), "my-int");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value
- this.assertNull(p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
//TODO: should this be true or false
//this.assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -460,7 +461,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(types.size(), 2);
+ assertEquals(types.size(), 2);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -468,35 +469,35 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
- this.assertEquals(1, aType.getProperties().size());
+ assertEquals(properties.size(), 1);
+ assertEquals(1, aType.getProperties().size());
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "my-int");
+ assertEquals(p.getType().getName(), "my-int");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! may have the problem as in attriutes' test !!
- this.assertEquals((Integer)p.getDefault(), Integer.valueOf(3));
+ assertEquals(p.getDefault(), Integer.valueOf(3));
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
//TODO: what should containment be
//this.assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -506,7 +507,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(types.size(), 2);
+ assertEquals(types.size(), 2);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -514,35 +515,35 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
- this.assertEquals(1, aType.getProperties().size());
+ assertEquals(properties.size(), 1);
+ assertEquals(1, aType.getProperties().size());
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "my-int");
+ assertEquals(p.getType().getName(), "my-int");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! may have the problem as in attriutes' test !!
- this.assertEquals((Integer)p.getDefault(), Integer.valueOf(3));
+ assertEquals(p.getDefault(), Integer.valueOf(3));
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
//TODO: what should containment be
//this.assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -552,7 +553,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(types.size(), 2);
+ assertEquals(types.size(), 2);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -560,36 +561,36 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
+ assertEquals(properties.size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
//this.assertEquals(p.getType().getName(), "string");
- this.assertEquals(SDOConstants.SDO_STRING, p.getType());
+ assertEquals(SDOConstants.SDO_STRING, p.getType());
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! may have the problem as in attriutes' test !!
- this.assertNull((Integer)p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
//TODO: what should containment be
//this.assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -599,7 +600,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(3, types.size());
+ assertEquals(3, types.size());
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -607,36 +608,36 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
+ assertEquals(properties.size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "P_TYPE");
+ assertEquals(p.getType().getName(), "P_TYPE");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! may have the problem as in attriutes' test !!
- this.assertNull((Integer)p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
//TODO: what should containment be
- this.assertFalse(p.isContainment());
+ assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -701,7 +702,7 @@
List types = xsdHelper.define(xsdSchema);
// check list has 2 types
- this.assertEquals(types.size(), 2);
+ assertEquals(types.size(), 2);
Type aType = null;
for (int i = 0; i < types.size(); i++) {
Type nextType = (Type)types.get(i);
@@ -709,35 +710,35 @@
aType = nextType;
}
}
- this.assertNotNull(aType);
+ assertNotNull(aType);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
+ assertEquals(properties.size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "String");
+ assertEquals(p.getType().getName(), "String");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! may have the problem as in attriutes' test !!
- this.assertNull((Integer)p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
- this.assertFalse(p.isContainment());
+ assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
}
@@ -747,40 +748,40 @@
List types = xsdHelper.define(xsdSchema);
// check list has one type
- this.assertEquals(types.size(), 1);
+ assertEquals(types.size(), 1);
Type aType = (Type)types.get(0);
List properties = aType.getDeclaredProperties();
// check the type has one Property
- this.assertEquals(properties.size(), 1);
+ assertEquals(properties.size(), 1);
Property p = (Property)properties.get(0);
// check if Property name is as schema
- this.assertEquals(p.getName(), "myTest1");
+ assertEquals(p.getName(), "myTest1");
// check if Property's Type is as schema
- this.assertEquals(p.getType().getName(), "ChangeSummaryType");
+ assertEquals(p.getType().getName(), "ChangeSummaryType");
// check alias name
//this.assertNull(p.getAliasNames());
// check containing type
- this.assertEquals(p.getContainingType().getName(), "myTestType");
+ assertEquals(p.getContainingType().getName(), "myTestType");
// check default value !! may have the problem as in attriutes' test !!
- this.assertNull((Integer)p.getDefault());
+ assertNull(p.getDefault());
// check opposite Property
- this.assertNull(p.getOpposite());
+ assertNull(p.getOpposite());
- this.assertFalse(p.isContainment());
+ assertFalse(p.isContainment());
// check if it many
- this.assertFalse(p.isMany());
+ assertFalse(p.isMany());
// TODO: sdo spec p30 requires r/o state but 200606_cs changes set it to true for now
//assertFalse(p.isReadOnly());
- this.assertTrue(p.isReadOnly());
+ assertTrue(p.isReadOnly());
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/XSDHelperSimpleTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/XSDHelperSimpleTypeTestCases.java
index 5e9ac7c..55297f8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/XSDHelperSimpleTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/simpletypes/XSDHelperSimpleTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import commonj.sdo.Type;
import java.math.BigInteger;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOType;
@@ -34,27 +36,27 @@
List types = xsdHelper.define(xmlSchema);
- this.assertEquals(types.size(), 1);
+ assertEquals(types.size(), 1);
Type type = (Type)types.get(0);
// Name
- this.assertEquals(type.getName(), "my-int");
+ assertEquals(type.getName(), "my-int");
//abstract
- this.assertFalse(type.isAbstract());
+ assertFalse(type.isAbstract());
// Base
- this.assertEquals(type.getBaseTypes().size(), 1);
+ assertEquals(type.getBaseTypes().size(), 1);
Type baseType = (Type)type.getBaseTypes().get(0);
- this.assertEquals(baseType, SDOConstants.SDO_INT);
+ assertEquals(baseType, SDOConstants.SDO_INT);
//this.assertEquals(baseType.getName(), "int");
//this.assertEquals(baseType.getURI(), "commonj.sdo");
// dataType
- this.assertTrue(type.isDataType());
+ assertTrue(type.isDataType());
// Uri
- this.assertEquals(type.getURI(), "http://www.example.org");
+ assertEquals(type.getURI(), "http://www.example.org");
}
public void testSimpleTypeAnonymous() {
@@ -63,28 +65,28 @@
List types = xsdHelper.define(xmlSchema);
- this.assertEquals(types.size(), 1);
+ assertEquals(types.size(), 1);
Type type = (Type)types.get(0);
// Name
- this.assertEquals(type.getName(), "myElement");
+ assertEquals(type.getName(), "myElement");
//abstract
- this.assertFalse(type.isAbstract());
+ assertFalse(type.isAbstract());
// Base
- this.assertEquals(type.getBaseTypes().size(), 1);
+ assertEquals(type.getBaseTypes().size(), 1);
Type baseType = (Type)type.getBaseTypes().get(0);
- this.assertEquals(baseType, SDOConstants.SDO_INT);
+ assertEquals(baseType, SDOConstants.SDO_INT);
assertEquals(((SDOType)baseType).getSubTypes().size(), 0);
//this.assertEquals(baseType.getName(), "int");
//this.assertEquals(baseType.getURI(), "commonj.sdo");
// dataType
- this.assertTrue(type.isDataType());
+ assertTrue(type.isDataType());
// Uri
- this.assertEquals(type.getURI(), "http://www.example.org");
+ assertEquals(type.getURI(), "http://www.example.org");
}
public void testSimpleTypeWithSDO_Name() {
@@ -93,28 +95,28 @@
List types = xsdHelper.define(xmlSchema);
- this.assertEquals(types.size(), 1);
+ assertEquals(types.size(), 1);
Type type = (Type)types.get(0);
// Name
- this.assertEquals(type.getName(), "SDO_NAME");
+ assertEquals(type.getName(), "SDO_NAME");
//abstract
- this.assertFalse(type.isAbstract());
+ assertFalse(type.isAbstract());
// Base
- this.assertEquals(type.getBaseTypes().size(), 1);
+ assertEquals(type.getBaseTypes().size(), 1);
Type baseType = (Type)type.getBaseTypes().get(0);
- this.assertEquals(baseType, SDOConstants.SDO_INT);
+ assertEquals(baseType, SDOConstants.SDO_INT);
assertEquals(((SDOType)baseType).getSubTypes().size(), 0);
// this.assertEquals(baseType.getName(), "int");
//this.assertEquals(baseType.getURI(), "commonj.sdo");
// dataType
- this.assertTrue(type.isDataType());
+ assertTrue(type.isDataType());
// Uri
- this.assertEquals(type.getURI(), "http://www.example.org");
+ assertEquals(type.getURI(), "http://www.example.org");
}
public void testSimpleTypeWithAbstract() {
@@ -123,28 +125,28 @@
List types = xsdHelper.define(xmlSchema);
- this.assertEquals(types.size(), 1);
+ assertEquals(types.size(), 1);
Type type = (Type)types.get(0);
// Name
- this.assertEquals(type.getName(), "my-int");
+ assertEquals(type.getName(), "my-int");
//abstract
- this.assertFalse(type.isAbstract());
+ assertFalse(type.isAbstract());
// Base
- this.assertEquals(type.getBaseTypes().size(), 1);
+ assertEquals(type.getBaseTypes().size(), 1);
Type baseType = (Type)type.getBaseTypes().get(0);
- this.assertEquals(baseType, SDOConstants.SDO_INT);
+ assertEquals(baseType, SDOConstants.SDO_INT);
assertEquals(((SDOType)baseType).getSubTypes().size(), 0);
//this.assertEquals(baseType.getName(), "int");
//this.assertEquals(baseType.getURI(), "commonj.sdo");
// dataType
- this.assertTrue(type.isDataType());
+ assertTrue(type.isDataType());
// Uri
- this.assertEquals(type.getURI(), "http://www.example.org");
+ assertEquals(type.getURI(), "http://www.example.org");
}
//commonj.sdo/java
@@ -154,26 +156,26 @@
List types = xsdHelper.define(xmlSchema);
- this.assertEquals(types.size(), 1);
+ assertEquals(types.size(), 1);
Type type = (Type)types.get(0);
// Name
- this.assertEquals("my-int", type.getName());
+ assertEquals("my-int", type.getName());
//abstract
- this.assertFalse(type.isAbstract());
+ assertFalse(type.isAbstract());
// Base
- this.assertEquals(type.getBaseTypes().size(), 0);
+ assertEquals(type.getBaseTypes().size(), 0);
// dataType
- this.assertTrue(type.isDataType());
+ assertTrue(type.isDataType());
// Uri
- this.assertEquals(type.getURI(), "http://www.example.org");
+ assertEquals(type.getURI(), "http://www.example.org");
- this.assertEquals("INSTANCE_CLASS", ((SDOType)type).getInstanceClassName());
+ assertEquals("INSTANCE_CLASS", ((SDOType)type).getInstanceClassName());
}
public void testSimpleTypeWithSDO_JAVA_ExtendedInstanceClass() {
@@ -182,30 +184,30 @@
List types = xsdHelper.define(xmlSchema);
- this.assertEquals(types.size(), 1);
+ assertEquals(types.size(), 1);
Type type = (Type)types.get(0);
// Name
- this.assertEquals("my-int", type.getName());
+ assertEquals("my-int", type.getName());
//abstract
- this.assertFalse(type.isAbstract());
+ assertFalse(type.isAbstract());
// Base
- this.assertEquals(type.getBaseTypes().size(), 1);
+ assertEquals(type.getBaseTypes().size(), 1);
Type baseType = (Type)type.getBaseTypes().get(0);
- this.assertEquals(baseType, SDOConstants.SDO_INT);
+ assertEquals(baseType, SDOConstants.SDO_INT);
assertEquals(((SDOType)baseType).getSubTypes().size(), 0);
//this.assertEquals(baseType.getName(), "int");
//this.assertEquals(baseType.getURI(), "commonj.sdo");
// dataType
- this.assertTrue(type.isDataType());
+ assertTrue(type.isDataType());
// Uri
- this.assertEquals(type.getURI(), "http://www.example.org");
+ assertEquals(type.getURI(), "http://www.example.org");
- this.assertEquals("EXTENDED_INSTANCE_CLASS", ((SDOType)type).getInstanceClassName());
+ assertEquals("EXTENDED_INSTANCE_CLASS", ((SDOType)type).getInstanceClassName());
}
public void testSimpleTypeWithListItemTypes() {
@@ -214,7 +216,7 @@
List types = xsdHelper.define(xmlSchema);
- this.assertEquals(2, types.size());
+ assertEquals(2, types.size());
for (int i = 0; i < types.size(); i++) {
Type type = (Type)types.get(i);
@@ -248,7 +250,7 @@
List types = xsdHelper.define(xmlSchema);
- this.assertEquals(3, types.size());
+ assertEquals(3, types.size());
for (int i = 0; i < types.size(); i++) {
Type type = (Type)types.get(i);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateAppInfoTNSTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateAppInfoTNSTestCases.java
index dcaeaf1..35e6673 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateAppInfoTNSTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateAppInfoTNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,10 +28,12 @@
super(name);
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderAppInfoWTNSGenerated.xsd";
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderAppInfoWTNS.xsd";
}
@@ -40,6 +42,7 @@
TestRunner.run(DefineAndGenerateAppInfoTNSTestCases.class);
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = "theTNS";
@@ -230,10 +233,12 @@
return types;
}
+ @Override
protected String getUri() {
return "theTNS";
}
+ @Override
protected String getTestControlString() {
String controlString = "<xsd:appinfo source=\"itemTest\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" + "\n" + " <someTag xmlns=\"theTNS\">blah blah itemTest</someTag>" + "\n" + "</xsd:appinfo>" + "\n" + "<xsd:appinfo source=\"itemTest\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" + "\n" + " <anotherTag xmlns=\"theTNS\">blah blah itemTest</anotherTag>" + "\n" + "</xsd:appinfo>";
return controlString;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateAppInfoTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateAppInfoTestCases.java
index e202069..ae57b07 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateAppInfoTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateAppInfoTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,10 +37,12 @@
super(name);
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderAppInfoGenerated.xsd";
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderAppInfo.xsd";
}
@@ -49,6 +51,7 @@
TestRunner.run(DefineAndGenerateAppInfoTestCases.class);
}
+ @Override
public void testDefineAndGenerate() throws Exception {
InputStream is = getSchemaInputStream(getSchemaToDefine());
List types = xsdHelper.define(is, getSchemaLocation());
@@ -89,6 +92,7 @@
return null;
}
+ @Override
public void compareGeneratedTypes(List controlTypes, List generatedTypes) {
super.compareGeneratedTypes(controlTypes, generatedTypes);
Type itemsType = typeHelper.getType(getUri(), "Items");
@@ -130,6 +134,7 @@
String streetTest2 = xsdHelper.getAppinfo(streetProp, "streetTest2");
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBidirectionalTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBidirectionalTestCases.java
index dba2ba8..42ea048 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBidirectionalTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBidirectionalTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
stringType = typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.STRING);
@@ -78,14 +79,17 @@
return "company";
}
+ @Override
public String getSchemaToDefine() {
return XSD_PATH;
}
+ @Override
public String getControlGeneratedFileName() {
return XSD_PATH;
}
+ @Override
protected List<Type> getTypesToGenerateFrom() {
return getControlTypes();
}
@@ -226,6 +230,7 @@
}
// this function is overridden above
+ @Override
public void testDefineAndGenerate() {
}
@@ -525,6 +530,7 @@
return types;
}
+ @Override
public List<Type> getControlTypes() {
List<Type> types = new ArrayList<Type>();
if(typeHelper.getType(URINAME, COMPANY_TYPENAME) != null) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBug5893546TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBug5893546TestCases.java
index e0f2d61..fb5a162 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBug5893546TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateBug5893546TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,10 +36,12 @@
TestRunner.run(DefineAndGenerateBug5893546TestCases.class);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/Bug5893546Emp.xsd";
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = "http://example.com/emp/";
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateChoicesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateChoicesTestCases.java
index dae65b6..6ea111d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateChoicesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateChoicesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
super(name);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/OrderSequenceAndChoice.xsd";
}
@@ -37,14 +38,17 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/OrderSequenceAndChoiceGenerated.xsd";
}
+ @Override
public List getTypesToGenerateFrom() {
return getControlTypes();
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
@@ -93,14 +97,14 @@
POType.addDeclaredProperty(commentProp);
POType.addDeclaredProperty(poIDProp);
- ((SDOProperty)POType.getProperty("poId")).setXsd(true);
- ((SDOProperty)POType.getProperty("poId")).setXsdLocalName("poId");
- ((SDOProperty)POType.getProperty("shipTo")).setXsd(true);
- ((SDOProperty)POType.getProperty("shipTo")).setXsdLocalName("shipTo");
- ((SDOProperty)POType.getProperty("billTo")).setXsd(true);
- ((SDOProperty)POType.getProperty("billTo")).setXsdLocalName("billTo");
- ((SDOProperty)POType.getProperty("comment")).setXsd(true);
- ((SDOProperty)POType.getProperty("comment")).setXsdLocalName("comment");
+ POType.getProperty("poId").setXsd(true);
+ POType.getProperty("poId").setXsdLocalName("poId");
+ POType.getProperty("shipTo").setXsd(true);
+ POType.getProperty("shipTo").setXsdLocalName("shipTo");
+ POType.getProperty("billTo").setXsd(true);
+ POType.getProperty("billTo").setXsdLocalName("billTo");
+ POType.getProperty("comment").setXsd(true);
+ POType.getProperty("comment").setXsdLocalName("comment");
types.add(POType);
types.add(addressType);
@@ -224,43 +228,44 @@
addressSDOType.addDeclaredProperty(postalCodeProp);
addressSDOType.addDeclaredProperty(countryProp);
- ((SDOProperty)addressSDOType.getProperty("name")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("name")).setXsdLocalName("name");
- ((SDOProperty)addressSDOType.getProperty("street")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("street")).setXsdLocalName("street");
- ((SDOProperty)addressSDOType.getProperty("USPrice")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("USPrice")).setXsdLocalName("USPrice");
- ((SDOProperty)addressSDOType.getProperty("CDNPrice")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("CDNPrice")).setXsdLocalName("CDNPrice");
- ((SDOProperty)addressSDOType.getProperty("exchangeRate")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("exchangeRate")).setXsdLocalName("exchangeRate");
- ((SDOProperty)addressSDOType.getProperty("city")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("city")).setXsdLocalName("city");
- ((SDOProperty)addressSDOType.getProperty("country")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("country")).setXsdLocalName("country");
- ((SDOProperty)addressSDOType.getProperty("state")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("state")).setXsdLocalName("state");
- ((SDOProperty)addressSDOType.getProperty("one")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("one")).setXsdLocalName("one");
- ((SDOProperty)addressSDOType.getProperty("two")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("two")).setXsdLocalName("two");
- ((SDOProperty)addressSDOType.getProperty("three")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("three")).setXsdLocalName("three");
- ((SDOProperty)addressSDOType.getProperty("four")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("four")).setXsdLocalName("four");
- ((SDOProperty)addressSDOType.getProperty("five")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("five")).setXsdLocalName("five");
- ((SDOProperty)addressSDOType.getProperty("province")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("province")).setXsdLocalName("province");
+ addressSDOType.getProperty("name").setXsd(true);
+ addressSDOType.getProperty("name").setXsdLocalName("name");
+ addressSDOType.getProperty("street").setXsd(true);
+ addressSDOType.getProperty("street").setXsdLocalName("street");
+ addressSDOType.getProperty("USPrice").setXsd(true);
+ addressSDOType.getProperty("USPrice").setXsdLocalName("USPrice");
+ addressSDOType.getProperty("CDNPrice").setXsd(true);
+ addressSDOType.getProperty("CDNPrice").setXsdLocalName("CDNPrice");
+ addressSDOType.getProperty("exchangeRate").setXsd(true);
+ addressSDOType.getProperty("exchangeRate").setXsdLocalName("exchangeRate");
+ addressSDOType.getProperty("city").setXsd(true);
+ addressSDOType.getProperty("city").setXsdLocalName("city");
+ addressSDOType.getProperty("country").setXsd(true);
+ addressSDOType.getProperty("country").setXsdLocalName("country");
+ addressSDOType.getProperty("state").setXsd(true);
+ addressSDOType.getProperty("state").setXsdLocalName("state");
+ addressSDOType.getProperty("one").setXsd(true);
+ addressSDOType.getProperty("one").setXsdLocalName("one");
+ addressSDOType.getProperty("two").setXsd(true);
+ addressSDOType.getProperty("two").setXsdLocalName("two");
+ addressSDOType.getProperty("three").setXsd(true);
+ addressSDOType.getProperty("three").setXsdLocalName("three");
+ addressSDOType.getProperty("four").setXsd(true);
+ addressSDOType.getProperty("four").setXsdLocalName("four");
+ addressSDOType.getProperty("five").setXsd(true);
+ addressSDOType.getProperty("five").setXsdLocalName("five");
+ addressSDOType.getProperty("province").setXsd(true);
+ addressSDOType.getProperty("province").setXsdLocalName("province");
- ((SDOProperty)addressSDOType.getProperty("zip")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("zip")).setXsdLocalName("zip");
- ((SDOProperty)addressSDOType.getProperty("postalCode")).setXsd(true);
- ((SDOProperty)addressSDOType.getProperty("postalCode")).setXsdLocalName("postalCode");
+ addressSDOType.getProperty("zip").setXsd(true);
+ addressSDOType.getProperty("zip").setXsdLocalName("zip");
+ addressSDOType.getProperty("postalCode").setXsd(true);
+ addressSDOType.getProperty("postalCode").setXsdLocalName("postalCode");
return addressSDOType;
}
+ @Override
protected void compareGeneratedTypes(List controlTypes, List generatedTypes) {
super.compareGeneratedTypes(controlTypes, generatedTypes);
//also check order
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnPropertyManyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnPropertyManyTestCases.java
index b280ace..af836d4 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnPropertyManyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnPropertyManyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
super(name);
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = "http://www.example.org";
@@ -114,9 +115,11 @@
// note the generated.xsd contains the header attribute elementFormDefault="qualified"
// the non-generated.xsd is used by cases in xsd/xmlhelper - modify with care
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnPropertyManyCaseGenerated.xsd";
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnPropertyManyCase.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnPropertyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnPropertyTestCases.java
index 96b7ae2..61f08eb 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnPropertyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnPropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
super(name);
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = "http://www.example.org";
@@ -114,9 +115,11 @@
// note the generated.xsd contains the header attribute elementFormDefault="qualified"
// the non-generated.xsd is used by cases in xsd/xmlhelper - modify with care
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnPropertyGenerated.xsd";
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnProperty.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnXSDManyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnXSDManyTestCases.java
index 08ff23b..544d6d6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnXSDManyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnXSDManyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
super(name);
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = "http://www.example.org";
@@ -99,10 +100,12 @@
// note the generated.xsd contains the header attribute elementFormDefault="qualified"
// the non-generated.xsd is used by cases in xsd/xmlhelper - modify with care
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnXSDManyCaseGenerated.xsd";
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnXSDManyCase.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnXSDTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnXSDTestCases.java
index 7c7d63b..0e5cd16 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnXSDTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateMimeTypeOnXSDTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
super(name);
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = "http://www.example.org";
@@ -96,10 +97,12 @@
// note the generated.xsd contains the header attribute elementFormDefault="qualified"
// the non-generated.xsd is used by cases in xsd/xmlhelper - modify with care
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnXSDGenerated.xsd";
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/EmployeeWithMimeTypeOnXSD.xsd";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNameCollisionsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNameCollisionsTestCases.java
index 9581072..2ac273d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNameCollisionsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNameCollisionsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,6 +28,7 @@
super(name);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/NameCollisions.xsd";
}
@@ -37,14 +38,17 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/NameCollisionsGenerated.xsd";
}
+ @Override
public List<Type> getTypesToGenerateFrom() {
return getControlTypes();
}
+ @Override
public List<Type> getControlTypes() {
List<Type> types = new ArrayList<Type>();
((SDOTypeHelper)typeHelper).reset();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNillableTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNillableTestCases.java
index 828f57f..ffd79ef 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNillableTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateNillableTestCases.java
@@ -28,6 +28,7 @@
super(name);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/CustomerWithNillable.xsd";
}
@@ -37,10 +38,12 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/CustomerWithNillableGenerated.xsd";
}
+ @Override
public List<Type> getControlTypes() {
List<Type> types = new ArrayList<Type>();
String uri = NON_DEFAULT_URI;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateSequencesPurchaseOrderTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateSequencesPurchaseOrderTestCases.java
index a21637b..41c1833 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateSequencesPurchaseOrderTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateSequencesPurchaseOrderTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
super(name);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderComplexSequenced.xsd";
}
@@ -38,14 +39,17 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderComplexSequenced.xsd";
}
+ @Override
public List getTypesToGenerateFrom() {
return getControlTypes();
}
+ @Override
public List getControlTypes() {
SDOType changeSummaryType = (SDOType) aHelperContext.getTypeHelper().getType(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateSequencesTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateSequencesTestCases.java
index d30444c..f51b552 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateSequencesTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateSequencesTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,7 @@
super(name);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/ComplexTypeWithMultipleOpenContent.xsd";
}
@@ -38,14 +39,17 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/complextypes/ComplexTypeWithMultipleOpenContentGenerated.xsd";
}
+ @Override
public List<Type> getTypesToGenerateFrom () {
return getControlTypes();
}
+ @Override
public List<Type> getControlTypes() {
List<Type> types = new ArrayList<Type>();
((SDOTypeHelper)typeHelper).reset();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateWithSDOImportsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateWithSDOImportsTestCases.java
index 283690c..a2c55d3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateWithSDOImportsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateWithSDOImportsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,10 +28,12 @@
super(name);
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/SimpleWithSDOImports.xsd";
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/SimpleWithSDOImports.xsd";
}
@@ -40,6 +42,7 @@
TestRunner.run(DefineAndGenerateWithSDOImportsTestCases.class);
}
+ @Override
public List getControlTypes() {
List types = new ArrayList();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateWrapperTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateWrapperTypeTestCases.java
index 62ad511..e8b513a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateWrapperTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/DefineAndGenerateWrapperTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,6 +35,7 @@
super(name);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/ElementWithWrapperTypes.xsd";
}
@@ -44,11 +45,13 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/define/elements/ElementWithWrapperTypes.xsd";
}
//public List getTypesToGenerateFrom() {
+ @Override
public List getControlTypes() {
//return getControlTypes();
@@ -122,6 +125,7 @@
return types;
}
+ @Override
public List getTypesToGenerateFrom() {
// public List getControlTypes() {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/IDREFTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/IDREFTestCases.java
index e29c9c0..60fbd86 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/IDREFTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/IDREFTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,10 +29,12 @@
super(name);
}
+ @Override
public String getSchemaToDefine() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithIDREF.xsd";
}
+ @Override
public String getControlGeneratedFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithIDREFGenerated.xsd";
}
@@ -62,6 +64,7 @@
}
}
*/
+ @Override
public List getControlTypes() {
List types = new ArrayList();
String uri = NON_DEFAULT_URI;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/XSDHelperDefineAndGenerateTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/XSDHelperDefineAndGenerateTestCases.java
index df0205b..b86d1f8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/XSDHelperDefineAndGenerateTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/defineandgenerate/XSDHelperDefineAndGenerateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -91,7 +91,7 @@
List controlProps = control.getDeclaredProperties();
for (int j = 0; j < controlProps.size(); j++) {
SDOProperty controlProp = (SDOProperty)controlProps.get(j);
- SDOProperty generatedProp = (SDOProperty)generated.getProperty(controlProp.getName());
+ SDOProperty generatedProp = generated.getProperty(controlProp.getName());
assertEquals(controlProp.isMany(), generatedProp.isMany());
//assertEquals(controlProp.isAttribute(), generatedProp.isAttribute());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/CyclicImportsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/CyclicImportsTestCases.java
index a593838..87168b8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/CyclicImportsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/CyclicImportsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,16 +34,19 @@
TestRunner.main(arguments);
}
+ @Override
public Map getMap() {
HashMap schemaLocationMap = new HashMap();
schemaLocationMap.put(new QName("my.uri2", "USAddress"), "Cyclic2.xsd");
return schemaLocationMap;
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/Cyclic1.xsd";
}
+ @Override
protected List getGenerateAllControlFileNames() {
ArrayList controlFiles = new ArrayList();
controlFiles.add("org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/Cyclic1.xsd");
@@ -51,6 +54,7 @@
return controlFiles;
}
+ @Override
public List getTypesToGenerateFrom() {
//for this test all the types we want generated are in the list of types but some are in different targetnamespaces
List types = new ArrayList();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportBug6311853TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportBug6311853TestCases.java
index 608bfa0..3f6f2c9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportBug6311853TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportBug6311853TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,11 +44,13 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportBug6311853.xsd";
}
+ @Override
public Map getMap() {
HashMap schemaLocationMap = new HashMap();
schemaLocationMap.put(new QName("my.uri2", "Person"), "ImportBug6311853.xsd");
@@ -56,6 +58,7 @@
return schemaLocationMap;
}
+ @Override
public List getTypesToGenerateFrom() {
List types = new ArrayList();
String uri = "my.uri2";
@@ -90,7 +93,7 @@
DefaultSchemaLocationResolver resolver = new DefaultSchemaLocationResolver(getMap());
FileInputStream is = new FileInputStream(getControlFileName());
- List types = ((SDOXSDHelper)xsdHelper).define(is, FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/");
+ List types = xsdHelper.define(is, FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/");
ArrayList firstType = new ArrayList(1);
firstType.add(typeHelper.getType("my.uri2", "Person"));
String generatedSchema = ((SDOXSDHelper)xsdHelper).generate(firstType, resolver);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsTestCases.java
index 6fa51c3..91669c9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,10 +36,12 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsWithNamespacesGenerated.xsd";
}
+ @Override
public Map getMap() {
HashMap schemaLocationMap = new HashMap();
schemaLocationMap.put(new QName("my.uri2", "USAddress"), "Address.xsd");
@@ -48,6 +50,7 @@
return schemaLocationMap;
}
+ @Override
protected List getGenerateAllControlFileNames() {
ArrayList controlFiles = new ArrayList();
controlFiles.add("org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/ImportsWithNamespaces.xsd");
@@ -57,6 +60,7 @@
return controlFiles;
}
+ @Override
protected HashMap getSchemaNamespacesMap() {
HashMap namespaces = new HashMap();
namespaces.put("my.uri", "ImportsWithNamespaces.xsd");
@@ -66,6 +70,7 @@
return namespaces;
}
+ @Override
public List getTypesToGenerateFrom() {
//for this test all the types we want generated are in the list of types but some are in different targetnamespaces
List types = new ArrayList();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderComplexGenerateTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderComplexGenerateTestCases.java
index 6994c26..7844809 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderComplexGenerateTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderComplexGenerateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderComplexGenerated.xsd";
}
@@ -63,9 +64,10 @@
public java.util.List defineTypesFromSchema() {
InputStream is = getSchemaInputStream("org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderComplex.xsd");
- return ((SDOXSDHelper)xsdHelper).define(is, null);
+ return xsdHelper.define(is, null);
}
+ @Override
public java.util.List getTypesToGenerateFrom() {
java.util.List types = new ArrayList();
String uri = "http://www.example.org";
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateTestCases.java
index d798502..74b1428 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,10 +32,12 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrder.xsd";
}
+ @Override
public List getTypesToGenerateFrom() {
List types = new ArrayList();
String uri = null;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateWithAnnotationsTNSTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateWithAnnotationsTNSTestCases.java
index 674bdd3..7995837 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateWithAnnotationsTNSTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateWithAnnotationsTNSTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,19 +27,23 @@
TestRunner.run(PurchaseOrderGenerateWithAnnotationsTNSTestCases.class);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithAnnotationsGeneratedTNS.xsd";
}
+ @Override
public String getControlFileNameDifferentOrder() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithAnnotationsGeneratedTNSRoundTrip.xsd";
}
+ @Override
public java.util.List defineTypesFromSchema() {
InputStream is = getSchemaInputStream("org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithAnnotationsTNS.xsd");
- return ((SDOXSDHelper)xsdHelper).define(is, null);
+ return xsdHelper.define(is, null);
}
+ @Override
public String getControlUri() {
return "my.uri";
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateWithAnnotationsTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateWithAnnotationsTestCases.java
index 2c2d214..c8b6634 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateWithAnnotationsTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/PurchaseOrderGenerateWithAnnotationsTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,6 +39,7 @@
TestRunner.run(PurchaseOrderGenerateWithAnnotationsTestCases.class);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithAnnotationsGenerated.xsd";
}
@@ -47,6 +48,7 @@
return "org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithAnnotationsGeneratedRoundTrip.xsd";
}
+ @Override
public List getTypesToGenerateFrom() {
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
SDOProperty xmlDataTypeProperty = (SDOProperty) typeHelper.getOpenContentProperty(SDOConstants.SDOXML_URL, SDOConstants.SDOXML_DATATYPE);
@@ -354,7 +356,7 @@
public java.util.List defineTypesFromSchema() {
InputStream is = getSchemaInputStream("org/eclipse/persistence/testing/sdo/schemas/PurchaseOrderWithAnnotations.xsd");
- return ((SDOXSDHelper)xsdHelper).define(is, null);
+ return xsdHelper.define(is, null);
}
public String getControlUri() {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart2TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart2TestCases.java
index a3e1257..9834320 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart2TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart2TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,7 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/customerPart2.xsd";
}
@@ -61,6 +62,7 @@
return "org/eclipse/persistence/testing/sdo/schemas/customerExample4Multiple.xsd";
}
+ @Override
public java.util.Map getMap() {
HashMap schemaLocationMap = new HashMap();
schemaLocationMap.put(new QName("my.uri1", "CustomerType"), "customer.xsd");
@@ -172,6 +174,7 @@
return xsdHelper.define(is, FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/schemas/");
}
+ @Override
public List getTypesToGenerateFrom() {
List types = new ArrayList();
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart3TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart3TestCases.java
index 2a5d66c..29f5d8b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart3TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart3TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/customerBillToShipTo.xsd";
}
@@ -56,6 +57,7 @@
return "org/eclipse/persistence/testing/sdo/schemas/customerBillToShipTo.xsd";
}
+ @Override
public java.util.Map getMap() {
HashMap schemaLocationMap = new HashMap();
schemaLocationMap.put(new QName("my.uri", "CustomerType"), "customer.xsd");
@@ -102,6 +104,7 @@
return xsdHelper.define(is, null);
}
+ @Override
public List getTypesToGenerateFrom() {
List types = new ArrayList();
String uri = "my.uri";
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart4TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart4TestCases.java
index 60785d0..83caea2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart4TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverPart4TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/customerBillToShipToDiffURI.xsd";
}
@@ -62,6 +63,7 @@
return "org/eclipse/persistence/testing/sdo/schemas/customerBillToShipToDiffURIExample4.xsd";
}
+ @Override
public java.util.Map getMap() {
HashMap schemaLocationMap = new HashMap();
schemaLocationMap.put(new QName("my.uri1", "CustomerType"), "customer.xsd");
@@ -144,6 +146,7 @@
return xsdHelper.define(is, FILE_PROTOCOL + USER_DIR + "/org/eclipse/persistence/testing/sdo/schemas/");
}
+ @Override
public List getTypesToGenerateFrom() {
List types = new ArrayList();
Type stringType = typeHelper.getType("commonj.sdo", "String");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverTestCases.java
index 1adaf78..e5c3f16 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/SchemaLocationResolverTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
TestRunner.main(arguments);
}
+ @Override
public String getControlFileName() {
return "org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/customer.xsd";
}
@@ -81,6 +82,7 @@
return "org/eclipse/persistence/testing/sdo/schemas/customerBillToShipTo.xsd";
}
+ @Override
public java.util.Map getMap() {
HashMap schemaLocationMap = new HashMap();
schemaLocationMap.put(new QName("my.uri", "CustomerType"), "customer.xsd");
@@ -347,6 +349,7 @@
return xsdHelper.define(is, null);
}
+ @Override
public List getTypesToGenerateFrom() {
List types = new ArrayList();
String uri = "my.uri";
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example3SLR.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example3SLR.java
index deff911..befe110 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example3SLR.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example3SLR.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
import commonj.sdo.Type;
public class Example3SLR implements SchemaLocationResolver {
+ @Override
public String resolveSchemaLocation(Type sourceType, Type referencedType) {
return null;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example3SLRMultiple.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example3SLRMultiple.java
index c3658fa..3572deb 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example3SLRMultiple.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example3SLRMultiple.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
import commonj.sdo.Type;
public class Example3SLRMultiple implements SchemaLocationResolver {
+ @Override
public String resolveSchemaLocation(Type sourceType, Type referencedType) {
if(referencedType.getURI().contains("commonj.sdo")) {
return null;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example4SLRMultiple.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example4SLRMultiple.java
index bd97bbc..a803571 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example4SLRMultiple.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example4SLRMultiple.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
import commonj.sdo.Type;
public class Example4SLRMultiple implements SchemaLocationResolver {
+ @Override
public String resolveSchemaLocation(Type sourceType, Type referencedType) {
if(referencedType.getURI().contains("commonj.sdo")) {
return null;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example5SLR.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example5SLR.java
index 7e421bb..31e9068 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example5SLR.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/helper/xsdhelper/generate/slr/Example5SLR.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
import commonj.sdo.Type;
public class Example5SLR implements SchemaLocationResolver {
+ @Override
public String resolveSchemaLocation(Type sourceType, Type referencedType) {
if(referencedType.getURI().contains("commonj.sdo")) {
return null;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/instanceclass/CustomerClassWithCorrectGetters.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/instanceclass/CustomerClassWithCorrectGetters.java
index 5873dee..18c3dcb 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/instanceclass/CustomerClassWithCorrectGetters.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/instanceclass/CustomerClassWithCorrectGetters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,26 +22,32 @@
private Address address;
private List phoneNumber;
+ @Override
public String getName() {
return this.name;
}
+ @Override
public void setName(String name) {
this.name = name;
}
+ @Override
public Address getAddress() {
return this.address;
}
+ @Override
public void setAddress(Address address) {
this.address = address;
}
+ @Override
public List getPhoneNumber() {
return this.phoneNumber;
}
+ @Override
public void setPhoneNumber(List phoneNumber) {
this.phoneNumber = phoneNumber;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/SDOModelTestSuite.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/SDOModelTestSuite.java
index 4444bc3..f5590ab 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/SDOModelTestSuite.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/SDOModelTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,9 +40,9 @@
*/
public static Test suite() {
TestSuite suite = new TestSuite("All Helper Tests");
- suite.addTest(new SDODataObjectTestSuite().suite());
- suite.addTest(new SDOTypeTestSuite().suite());
- suite.addTest(new SDODataGraphTestSuite().suite());
+ suite.addTest(SDODataObjectTestSuite.suite());
+ suite.addTest(SDOTypeTestSuite.suite());
+ suite.addTest(SDODataGraphTestSuite.suite());
return suite;
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBeginLoggingEndLoggingCombiningTests.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBeginLoggingEndLoggingCombiningTests.java
index d3da9c6..f66327b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBeginLoggingEndLoggingCombiningTests.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBeginLoggingEndLoggingCombiningTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,8 +30,8 @@
// verify recursive delete sets isSet properly
public void testBehaviorsAfterLoginThenLogoff() {
buildTree();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
- changeSummaryC = (SDOChangeSummary)dataObjectC.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
+ changeSummaryC = dataObjectC.getChangeSummary();
// two ChangeSummary logon now.
changeSummaryB.beginLogging();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBeginLoggingEndLoggingIsLoggingTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBeginLoggingEndLoggingIsLoggingTest.java
index 77fa258..af2e9e7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBeginLoggingEndLoggingIsLoggingTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBeginLoggingEndLoggingIsLoggingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,19 +48,19 @@
* changeSummary counterparts and may not directly return the actual instance variable
* when not in deleted | modified state
*/
- SDODataObject anOldContainer = (SDODataObject)((SDOChangeSummary)o.getChangeSummary()).getOldContainer(o);
- SDODataObject aContainer = (SDODataObject)o.getContainer();
+ SDODataObject anOldContainer = o.getChangeSummary().getOldContainer(o);
+ SDODataObject aContainer = o.getContainer();
if (o.getChangeSummary().isModified(o) || o.getChangeSummary().isDeleted(o)) {
assertEquals(anOldContainer, aContainer);
if (aContainer != null) {
Property pp = o.getContainer().getInstanceProperty(o._getContainmentPropertyName());
- assertEquals(((SDOChangeSummary)o.getChangeSummary()).getOldContainmentProperty(o), pp);
+ assertEquals(o.getChangeSummary().getOldContainmentProperty(o), pp);
}
}
- assertNotNull(((SDOChangeSummary)o.getChangeSummary()).getOldValues(o));
- assertTrue(((SDOChangeSummary)o.getChangeSummary()).getOldValues(o).isEmpty());
+ assertNotNull(o.getChangeSummary().getOldValues(o));
+ assertTrue(o.getChangeSummary().getOldValues(o).isEmpty());
List properties = o.getInstanceProperties();
Iterator iterProperties = properties.iterator();
while (iterProperties.hasNext()) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBug6599313TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBug6599313TestCases.java
index cb768bb..b99c44c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBug6599313TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryBug6599313TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderDeepWithCS.xml");
}
+ @Override
public void setUp() {
super.setUp();
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCopyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCopyTestCases.java
index 1fcefa3..8b9cc4b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCopyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCopyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
private DataObject dataObjectD;
private DataObject dataObjectE;
+ @Override
public void setUp() {
super.setUp();
DataObject rootTypeDO = defineType(URINAME, TYPENAME);
@@ -65,14 +66,15 @@
// String types are containment == false
SDOProperty propertyE = setUpProperty("propertyE", false, SDOConstants.SDO_STRING, type_E);
- root = (SDODataObject)dataFactory.create(rootType);
- dataObjectB = (SDODataObject)root.createDataObject(rootContainingPropertyB, type_B);
- dataObjectD = (SDODataObject)dataObjectB.createDataObject(propertyB, type_D);
- dataObjectE = (SDODataObject)dataObjectD.createDataObject(propertyD, type_E);
+ root = dataFactory.create(rootType);
+ dataObjectB = root.createDataObject(rootContainingPropertyB, type_B);
+ dataObjectD = dataObjectB.createDataObject(propertyB, type_D);
+ dataObjectE = dataObjectD.createDataObject(propertyD, type_E);
dataObjectB.getChangeSummary().beginLogging();
}
+ @Override
public void tearDown() {
dataObjectB.getChangeSummary().beginLogging();
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCreatedModifiedDeletedTestCase.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCreatedModifiedDeletedTestCase.java
index 4bb327e..a70f6e0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCreatedModifiedDeletedTestCase.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCreatedModifiedDeletedTestCase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -62,6 +62,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp(); // watch setup redundancy
DataObject rootTypeDO = defineType(URINAME, TYPENAME);
@@ -117,9 +118,9 @@
propertyD = setUpProperty("propertyD", false, SDOConstants.SDO_STRING, type_D);
root = (SDODataObject)dataFactory.create(rootType);
- dataObjectB = (SDODataObject)root.createDataObject(rootContainingPropertyB, type_B);
- dataObjectC = (SDODataObject)root.createDataObject(rootContainingPropertyC, type_C);
- dataObjectD = (SDODataObject)dataObjectB.createDataObject(propertyB, type_D);
+ dataObjectB = root.createDataObject(rootContainingPropertyB, type_B);
+ dataObjectC = root.createDataObject(rootContainingPropertyC, type_C);
+ dataObjectD = dataObjectB.createDataObject(propertyB, type_D);
}
protected void checkOldSettingsSizeTree(String values, SDOChangeSummary aCS,//
@@ -135,10 +136,10 @@
SDODataObject aDO2, Object anObject2,//
SDODataObject aDO3, Object anObject3,//
SDODataObject aDO4, Object anObject4) {
- assertEquals(anObject1, (SDODataObject)aCS.getOldContainer(aDO1));
- assertEquals(anObject2, (SDODataObject)aCS.getOldContainer(aDO2));
- assertEquals(anObject3, (SDODataObject)aCS.getOldContainer(aDO3));
- assertEquals(anObject4, (SDODataObject)aCS.getOldContainer(aDO4));
+ assertEquals(anObject1, aCS.getOldContainer(aDO1));
+ assertEquals(anObject2, aCS.getOldContainer(aDO2));
+ assertEquals(anObject3, aCS.getOldContainer(aDO3));
+ assertEquals(anObject4, aCS.getOldContainer(aDO4));
}
/*
@@ -177,10 +178,10 @@
propertyE = setUpProperty("propertyE", false, SDOConstants.SDO_STRING, type_E);
root = (SDODataObject)dataFactory.create(rootType);
- dataObjectB = (SDODataObject)root.createDataObject(rootContainingPropertyB, type_B);
- dataObjectC = (SDODataObject)root.createDataObject(rootContainingPropertyC, type_C);
- dataObjectD = (SDODataObject)dataObjectB.createDataObject(propertyB, type_D);
- dataObjectE = (SDODataObject)dataObjectD.createDataObject(propertyD, type_E);
+ dataObjectB = root.createDataObject(rootContainingPropertyB, type_B);
+ dataObjectC = root.createDataObject(rootContainingPropertyC, type_C);
+ dataObjectD = dataObjectB.createDataObject(propertyB, type_D);
+ dataObjectE = dataObjectD.createDataObject(propertyD, type_E);
}
@@ -201,7 +202,7 @@
aDO2, anObject2,//
aDO3, anObject3,//
aDO4, anObject4);
- assertEquals(anObject5, (SDODataObject)aCS.getOldContainer(aDO5));
+ assertEquals(anObject5, aCS.getOldContainer(aDO5));
}
protected void buildTreeWithoutChildChangeSummaries() {
@@ -220,9 +221,9 @@
type_D = (SDOType)typeHelper.define(type_DDO);
propertyD = setUpProperty("propertyD", false, SDOConstants.SDO_STRING, type_D);
- dataObjectB = (SDODataObject)root.createDataObject(rootContainingPropertyB, type_B);
- dataObjectC = (SDODataObject)root.createDataObject(rootContainingPropertyC, type_C);
- dataObjectD = (SDODataObject)dataObjectB.createDataObject(propertyB, type_D);
+ dataObjectB = root.createDataObject(rootContainingPropertyB, type_B);
+ dataObjectC = root.createDataObject(rootContainingPropertyC, type_C);
+ dataObjectD = dataObjectB.createDataObject(propertyB, type_D);
}
protected void buildTreeWithoutChangeSummary() {
@@ -238,7 +239,7 @@
type_F = (SDOType)typeHelper.define(type_FDO);
p_F = setUpProperty("p_F", false, SDOConstants.SDO_STRING, type_F);
- dataObjectF = (SDODataObject)root1.createDataObject(p_root1, type_F);
+ dataObjectF = root1.createDataObject(p_root1, type_F);
dataObjectF.set(p_F, "test");
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCreatedModifiedDeletedTests.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCreatedModifiedDeletedTests.java
index 5651dbb..d2722df 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCreatedModifiedDeletedTests.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryCreatedModifiedDeletedTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -39,8 +39,8 @@
// Failure condition test cases
public void testGetFunctionsWithNullParameters() {
buildTree();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
- changeSummaryC = (SDOChangeSummary)dataObjectC.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
+ changeSummaryC = dataObjectC.getChangeSummary();
changeSummaryB.beginLogging();
changeSummaryC.beginLogging();
@@ -82,7 +82,7 @@
rootType.addDeclaredProperty(rootChangeSummaryProperty);
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
buildTreeWithoutChildChangeSummaries();
@@ -138,8 +138,8 @@
public void testIsCreatedAfterMoveDataObjectFromOneOwnerToAnotherDiffChangeSummary() {
buildTree();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
- changeSummaryC = (SDOChangeSummary)dataObjectC.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
+ changeSummaryC = dataObjectC.getChangeSummary();
changeSummaryB.beginLogging();
changeSummaryC.beginLogging();
@@ -190,7 +190,7 @@
// verify recursive delete sets isSet properly
public void testOldSettingsAfterInternalDeleteOfLevel2of4AfterLoggingOn() {
buildTreeWith4LevelsOfProperties();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
changeSummaryB.beginLogging();
assertNotNull(dataObjectD.getChangeSummary());
@@ -224,8 +224,8 @@
//public void testOldSettingsAfterMoveCSDataObjectFromOneOwnerToAnotherDiffChangeSummary() {
public void testDetachCSRoot() {
buildTree();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
- changeSummaryC = (SDOChangeSummary)dataObjectC.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
+ changeSummaryC = dataObjectC.getChangeSummary();
changeSummaryB.beginLogging();
changeSummaryC.beginLogging();
@@ -310,8 +310,8 @@
public void testDeleteCSRoot() {
buildTree();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
- changeSummaryC = (SDOChangeSummary)dataObjectC.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
+ changeSummaryC = dataObjectC.getChangeSummary();
changeSummaryB.beginLogging();
changeSummaryC.beginLogging();
@@ -393,8 +393,8 @@
// perform a move of a cs root (delete CCB) to another cs as child and observe the old* instance variables
public void testOldSettingsAfterMoveCSDataObjectFromOneOwnerToAnotherDiffChangeSummaryByUnset() {
buildTree();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
- changeSummaryC = (SDOChangeSummary)dataObjectC.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
+ changeSummaryC = dataObjectC.getChangeSummary();
changeSummaryB.beginLogging();
changeSummaryC.beginLogging();
@@ -517,8 +517,8 @@
// perform a move between changeSummaries and observe the old* instance variables
public void testOldSettingsAfterMoveDataObjectFromOneOwnerToAnotherDiffChangeSummary() {
buildTree();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
- changeSummaryC = (SDOChangeSummary)dataObjectC.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
+ changeSummaryC = dataObjectC.getChangeSummary();
changeSummaryB.beginLogging();
changeSummaryC.beginLogging();
@@ -640,7 +640,7 @@
public void testIsCreatedAfterUseDataFactory() {
rootType.addDeclaredProperty(rootChangeSummaryProperty);
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
buildTreeWithoutChildChangeSummaries();
@@ -667,7 +667,7 @@
public void testUnsetChildOfCS() {
rootType.addDeclaredProperty(rootChangeSummaryProperty);
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
buildTreeWithoutChildChangeSummaries();
changeSummaryA.beginLogging();
@@ -690,7 +690,7 @@
public void testIsCreatedAfterUseUnset() {
rootType.addDeclaredProperty(rootChangeSummaryProperty);
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
buildTreeWithoutChildChangeSummaries();
changeSummaryA.beginLogging();
@@ -712,11 +712,11 @@
public void testIsCreatedAfterUnSetDiffChangeSummary() {
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
assertNull(changeSummaryA);
buildTree();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
- changeSummaryC = (SDOChangeSummary)dataObjectC.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
+ changeSummaryC = dataObjectC.getChangeSummary();
changeSummaryB.beginLogging();
changeSummaryC.beginLogging();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryGetOldContainerContainmentPropertyTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryGetOldContainerContainmentPropertyTest.java
index 507bf28..3fb8f27 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryGetOldContainerContainmentPropertyTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryGetOldContainerContainmentPropertyTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.model.changesummary;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -31,46 +32,46 @@
// purpose: test if containedObject's container is changed, changesummary can still
// return the former container
public void testContainerValueAfterDataObjectChangeContainer() {
- SDODataObject container = (SDODataObject)containedDataObject.getContainer();
+ SDODataObject container = containedDataObject.getContainer();
changeSummary.beginLogging();
SDODataObject o = null;
root.set(rootProperty, o);
- this.assertNull(containedDataObject.getContainer());
- this.assertEquals(root, changeSummary.getOldContainer(containedDataObject));
+ assertNull(containedDataObject.getContainer());
+ assertEquals(root, changeSummary.getOldContainer(containedDataObject));
}
// purpose: test null value as parameter
public void testContainerValueByPassingNull() {
- this.assertNull(changeSummary.getOldContainer(null));
+ assertNull(changeSummary.getOldContainer(null));
}
// purpose: test pass in dataobjec not in the tree as parameter
public void testContainerValueByPassingNotExistedDataObject() {
SDODataObject obj = new SDODataObject();
- this.assertNull(changeSummary.getOldContainer(obj));
+ assertNull(changeSummary.getOldContainer(obj));
}
// purpose: test if containedObject's containment property is changed, changesummary can still
// return the former value back
public void testContainmentPropertyValueAfterDataObjectChangeValue() {
- SDOProperty containmentProperty = (SDOProperty)containedDataObject.getContainmentProperty();
+ SDOProperty containmentProperty = containedDataObject.getContainmentProperty();
changeSummary.beginLogging();
- this.assertTrue(rootProperty.equals(containedDataObject.getContainmentProperty()));// it is the same before modified
+ assertTrue(rootProperty.equals(containedDataObject.getContainmentProperty()));// it is the same before modified
Object o = null;
root.set(rootProperty, o);
- this.assertFalse(rootProperty.equals(containedDataObject.getContainmentProperty()));// current container in root's child should be changed
- this.assertEquals(containmentProperty, changeSummary.getOldContainmentProperty(containedDataObject));
+ assertFalse(rootProperty.equals(containedDataObject.getContainmentProperty()));// current container in root's child should be changed
+ assertEquals(containmentProperty, changeSummary.getOldContainmentProperty(containedDataObject));
}
// purpose: test null value as parameter
public void testContainmentPropertyByPassingNull() {
SDODataObject o = null;
- this.assertNull(changeSummary.getOldContainmentProperty(o));
+ assertNull(changeSummary.getOldContainmentProperty(o));
}
// purpose: test pass in dataobjec not in the tree as parameter
public void testContainmentPropertyByPassingNotExistedDataObject() {
SDODataObject obj = new SDODataObject();
- this.assertNull(changeSummary.getOldContainmentProperty(obj));
+ assertNull(changeSummary.getOldContainmentProperty(obj));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryGetOldValueTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryGetOldValueTest.java
index dbbf7a4..7c9fcfe 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryGetOldValueTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryGetOldValueTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,8 @@
import commonj.sdo.Property;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -47,8 +49,8 @@
assertNotNull(oldValues);
assertEquals(0, oldValues.size());
root.set(rootProperty1, "test");
- this.assertNull(changeSummary.getOldValue(root, rootProperty));// no old value for this unmodified property
- this.assertNull(changeSummary.getOldValue(root, rootProperty1).getValue());// old value has value null for this modified property
+ assertNull(changeSummary.getOldValue(root, rootProperty));// no old value for this unmodified property
+ assertNull(changeSummary.getOldValue(root, rootProperty1).getValue());// old value has value null for this modified property
}
// purpose: modified DataObject and nonmodified property, get(DataObject, Property)
@@ -173,15 +175,15 @@
changeSummary.beginLogging();
root.set(rootProperty1, "test2");
root.set(rootProperty1, "test3");
- this.assertNull(changeSummary.getOldValue(root, rootProperty));// no old value for this unmodified property
+ assertNull(changeSummary.getOldValue(root, rootProperty));// no old value for this unmodified property
ChangeSummary.Setting setting = changeSummary.getOldValue(root, rootProperty1);
- this.assertEquals("test", setting.getValue());// specific original old value for this modified property
+ assertEquals("test", setting.getValue());// specific original old value for this modified property
}
// purpose: unmodified DataObject
public void testGetOldValueReturnSettingWithUnmodifiedDataObject() {
changeSummary.beginLogging();
- this.assertNull(changeSummary.getOldValue(root, rootProperty));// no old setting for this unmodified dataobject
+ assertNull(changeSummary.getOldValue(root, rootProperty));// no old setting for this unmodified dataobject
}
// purpose: modified DataObject's modified property
@@ -193,13 +195,13 @@
Object o = changeSummary.getOldValue(root, rootProperty).getValue();
Object deepCopy = changeSummary.getDeepCopies().get(containedDataObject);
- this.assertEquals(deepCopy, o);
+ assertEquals(deepCopy, o);
}
// purpose: unmodified DataObject
public void testGetOldValueReturnListWithUnmodifiedProperty() {
changeSummary.beginLogging();
- this.assertTrue(0 == changeSummary.getOldValues(root).size());
+ assertTrue(0 == changeSummary.getOldValues(root).size());
}
// purpose: modified DataObject
@@ -210,9 +212,9 @@
root.set(rootProperty, p);
Object o = changeSummary.getOldValue(root, rootProperty).getValue();
List l = changeSummary.getOldValues(root);
- this.assertTrue(1 == l.size());
+ assertTrue(1 == l.size());
Object deepCopy = changeSummary.getDeepCopies().get(containedDataObject);
- this.assertEquals(deepCopy, (SDODataObject)((ChangeSummary.Setting)l.get(0)).getValue());
+ assertEquals(deepCopy, ((ChangeSummary.Setting)l.get(0)).getValue());
}
// purpose: test an open content property's value can be recorded in old setting list
@@ -231,7 +233,7 @@
changeSummary.beginLogging();
root.set(openRootProperty, "openTest1");
ChangeSummary.Setting setting = changeSummary.getOldValue(root, openRootProperty);
- this.assertEquals("openTest", setting.getValue());
+ assertEquals("openTest", setting.getValue());
}
// purpose: after a dataobject detach itself, check the changed dataobject lists
@@ -239,8 +241,8 @@
containedDataObject.set("containedProperty", "aaa");
changeSummary.beginLogging();
containedDataObject.detach();
- this.assertTrue(changeSummary.isModified(root));
- this.assertTrue(changeSummary.isDeleted(containedDataObject));
+ assertTrue(changeSummary.isModified(root));
+ assertTrue(changeSummary.isDeleted(containedDataObject));
//TODO: is this the right check?
//List rootOldValues = changeSummary.getOldValues(root);
@@ -254,12 +256,12 @@
containedDataObject.set("containedProperty", "aaa");
changeSummary.beginLogging();
containedDataObject.delete();
- this.assertTrue(changeSummary.isModified(root));
- this.assertTrue(changeSummary.isDeleted(containedDataObject));
+ assertTrue(changeSummary.isModified(root));
+ assertTrue(changeSummary.isDeleted(containedDataObject));
List rootOldValues = changeSummary.getOldValues(root);
List containedOldValues = changeSummary.getOldValues(containedDataObject);
- this.assertEquals(1, rootOldValues.size());
- this.assertEquals(1, containedOldValues.size());
+ assertEquals(1, rootOldValues.size());
+ assertEquals(1, containedOldValues.size());
}
// test open content detach
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryInitalizedInCreatingDataObjectTests.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryInitalizedInCreatingDataObjectTests.java
index 35e5ed2..f9f6c0e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryInitalizedInCreatingDataObjectTests.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryInitalizedInCreatingDataObjectTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,6 +15,7 @@
package org.eclipse.persistence.testing.sdo.model.changesummary;
import commonj.sdo.DataObject;
+import junit.framework.TestCase;
public class ChangeSummaryInitalizedInCreatingDataObjectTests extends ChangeSummaryTestCases {
public ChangeSummaryInitalizedInCreatingDataObjectTests(String name) {
@@ -23,46 +24,46 @@
public void testInitalizeChangedDataObjectListAfterLogging() {
changeSummary.beginLogging();
- this.assertTrue(changeSummary.getChangedDataObjects().isEmpty());
+ assertTrue(changeSummary.getChangedDataObjects().isEmpty());
}
public void testChangedDataObjectsAfterModifyLogging() {
changeSummary.beginLogging();
root.set(rootProperty, null);
- this.assertFalse(changeSummary.getChangedDataObjects().isEmpty());
- this.assertEquals(2, changeSummary.getChangedDataObjects().size());
- this.assertTrue(changeSummary.getChangedDataObjects().contains(containedDataObject));
- this.assertTrue(changeSummary.getChangedDataObjects().contains(root));
+ assertFalse(changeSummary.getChangedDataObjects().isEmpty());
+ assertEquals(2, changeSummary.getChangedDataObjects().size());
+ assertTrue(changeSummary.getChangedDataObjects().contains(containedDataObject));
+ assertTrue(changeSummary.getChangedDataObjects().contains(root));
}
public void testChangedDataObjectsAfterCreatNewdataObjectLogging() {
changeSummary.beginLogging();
- this.assertTrue(changeSummary.getChangedDataObjects().isEmpty());
+ assertTrue(changeSummary.getChangedDataObjects().isEmpty());
DataObject o = root.createDataObject(rootProperty);
- this.assertFalse(changeSummary.getChangedDataObjects().isEmpty());
- this.assertTrue(changeSummary.getChangedDataObjects().contains(o));
+ assertFalse(changeSummary.getChangedDataObjects().isEmpty());
+ assertTrue(changeSummary.getChangedDataObjects().contains(o));
}
public void testCahngedDataObjectAfterDeleteLogging() {
changeSummary.beginLogging();
- this.assertTrue(changeSummary.getChangedDataObjects().isEmpty());
+ assertTrue(changeSummary.getChangedDataObjects().isEmpty());
containedDataObject.delete();
- this.assertFalse(changeSummary.getChangedDataObjects().isEmpty());
- this.assertTrue(changeSummary.getChangedDataObjects().contains(containedDataObject));
+ assertFalse(changeSummary.getChangedDataObjects().isEmpty());
+ assertTrue(changeSummary.getChangedDataObjects().contains(containedDataObject));
}
public void testChangedDataObjectAfterDetachLogging() {
changeSummary.beginLogging();
- this.assertTrue(changeSummary.getChangedDataObjects().isEmpty());
+ assertTrue(changeSummary.getChangedDataObjects().isEmpty());
DataObject oldContainer = containedDataObject.getContainer();
containedDataObject.detach();
- this.assertFalse(changeSummary.getChangedDataObjects().isEmpty());
- this.assertEquals(2, changeSummary.getChangedDataObjects().size());
- this.assertTrue(changeSummary.getChangedDataObjects().contains(containedDataObject));
- this.assertTrue(changeSummary.getChangedDataObjects().contains(oldContainer));
+ assertFalse(changeSummary.getChangedDataObjects().isEmpty());
+ assertEquals(2, changeSummary.getChangedDataObjects().size());
+ assertTrue(changeSummary.getChangedDataObjects().contains(containedDataObject));
+ assertTrue(changeSummary.getChangedDataObjects().contains(oldContainer));
}
public void testChangedDataObjectBeforeLogging() {
- this.assertTrue(changeSummary.getChangedDataObjects().isEmpty());
+ assertTrue(changeSummary.getChangedDataObjects().isEmpty());
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryIsCreatedIsDeletedIsModifiedTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryIsCreatedIsDeletedIsModifiedTest.java
index 8c273ba..71866e5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryIsCreatedIsDeletedIsModifiedTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryIsCreatedIsDeletedIsModifiedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.model.changesummary;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -33,7 +34,7 @@
// purpose: after logging, create a new DataObject, then check it with isCreated()
public void testIsCreated() {
changeSummary.beginLogging();
- SDODataObject newObj = (SDODataObject)root.createDataObject(rootProperty);
+ SDODataObject newObj = root.createDataObject(rootProperty);
assertCreated(newObj, changeSummary);
}
@@ -91,7 +92,7 @@
p.setType(SDOConstants.SDO_STRING);
ty.addDeclaredProperty(p);
- o = (SDODataObject)root.createDataObject(rootProperty, ty);
+ o = root.createDataObject(rootProperty, ty);
assertCreated(o, changeSummary);
}
@@ -169,6 +170,6 @@
changeSummary.beginLogging();
//changeSummary.setChangedDataObjectList(null);
changeSummary.endLogging();
- this.assertFalse(changeSummary.isLogging());
+ assertFalse(changeSummary.isLogging());
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryLoadSaveTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryLoadSaveTest.java
index 1c97e2c..c85246d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryLoadSaveTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryLoadSaveTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
public ChangeSummaryLoadSaveTest(String name) {
super(name);
}
+ @Override
public void setUp() {
try {
super.setUp();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryMoveFromNullChangeSummaryToChangeSummaryTests.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryMoveFromNullChangeSummaryToChangeSummaryTests.java
index 0c54ae5..76056b1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryMoveFromNullChangeSummaryToChangeSummaryTests.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryMoveFromNullChangeSummaryToChangeSummaryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,7 +28,7 @@
rootType.addDeclaredProperty(rootChangeSummaryProperty);
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
buildTreeWithoutChildChangeSummaries();
@@ -72,7 +72,7 @@
rootType.addDeclaredProperty(rootChangeSummaryProperty);
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
buildTreeWithoutChildChangeSummaries();
@@ -116,7 +116,7 @@
rootType.addDeclaredProperty(rootChangeSummaryProperty);
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
buildTreeWithoutChildChangeSummaries();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryOnChildTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryOnChildTestCases.java
index ae0f962..dee0a66 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryOnChildTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryOnChildTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -50,18 +50,22 @@
protected ChangeSummary stock3CS2;
public static final String URINAME = "http://www.example.org";
public static final String TYPENAME = "corporation";
+ @Override
protected String getControlRootURI() {
return URINAME;
}
+ @Override
protected String getControlRootName() {
return TYPENAME;
}
+ @Override
protected String getRootInterfaceName() {
return "CorporationType";
}
+ @Override
protected String getControlFileName() {
// implemented by subclass
return getControlFileName2();
@@ -73,6 +77,7 @@
// return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderDeepWithCS.xml");
//}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
//do nothing
//TODO: need to make this test run
@@ -86,6 +91,7 @@
super(name);
}
+ @Override
public String getSchemaName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderDeepWithCSonChild.xsd");
}
@@ -95,6 +101,7 @@
TestRunner.main(arguments);
}
+ @Override
protected List defineTypes() {
List types = xsdHelper.define(getSchema(getSchemaName()));
@@ -153,6 +160,7 @@
return types;
}
+ @Override
protected String getControlString(String fileName) {
try {
FileInputStream inputStream = new FileInputStream(fileName);
@@ -166,6 +174,7 @@
}
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
assertNull(document.getRootObject().getContainer());
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryOnRootTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryOnRootTestCases.java
index 1b0eda3..aaa0c09 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryOnRootTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryOnRootTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,23 +38,28 @@
public static final String URINAME = "http://www.example.org";
public static final String TYPENAME = "purchaseOrder";
+ @Override
protected String getControlRootURI() {
return URINAME;
}
+ @Override
protected String getControlRootName() {
return TYPENAME;
}
+ @Override
protected String getRootInterfaceName() {
return "PurchaseOrderType";
}
+ @Override
protected String getControlFileName() {
// implemented by subclass
return getControlFileName2();
}
+ @Override
public void testClassGenerationLoadAndSave() throws Exception {
//TODO:implement
}
@@ -68,6 +73,7 @@
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderDeepWithCS.xml");
}
+ @Override
public void testNoSchemaLoadFromInputStreamSaveDataObjectToString() throws Exception {
//do nothing
//TODO: need to make this test run
@@ -77,6 +83,7 @@
super(name);
}
+ @Override
public String getSchemaName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderDeepWithCS.xsd");
}
@@ -86,6 +93,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
//define types from deep with cs
@@ -102,6 +110,7 @@
}
}
+ @Override
protected String getControlString(String fileName) {
try {
FileInputStream inputStream = new FileInputStream(fileName);
@@ -115,16 +124,19 @@
}
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
assertNull(document.getRootObject().getContainer());
}
+ @Override
protected List defineTypes() {
// do not define types twice - so we do not set dirty=true
//return xsdHelper.define(getSchema(getSchemaName()));
- return (List)new ArrayList(((SDOTypeHelper)typeHelper).getTypesHashMap().values());
+ return new ArrayList(((SDOTypeHelper)typeHelper).getTypesHashMap().values());
}
+ @Override
protected String getSchemaLocation() {
return "";
}
@@ -1069,7 +1081,7 @@
assertNotNull(shipToDO.get("street"));
DataObject oldContainer = ((SDOChangeSummary)cs).getOldContainer(shipToDO);
Property shipToProp = oldContainer.getInstanceProperty("shipTo");
- ChangeSummary.Setting oldSetting = ((SDOChangeSummary)cs).getOldValue(oldContainer, shipToProp);
+ ChangeSummary.Setting oldSetting = cs.getOldValue(oldContainer, shipToProp);
DataObject deepCopyShipTo = (DataObject)oldSetting.getValue();
assertEquals("123 Maple Street", deepCopyShipTo.get("street"));
@@ -1184,16 +1196,16 @@
Property sfProp = yardDO.getInstanceProperty("squarefootage");
Property widthProp = yardDO.getInstanceProperty("width");
Property lengthProp = yardDO.getInstanceProperty("length");
- ChangeSummary.Setting yardSFsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, sfProp);
+ ChangeSummary.Setting yardSFsetting = cs.getOldValue(yardDO, sfProp);
assertEquals(yardSFsetting.getValue(), null);
//TODO: uncomment this line. Will fail unless Node Null policy stuff is fixed
//assertEquals(false, yardSFsetting.isSet());
- ChangeSummary.Setting yardWidthsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, widthProp);
+ ChangeSummary.Setting yardWidthsetting = cs.getOldValue(yardDO, widthProp);
assertEquals("65", yardWidthsetting.getValue());
assertEquals(true, yardWidthsetting.isSet());
- ChangeSummary.Setting yardLengththsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, lengthProp);
+ ChangeSummary.Setting yardLengththsetting = cs.getOldValue(yardDO, lengthProp);
assertEquals("45", yardLengththsetting.getValue());
assertEquals(true, yardLengththsetting.isSet());
// shipToDO was not deleted, only check yardDO
@@ -1206,16 +1218,16 @@
Property sfProp = yardDO.getInstanceProperty("squarefootage");
Property widthProp = yardDO.getInstanceProperty("width");
Property lengthProp = yardDO.getInstanceProperty("length");
- ChangeSummary.Setting yardSFsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, sfProp);
+ ChangeSummary.Setting yardSFsetting = cs.getOldValue(yardDO, sfProp);
assertEquals(yardSFsetting.getValue(), null);
//TODO: uncomment this line. Will fail unless Node Null policy stuff is fixed
//assertEquals(false, yardSFsetting.isSet());
- ChangeSummary.Setting yardWidthsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, widthProp);
+ ChangeSummary.Setting yardWidthsetting = cs.getOldValue(yardDO, widthProp);
assertEquals("65", yardWidthsetting.getValue());
assertEquals(true, yardWidthsetting.isSet());
- ChangeSummary.Setting yardLengththsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, lengthProp);
+ ChangeSummary.Setting yardLengththsetting = cs.getOldValue(yardDO, lengthProp);
assertEquals("45", yardLengththsetting.getValue());
assertEquals(true, yardLengththsetting.isSet());
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummarySetSameValueAfterLogonTests.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummarySetSameValueAfterLogonTests.java
index 766a1d2..158f0ab 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummarySetSameValueAfterLogonTests.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummarySetSameValueAfterLogonTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,7 +26,7 @@
rootType.addDeclaredProperty(rootChangeSummaryProperty);
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
buildTreeWithoutChildChangeSummaries();
@@ -79,7 +79,7 @@
rootType.addDeclaredProperty(rootChangeSummaryProperty);
root = (SDODataObject)dataFactory.create(rootType);
- changeSummaryA = (SDOChangeSummary)root.getChangeSummary();
+ changeSummaryA = root.getChangeSummary();
buildTreeWithoutChildChangeSummaries();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestCases.java
index afb80b4..3a9c976 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
@@ -73,7 +74,7 @@
root = (SDODataObject)dataFactory.create(rootType);
root.set(rootProperty, containedDataObject);
- changeSummary = (SDOChangeSummary)root.getChangeSummary();
+ changeSummary = root.getChangeSummary();
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryUndoChangeTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryUndoChangeTest.java
index a195952..af3b9d5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryUndoChangeTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryUndoChangeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -66,7 +66,7 @@
assertNotNull(containedDataObject.getChangeSummary());
root.unset(rootProperty);// unset property
// verify CS is null on removed trees
- assertChangeSummaryStatusIfClearedIfCSIsAncestor((DataObject)containedDataObject, true);
+ assertChangeSummaryStatusIfClearedIfCSIsAncestor(containedDataObject, true);
assertNotNull(aCurrentValueStore);
ValueStore anOriginalValueStoreAfterOperation =(ValueStore)changeSummary.getOriginalValueStores().get(root);
@@ -76,7 +76,7 @@
assertTrue(anOriginalValueStoreAfterOperation == aCurrentValueStore);
assertFalse(root.isSet(rootProperty));
- assertNull((SDODataObject)containedDataObject.getContainer());// make sure it is changed
+ assertNull(containedDataObject.getContainer());// make sure it is changed
// undo and verify equality
assertUndoChangesEqualToOriginal(changeSummary, root, original);
@@ -109,7 +109,7 @@
// operation on complex child of root
aChild.detach();
// verify CS is null on removed trees
- assertChangeSummaryStatusIfClearedIfCSIsAncestor((DataObject)aChild, true);
+ assertChangeSummaryStatusIfClearedIfCSIsAncestor(aChild, true);
assertNotNull(aCurrentValueStore);
@@ -120,7 +120,7 @@
assertTrue(anOriginalValueStoreAfterOperation == aCurrentValueStore);
assertFalse(root.isSet(rootProperty));
- assertNull((SDODataObject)containedDataObject.getContainer());// make sure it is changed
+ assertNull(containedDataObject.getContainer());// make sure it is changed
// undo and verify equality
assertUndoChangesEqualToOriginal(changeSummary, root, original);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryVolumetricsTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryVolumetricsTest.java
index 8188c12..d2315ca 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryVolumetricsTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryVolumetricsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -79,8 +79,8 @@
// perform a move of a cs root (delete CCB) to another cs as child and observe the old* instance variables
public void testOldSettingsAfterMoveCSDeepDataObjectFromOneOwnerToAnotherDiffChangeSummary() {
buildDeepTree();
- changeSummaryB = (SDOChangeSummary)dataObjectB.getChangeSummary();
- changeSummaryC = (SDOChangeSummary)dataObjectC.getChangeSummary();
+ changeSummaryB = dataObjectB.getChangeSummary();
+ changeSummaryC = dataObjectC.getChangeSummary();
changeSummaryB.beginLogging();
changeSummaryC.beginLogging();
@@ -97,6 +97,7 @@
}
}
+ @Override
public void setUp() {
super.setUp();
SDOType changeSummaryType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY);
@@ -153,8 +154,8 @@
propertyB_children = new SDOProperty[NUM_B_LEVELS];
dataObjectB_children = new SDODataObject[NUM_B_LEVELS];
- dataObjectB = (SDODataObject)root.createDataObject(rootContainingPropertyB, type_B);
- dataObjectC = (SDODataObject)root.createDataObject(rootContainingPropertyC, type_C);
+ dataObjectB = root.createDataObject(rootContainingPropertyB, type_B);
+ dataObjectC = root.createDataObject(rootContainingPropertyC, type_C);
// setup object array
for (int i = 0; i < NUM_B_LEVELS; i++) {
@@ -166,10 +167,10 @@
propertyB_children[i] = (SDOProperty)typeB_children[i].getDeclaredPropertiesMap().get("propertyD" + String.valueOf(i));
}
- dataObjectB_children[0] = (SDODataObject)dataObjectB.createDataObject(propertyB, typeB_children[0]);
+ dataObjectB_children[0] = dataObjectB.createDataObject(propertyB, typeB_children[0]);
for (int i = 1; i < NUM_B_LEVELS; i++) {
- dataObjectB_children[i] = (SDODataObject)dataObjectB_children[i - 1].createDataObject(propertyB_children[i - 1], typeB_children[i]);
+ dataObjectB_children[i] = dataObjectB_children[i - 1].createDataObject(propertyB_children[i - 1], typeB_children[i]);
}
//dataObjectD = (SDODataObject)dataObjectB.createDataObject(propertyB, type_D);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDQuoteDataTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDQuoteDataTestCases.java
index aac7c58..68d3fab 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDQuoteDataTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDQuoteDataTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDTestCases.java
index 8a9aa77..ff94812 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -74,6 +74,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
//define types from deep with cs
@@ -257,7 +258,7 @@
assertFalse(phone2o._getCurrentValueStore() == phone2c._getCurrentValueStore());
// check new phone copy (in oldSettings) is == to currentValueStore phone (both are the same deepcopies of the original)
- List createdListCopy = (List)((SDOChangeSummary)cs2).getCreated();
+ List createdListCopy = ((SDOChangeSummary)cs2).getCreated();
assertNotNull(createdListCopy);
assertEquals(1, createdListCopy.size());
SDODataObject phone2cInCreatedList = (SDODataObject)createdListCopy.get(0);
@@ -280,9 +281,9 @@
// assume that for logging=true copies we should have oldContainer, oldContProperties
assertEquals(6, numberOfDataObjectsInSubTree);// 16 - 10
assertEquals(((SDOChangeSummary)cs).getOldContainer().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainer().size());
+ copy.getChangeSummary().getOldContainer().size());
assertEquals(((SDOChangeSummary)cs).getOldContainmentProperty().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainmentProperty().size());
+ copy.getChangeSummary().getOldContainmentProperty().size());
// no oldSetting for simple object
@@ -577,14 +578,14 @@
// deleted objects are 9
// verify that we have transferred the logged changes during the copy (we dont have to worry about nested changesummaries)
assertEquals(changedObjectsLength, cs2.getChangedDataObjects().size());
- preOrderList = preOrderTraversalDataObjectList((SDODataObject)copy, false);
+ preOrderList = preOrderTraversalDataObjectList(copy, false);
numberOfDataObjectsInSubTree = preOrderList.size();
// assume that for logging=true copies we should have oldContainer, oldContProperties
assertEquals(6, numberOfDataObjectsInSubTree);// 16 - 10
assertEquals(((SDOChangeSummary)cs).getOldContainer().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainer().size());
+ copy.getChangeSummary().getOldContainer().size());
assertEquals(((SDOChangeSummary)cs).getOldContainmentProperty().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainmentProperty().size());
+ copy.getChangeSummary().getOldContainmentProperty().size());
// no oldSetting for simple object
@@ -822,7 +823,7 @@
assertFalse(phone2o._getCurrentValueStore() == phone2c._getCurrentValueStore());
// check new phone copy (in oldSettings) is == to currentValueStore phone (both are the same deepcopies of the original)
- List createdListCopy = (List)((SDOChangeSummary)cs2).getCreated();
+ List createdListCopy = ((SDOChangeSummary)cs2).getCreated();
assertNotNull(createdListCopy);
assertEquals(1, createdListCopy.size());
SDODataObject phone2cInCreatedList = (SDODataObject)createdListCopy.get(0);
@@ -845,9 +846,9 @@
// assume that for logging=true copies we should have oldContainer, oldContProperties
assertEquals(6, numberOfDataObjectsInSubTree);// 16 - 10
assertEquals(((SDOChangeSummary)cs).getOldContainer().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainer().size());
+ copy.getChangeSummary().getOldContainer().size());
assertEquals(((SDOChangeSummary)cs).getOldContainmentProperty().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainmentProperty().size());
+ copy.getChangeSummary().getOldContainmentProperty().size());
// no oldSetting for simple object
@@ -1300,9 +1301,9 @@
// assume that for logging=true copies we should have oldContainer, oldContProperties
assertEquals(15, numberOfDataObjectsInSubTree);
assertEquals(((SDOChangeSummary)cs2).getOldContainer().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainer().size());
+ copy.getChangeSummary().getOldContainer().size());
assertEquals(((SDOChangeSummary)cs2).getOldContainmentProperty().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainmentProperty().size());
+ copy.getChangeSummary().getOldContainmentProperty().size());
return copy;
}
@@ -2048,9 +2049,9 @@
assertEquals(3, cs.getChangedDataObjects().size());
assertEquals(18, ((SDOChangeSummary)cs).getOldContainer().size());// 14 + 4 new objects
assertEquals(18, ((SDOChangeSummary)cs).getOldContainmentProperty().size());// 14 + 4 new objects
- assertEquals(1, ((SDOChangeSummary)cs).getOldValues(itemsDO).size());// from 2 (only 1st change on items is recorded)
- assertEquals(5, ((SDOChangeSummary)cs).getOldValues(item3DO).size());// 1
- assertEquals(5, ((SDOChangeSummary)cs).getOldValues(item5DO).size());// 1
+ assertEquals(1, cs.getOldValues(itemsDO).size());// from 2 (only 1st change on items is recorded)
+ assertEquals(5, cs.getOldValues(item3DO).size());// 1
+ assertEquals(5, cs.getOldValues(item5DO).size());// 1
List aSettingList = cs.getOldValues(itemsDO);
assertTrue(aSettingList.size() > 0);
ChangeSummary.Setting containmentSetting = (ChangeSummary.Setting)aSettingList.get(0);
@@ -2144,7 +2145,7 @@
DataObject yardDO = shipToDO.getDataObject("yard");
cs.beginLogging();
yardDO.detach();
- assertTrue(((SDOChangeSummary)cs).isDeleted(yardDO));
+ assertTrue(cs.isDeleted(yardDO));
billToDO.set("yard", yardDO);
assertModified(shipToDO, cs);
@@ -2397,7 +2398,7 @@
}
DataObject oldContainer = ((SDOChangeSummary)cs).getOldContainer(shipToDO);
Property shipToProp = oldContainer.getInstanceProperty("shipTo");
- ChangeSummary.Setting oldSetting = ((SDOChangeSummary)cs).getOldValue(oldContainer, shipToProp);
+ ChangeSummary.Setting oldSetting = cs.getOldValue(oldContainer, shipToProp);
DataObject deepCopyShipTo = (DataObject)oldSetting.getValue();
assertEquals("123 Maple Street", deepCopyShipTo.get("street"));
@@ -2451,7 +2452,7 @@
assertNull(shipToDO.get("street"));
DataObject oldContainer = ((SDOChangeSummary)cs).getOldContainer(shipToDO);
Property shipToProp = oldContainer.getInstanceProperty("shipTo");
- ChangeSummary.Setting oldSetting = ((SDOChangeSummary)cs).getOldValue(oldContainer, shipToProp);
+ ChangeSummary.Setting oldSetting = cs.getOldValue(oldContainer, shipToProp);
DataObject deepCopyShipTo = (DataObject)oldSetting.getValue();
assertEquals("123 Maple Street", deepCopyShipTo.get("street"));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleAtRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleAtRootTest.java
index f1cbd12..d7a0a68 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleAtRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleAtRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,14 +48,17 @@
*/
// delete sales/po[1]/items/item[1]
public class ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleAtRootTest extends ChangeSummaryOnChildTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/CorporationWithCSonChildDeleteChainToComplexSingleAtRoot.xml");
}
+ @Override
protected String getNoSchemaControlFileName(){
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/CorporationWithCSonChildDeleteChainToComplexSingleAtRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -69,6 +72,7 @@
TestRunner.main(arguments);
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleBelowRootTest.java
index 525bfd6..2885b2a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,10 +48,12 @@
*/
// delete sales/po[1]/items/item[1]
public class ChangeSummaryXSDWithCSonChildDeleteChainToComplexSingleBelowRootTest extends ChangeSummaryOnChildTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/CorporationWithCSonChildDeleteChainToComplexSingleBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -65,10 +67,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteComplexSingleBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteComplexSingleBelowRootTest.java
index 0a48373..0839d16 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteComplexSingleBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDeleteComplexSingleBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,10 +45,12 @@
*/
// delete sales/po[1]/items/item[1]
public class ChangeSummaryXSDWithCSonChildDeleteComplexSingleBelowRootTest extends ChangeSummaryOnChildTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/CorporationWithCSonChildDeleteComplexSingleBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -62,10 +64,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDetachComplexSingleBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDetachComplexSingleBelowRootTest.java
index 60ca03f..8cddf38 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDetachComplexSingleBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildDetachComplexSingleBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,10 +45,12 @@
*/
// delete sales/po[1]/items/item[1]
public class ChangeSummaryXSDWithCSonChildDetachComplexSingleBelowRootTest extends ChangeSummaryOnChildTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/CorporationWithCSonChildDetachComplexSingleBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -62,10 +64,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildProject.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildProject.java
index 95eb90b..7743c6b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildProject.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,6 +58,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
//define types from deep with cs
@@ -147,16 +148,16 @@
Property sfProp = yardDO.getInstanceProperty("squarefootage");
Property widthProp = yardDO.getInstanceProperty("width");
Property lengthProp = yardDO.getInstanceProperty("length");
- ChangeSummary.Setting yardSFsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, sfProp);
+ ChangeSummary.Setting yardSFsetting = cs.getOldValue(yardDO, sfProp);
assertEquals(yardSFsetting.getValue(), null);
//TODO: uncomment this line. Will fail unless Node Null policy stuff is fixed
//assertEquals(false, yardSFsetting.isSet());
- ChangeSummary.Setting yardWidthsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, widthProp);
+ ChangeSummary.Setting yardWidthsetting = cs.getOldValue(yardDO, widthProp);
assertEquals("65", yardWidthsetting.getValue());
assertEquals(true, yardWidthsetting.isSet());
- ChangeSummary.Setting yardLengththsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, lengthProp);
+ ChangeSummary.Setting yardLengththsetting = cs.getOldValue(yardDO, lengthProp);
assertEquals("45", yardLengththsetting.getValue());
assertEquals(true, yardLengththsetting.isSet());
@@ -170,16 +171,16 @@
Property sfProp = yardDO.getInstanceProperty("squarefootage");
Property widthProp = yardDO.getInstanceProperty("width");
Property lengthProp = yardDO.getInstanceProperty("length");
- ChangeSummary.Setting yardSFsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, sfProp);
+ ChangeSummary.Setting yardSFsetting = cs.getOldValue(yardDO, sfProp);
assertEquals(yardSFsetting.getValue(), null);
//TODO: uncomment this line. Will fail unless Node Null policy stuff is fixed
//assertEquals(false, yardSFsetting.isSet());
- ChangeSummary.Setting yardWidthsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, widthProp);
+ ChangeSummary.Setting yardWidthsetting = cs.getOldValue(yardDO, widthProp);
assertEquals("65", yardWidthsetting.getValue());
assertEquals(true, yardWidthsetting.isSet());
- ChangeSummary.Setting yardLengththsetting = (ChangeSummary.Setting)cs.getOldValue(yardDO, lengthProp);
+ ChangeSummary.Setting yardLengththsetting = cs.getOldValue(yardDO, lengthProp);
assertEquals("45", yardLengththsetting.getValue());
assertEquals(true, yardLengththsetting.isSet());
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildUndoTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildUndoTestCases.java
index aa7c1a9..c698778 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildUndoTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildUndoTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -148,6 +148,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildUnsetComplexSingleBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildUnsetComplexSingleBelowRootTest.java
index 4126797..8025bce 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildUnsetComplexSingleBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonChildUnsetComplexSingleBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,10 +45,12 @@
*/
// delete sales/po[1]/items/item[1]
public class ChangeSummaryXSDWithCSonChildUnsetComplexSingleBelowRootTest extends ChangeSummaryOnChildTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/CorporationWithCSonChildUnsetComplexSingleBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -62,6 +64,7 @@
TestRunner.main(arguments);
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexManyBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexManyBelowRootTest.java
index 5f2d8bd..ec2ac1c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexManyBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexManyBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,10 +19,12 @@
import commonj.sdo.helper.XMLDocument;
public class ChangeSummaryXSDWithCSonRootDeleteComplexManyBelowRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootDeleteComplexManyBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -36,6 +38,7 @@
TestRunner.main(arguments);
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexManyLeafBelowComplexManyBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexManyLeafBelowComplexManyBelowRootTest.java
index 817a14a..bd93f31 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexManyLeafBelowComplexManyBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexManyLeafBelowComplexManyBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,10 +44,12 @@
*
*/
public class ChangeSummaryXSDWithCSonRootDeleteComplexManyLeafBelowComplexManyBelowRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PODWithCSonRootDeleteComplexManyLeafBelowComplexManyBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -61,6 +63,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
@@ -103,6 +106,7 @@
</ns0:item>
</ns0:items>
*/
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexSingleAtRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexSingleAtRootTest.java
index 9f8e268..2a0d75e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexSingleAtRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexSingleAtRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,10 +23,12 @@
import commonj.sdo.helper.XMLDocument;
public class ChangeSummaryXSDWithCSonRootDeleteComplexSingleAtRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootDeleteComplexSingleAtRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -40,6 +42,7 @@
TestRunner.main(arguments);
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
@@ -92,7 +95,7 @@
assertNull(shipToDO.get("street"));
DataObject oldContainer = ((SDOChangeSummary)cs).getOldContainer(shipToDO);
Property shipToProp = oldContainer.getInstanceProperty("shipTo");
- ChangeSummary.Setting oldSetting = ((SDOChangeSummary)cs).getOldValue(oldContainer, shipToProp);
+ ChangeSummary.Setting oldSetting = cs.getOldValue(oldContainer, shipToProp);
DataObject deepCopyShipTo = (DataObject)oldSetting.getValue();
assertEquals("123 Maple Street", deepCopyShipTo.get("street"));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexSingleBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexSingleBelowRootTest.java
index 34b8ace..e8de6a0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexSingleBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDeleteComplexSingleBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,10 +44,12 @@
*
*/
public class ChangeSummaryXSDWithCSonRootDeleteComplexSingleBelowRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootDeleteComplexSingleBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -61,10 +63,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexManyBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexManyBelowRootTest.java
index f3e2a5e..5edc938 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexManyBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexManyBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,10 +44,12 @@
*
*/
public class ChangeSummaryXSDWithCSonRootDetachComplexManyBelowRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootDetachComplexManyBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -61,10 +63,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexManyLeafBelowComplexManyBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexManyLeafBelowComplexManyBelowRootTest.java
index e7c50e2..2bd2ff2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexManyLeafBelowComplexManyBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexManyLeafBelowComplexManyBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,10 +44,12 @@
*
*/
public class ChangeSummaryXSDWithCSonRootDetachComplexManyLeafBelowComplexManyBelowRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PODWithCSonRootDetachComplexManyLeafBelowComplexManyBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -61,10 +63,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexSingleAtRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexSingleAtRootTest.java
index b0bcea4..f3e5648 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexSingleAtRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexSingleAtRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,10 +23,12 @@
import commonj.sdo.helper.XMLDocument;
public class ChangeSummaryXSDWithCSonRootDetachComplexSingleAtRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootDetachComplexSingleAtRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -40,10 +42,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexSingleBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexSingleBelowRootTest.java
index c258a3a..55536bb 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexSingleBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootDetachComplexSingleBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,10 +44,12 @@
*
*/
public class ChangeSummaryXSDWithCSonRootDetachComplexSingleBelowRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootDetachComplexSingleBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -61,10 +63,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootProject.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootProject.java
index 7b1a37c..0e89fa0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootProject.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
//define types from deep with cs
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUndoTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUndoTestCases.java
index f07329f..7d4c8b5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUndoTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUndoTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -36,6 +36,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexManyBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexManyBelowRootTest.java
index d33b6e3..2d4596e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexManyBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexManyBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,10 +44,12 @@
*
*/
public class ChangeSummaryXSDWithCSonRootUnsetComplexManyBelowRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootUnsetComplexManyBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -61,10 +63,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleAtRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleAtRootTest.java
index ac73006..5bbb1ef 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleAtRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleAtRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,10 +21,12 @@
import commonj.sdo.helper.XMLDocument;
public class ChangeSummaryXSDWithCSonRootUnsetComplexSingleAtRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootUnsetComplexSingleAtRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -38,10 +40,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootTest.java
index fdc9779..b2f9040 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,10 +45,12 @@
*
*/
public class ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootUnsetComplexSingleBelowRoot.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -62,10 +64,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootWithComplexManyChildrenTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootWithComplexManyChildrenTest.java
index 4822967..f93bccf 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootWithComplexManyChildrenTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootWithComplexManyChildrenTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,10 +23,12 @@
import commonj.sdo.helper.XMLDocument;
public class ChangeSummaryXSDWithCSonRootUnsetComplexSingleBelowRootWithComplexManyChildrenTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PODWithCSonRootUnsetComplexSingleBelowRootWithComplexManyChildren.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -41,6 +43,7 @@
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterSetNullTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterSetNullTest.java
index bae5be1..3784961 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterSetNullTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterSetNullTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,10 +18,12 @@
import commonj.sdo.helper.XMLDocument;
public class ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterSetNullTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootUnsetSimpleManyAtRootAfterSetNull.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -35,10 +37,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterUnsetTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterUnsetTest.java
index 7351438..73e74dc 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterUnsetTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterUnsetTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,10 +18,12 @@
import commonj.sdo.helper.XMLDocument;
public class ChangeSummaryXSDWithCSonRootUnsetSimpleManyAtRootAfterUnsetTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootUnsetSimpleManyAtRootAfterUnset.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -35,10 +37,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterSetNullTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterSetNullTest.java
index 1850267..04465b6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterSetNullTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterSetNullTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,10 +18,12 @@
import commonj.sdo.helper.XMLDocument;
public class ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterSetNullTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootUnsetSimpleSingleAtRootAfterSetNull.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -35,10 +37,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterUnsetTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterUnsetTest.java
index 264f497..cb45696 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterUnsetTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterUnsetTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,10 +18,12 @@
import commonj.sdo.helper.XMLDocument;
public class ChangeSummaryXSDWithCSonRootUnsetSimpleSingleAtRootAfterUnsetTest extends ChangeSummaryOnRootTestCases {
+ @Override
protected String getControlFileName() {
return ("./org/eclipse/persistence/testing/sdo/helper/xmlhelper/changesummary/PurchaseOrderDeepWithCSonRootUnsetSimpleSingleAtRootAfterUnset.xml");
}
+ @Override
protected String getControlFileName2() {
return getControlFileName();
}
@@ -35,10 +37,12 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
}
+ @Override
protected void verifyAfterLoad(XMLDocument document) {
super.verifyAfterLoad(document);
// replace global object with one from xml file (with cs pre-populated)
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryGetOldSequenceTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryGetOldSequenceTestCases.java
index e5da0a4..d2e393c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryGetOldSequenceTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryGetOldSequenceTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryXSDWithCSonRootUndoWSeqProject.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryXSDWithCSonRootUndoWSeqProject.java
index e1da97e..7221cae 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryXSDWithCSonRootUndoWSeqProject.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryXSDWithCSonRootUndoWSeqProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
//define types from deep with cs
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryXSDwSeqTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryXSDwSeqTestCases.java
index 45646ab..50ff87f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryXSDwSeqTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/changesummary/sequence/ChangeSummaryXSDwSeqTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,6 +70,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();// watch setup redundancy
//define types from deep with cs
@@ -284,9 +285,9 @@
// assume that for logging=true copies we should have oldContainer, oldContProperties
assertEquals(6, numberOfDataObjectsInSubTree);// 16 - 10
assertEquals(((SDOChangeSummary)cs).getOldContainer().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainer().size());
+ copy.getChangeSummary().getOldContainer().size());
assertEquals(((SDOChangeSummary)cs).getOldContainmentProperty().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainmentProperty().size());
+ copy.getChangeSummary().getOldContainmentProperty().size());
// no oldSetting for simple object
@@ -1033,9 +1034,9 @@
// assume that for logging=true copies we should have oldContainer, oldContProperties
assertEquals(15, numberOfDataObjectsInSubTree);
assertEquals(((SDOChangeSummary)cs2).getOldContainer().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainer().size());
+ copy.getChangeSummary().getOldContainer().size());
assertEquals(((SDOChangeSummary)cs2).getOldContainmentProperty().size(),//
- ((SDOChangeSummary)copy.getChangeSummary()).getOldContainmentProperty().size());
+ copy.getChangeSummary().getOldContainmentProperty().size());
return copy;
}
@@ -1786,9 +1787,9 @@
assertEquals(3, cs.getChangedDataObjects().size());
assertEquals(18, ((SDOChangeSummary)cs).getOldContainer().size());// 14 + 4 new objects
assertEquals(18, ((SDOChangeSummary)cs).getOldContainmentProperty().size());// 14 + 4 new objects
- assertEquals(1, ((SDOChangeSummary)cs).getOldValues(itemsDO).size());// from 2 (only 1st change on items is recorded)
- assertEquals(5, ((SDOChangeSummary)cs).getOldValues(item3DO).size());// 1
- assertEquals(5, ((SDOChangeSummary)cs).getOldValues(item5DO).size());// 1
+ assertEquals(1, cs.getOldValues(itemsDO).size());// from 2 (only 1st change on items is recorded)
+ assertEquals(5, cs.getOldValues(item3DO).size());// 1
+ assertEquals(5, cs.getOldValues(item5DO).size());// 1
List aSettingList = cs.getOldValues(itemsDO);
assertTrue(aSettingList.size() > 0);
ChangeSummary.Setting containmentSetting = (ChangeSummary.Setting)aSettingList.get(0);
@@ -1882,7 +1883,7 @@
DataObject yardDO = shipToDO.getDataObject("yard");
cs.beginLogging();
yardDO.detach();
- assertTrue(((SDOChangeSummary)cs).isDeleted(yardDO));
+ assertTrue(cs.isDeleted(yardDO));
billToDO.set("yard", yardDO);
assertModified(shipToDO, cs);
@@ -2135,7 +2136,7 @@
}
DataObject oldContainer = ((SDOChangeSummary)cs).getOldContainer(shipToDO);
Property shipToProp = oldContainer.getInstanceProperty("shipTo");
- ChangeSummary.Setting oldSetting = ((SDOChangeSummary)cs).getOldValue(oldContainer, shipToProp);
+ ChangeSummary.Setting oldSetting = cs.getOldValue(oldContainer, shipToProp);
DataObject deepCopyShipTo = (DataObject)oldSetting.getValue();
assertEquals("123 Maple Street", deepCopyShipTo.get("street"));
@@ -2189,7 +2190,7 @@
assertNull(shipToDO.get("street"));
DataObject oldContainer = ((SDOChangeSummary)cs).getOldContainer(shipToDO);
Property shipToProp = oldContainer.getInstanceProperty("shipTo");
- ChangeSummary.Setting oldSetting = ((SDOChangeSummary)cs).getOldValue(oldContainer, shipToProp);
+ ChangeSummary.Setting oldSetting = cs.getOldValue(oldContainer, shipToProp);
DataObject deepCopyShipTo = (DataObject)oldSetting.getValue();
assertEquals("123 Maple Street", deepCopyShipTo.get("street"));
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectBackPointerTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectBackPointerTest.java
index 6ad5574..7745b73 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectBackPointerTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectBackPointerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,6 +43,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
dataGraph = new SDODataGraph(aHelperContext);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectTestCases.java
index 933f09b..793c22a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/datagraph/SDODataGraphDataObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -53,6 +53,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
dataGraph = new SDODataGraph(aHelperContext);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectCloneTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectCloneTestCases.java
index a7415be..7775619 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectCloneTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectCloneTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
String xsdString = getXSDString("org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderDeep.xsd");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectContainerContainmentPropertyTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectContainerContainmentPropertyTest.java
index 543f4f9..179cafa 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectContainerContainmentPropertyTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectContainerContainmentPropertyTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,8 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.model.dataobject;
+import junit.framework.TestCase;
+
public class SDODataObjectContainerContainmentPropertyTest extends SDODataObjectContainerContainmentPropertyTestCases {
public SDODataObjectContainerContainmentPropertyTest(String name) {
super(name);
@@ -23,17 +25,17 @@
// reset its containment property's value to this dataobject, e.g.
// Before, b contains c, then
public void testContainerContainmentPropertyAfterReset() {
- this.assertEquals(dataObject_b, dataObject_c.getContainer());
+ assertEquals(dataObject_b, dataObject_c.getContainer());
dataObject_a.set(property_a, dataObject_c);
- this.assertFalse(dataObject_c.getContainer().equals(dataObject_b));
+ assertFalse(dataObject_c.getContainer().equals(dataObject_b));
}
// purpose: test if a dataobject's cotainer is changed if other dataobject
// reset its containment property's value to this dataobject, e.g.
// Before, b contains c, then
public void testContainerContainmentPropertyAfterUnset() {
- this.assertEquals(dataObject_a, dataObject_b.getContainer());
+ assertEquals(dataObject_a, dataObject_b.getContainer());
dataObject_a.unset(property_a);
- this.assertNull(dataObject_b.getContainer());
+ assertNull(dataObject_b.getContainer());
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectContainerContainmentPropertyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectContainerContainmentPropertyTestCases.java
index e49307d..53a66cd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectContainerContainmentPropertyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectContainerContainmentPropertyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -59,6 +59,7 @@
protected SDOProperty property_c_bNotSDODataOject;
protected SDOProperty property_a_pathLength_1;
+ @Override
public void setUp() {// set up as a/b/c
super.setUp();
dataObject_a = new SDODataObject();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectConversionTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectConversionTestCases.java
index 0e96161..3e5a25e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectConversionTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectConversionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
type = new SDOType(URINAME, TYPENAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectConversionWithPathTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectConversionWithPathTestCases.java
index f389ccd..29baeeb 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectConversionWithPathTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectConversionWithPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
super(name);
}
+ @Override
public void setUp() {// set up as a/b/c
super.setUp();
type_a = new SDOType(URINAME, TYPENAME_A);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanByPositionalPathTest.java
index 48506fe..954d432 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanByPositionalPathTest.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -36,8 +38,8 @@
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BOOLEAN);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
@@ -46,16 +48,16 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBoolean(property3, true);
boolean value = dataObject_a.getBoolean(property3);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(false);
- this.assertEquals(bb.booleanValue(), value);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(false);
+ assertEquals(bb.booleanValue(), value);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BOOLEAN);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
@@ -64,21 +66,21 @@
dataObject_a.setBoolean(property + ".0", true);
boolean value = dataObject_a.getBoolean(property + ".0");
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(false);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(false);
- this.assertEquals(true, value);
+ assertEquals(true, value);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BOOLEAN);
Boolean b = Boolean.valueOf(true);
dataObject_a.setBoolean(property1, true);// c dataobject's a property has value boolean 'true'
- this.assertEquals(true, dataObject_a.getBoolean(property1));
+ assertEquals(true, dataObject_a.getBoolean(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -110,7 +112,7 @@
//3. purpose: getBoolean with Byte property
public void testGetBooleanFromByte() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BYTE);
byte theByte = 0;
dataObject_c.set(prop, theByte);
@@ -222,20 +224,20 @@
//10. purpose: getBoolean with Defined String Property
public void testGetBooleanConversionFromDefinedStringProperty() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "true";
Boolean B_STR = Boolean.valueOf(str);
dataObject_c.setString(property_c, str);// add it to instance list
- this.assertEquals(B_STR.booleanValue(), dataObject_a.getBoolean(property));
+ assertEquals(B_STR.booleanValue(), dataObject_a.getBoolean(property));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanStringBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BOOLEAN);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
String str = "true";
Boolean bb = Boolean.valueOf(str);
@@ -246,16 +248,16 @@
dataObject_a.set(property3, bb);
boolean value = dataObject_a.getBoolean(property3);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(false);
- this.assertEquals(bb.booleanValue(), value);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(false);
+ assertEquals(bb.booleanValue(), value);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedStringPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
String str = "true";
Boolean bb = Boolean.valueOf(str);
@@ -264,21 +266,21 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.set(property + ".0", bb);
boolean value = dataObject_a.getBoolean(property + ".0");
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(false);
- this.assertEquals(true, value);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(false);
+ assertEquals(true, value);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedStringPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BOOLEAN);
String str = "true";
Boolean b = Boolean.valueOf(str);
dataObject_a.set(property1, b);// c dataobject's a property has value boolean 'true'
- this.assertEquals(true, dataObject_a.getBoolean(property1));
+ assertEquals(true, dataObject_a.getBoolean(property1));
}
/* public void testGetBooleanConversionWithPathFromDefinedStringPropertyEqualSignBracketInPathDotSet() {
@@ -302,7 +304,7 @@
//12. purpose: getBoolean with bytes property
public void testGetBooleanFromBytes() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BYTES);
dataObject_c.set(prop, new String("eee").getBytes());
try {
@@ -314,7 +316,7 @@
//13. purpose: getBoolean with decimal property
public void testGetBooleanFromDecimal() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_DECIMAL);
dataObject_c.set(prop, new BigDecimal("3"));
try {
@@ -328,7 +330,7 @@
//14. purpose: getBoolean with integer property
public void testGetBooleanFromInteger() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_INTEGER);
dataObject_c.set(prop, new BigInteger("0"));
try {
@@ -342,7 +344,7 @@
//22. purpose: getBoolean with date property
public void testGetBooleanFromDate() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_DATE);
dataObject_c.set(prop, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionTest.java
index 04770ff..0cba900 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -36,7 +38,7 @@
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionFromDefinedBooleanProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
boolean b = true;
@@ -61,7 +63,7 @@
//3. purpose: getBoolean with Byte property
public void testGetBooleanFromByte() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte theValue = 0;
dataObject.set(property, theValue);
@@ -77,7 +79,7 @@
//4. purpose: getBoolean with character property
public void testGetBooleanFromCharacter() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
Character b = Character.valueOf('1');
@@ -99,7 +101,7 @@
//5. purpose: getBoolean with Double Property
public void testGetBooleanFromDouble() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
Double b = Double.valueOf(0);
@@ -121,7 +123,7 @@
//6. purpose: getBoolean with float Property
public void testGetBooleanFromFloat() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
Float b = Float.valueOf(1.20f);
@@ -143,7 +145,7 @@
//7. purpose: getBooleab with int Property
public void testGetBooleanFromInt() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
Integer b = Integer.valueOf(0);
@@ -165,7 +167,7 @@
//8. purpose: getBoolea with long Property
public void testGetBooleanFromLong() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
Double b = Double.valueOf(0);
@@ -187,7 +189,7 @@
//9. purpose: getBytes with short Property
public void testGetBooleanFromShort() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short s = 12;
@@ -211,7 +213,7 @@
//10. purpose: getDouble with Defined String Property
public void testGetBooleanConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "true";
@@ -236,7 +238,7 @@
//12. purpose: getBoolean with bytes property
public void testGetBooleanFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new byte[]{10, 100});
try {
@@ -248,7 +250,7 @@
//13. purpose: getBoolean with decimal property
public void testGetBooleanFromDecimal() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
BigDecimal theValue = new BigDecimal(10);
dataObject.set(property, theValue);
@@ -263,7 +265,7 @@
//14. purpose: getBoolean with integer property
public void testGetBooleanFromInteger() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger theValue = new BigInteger("0");
@@ -279,7 +281,7 @@
//22. purpose: getBoolean with date property
public void testGetBooleanFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
@@ -302,18 +304,18 @@
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionFromDefinedBooleanObjectProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEANOBJECT);
boolean b = true;
dataObject.setBoolean(property, b);// add it to instance list
- this.assertEquals(b, dataObject.getBoolean(property));
+ assertEquals(b, dataObject.getBoolean(property));
}
public void testGetBooleanFromByteObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
Byte theValue = Byte.valueOf("10");
dataObject.set(property, theValue);
@@ -329,7 +331,7 @@
//4. purpose: getBoolean with character property
public void testGetBooleanFromCharacterObject() {
// dataObject's type add boolean property
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
Character b = Character.valueOf('1');
@@ -351,7 +353,7 @@
//5. purpose: getBoolean with Double Property
public void testGetBooleanFromDoubleObject() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
Double b = Double.valueOf(0);
@@ -372,7 +374,7 @@
}
public void testGetBooleanFromFloatObject() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOATOBJECT);
Float b = Float.valueOf(1.20f);
@@ -394,7 +396,7 @@
//7. purpose: getBooleab with int Property
public void testGetBooleanFromIntObject() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
Integer b = Integer.valueOf(0);
@@ -415,7 +417,7 @@
}
public void testGetBooleanFromShortObject() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORTOBJECT);
short s = 12;
@@ -438,7 +440,7 @@
//purpose: test throw conversion exception caused by 't'
public void testGetBooleanFromCharacterT() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
Character b = Character.valueOf('t');
@@ -457,7 +459,7 @@
//purpose: test throw conversion exception caused by 'F'
public void testGetBooleanFromCharacterF() {
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
Character b = Character.valueOf('f');
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionWithPathTest.java
index 220ccba..95d3683 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanConversionWithPathTest.java
@@ -19,6 +19,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -46,7 +48,7 @@
dataObject_a.setBoolean(property, c);// c dataobject's a property has value boolean 'true'
- this.assertEquals(c, dataObject_a.getBoolean(property));
+ assertEquals(c, dataObject_a.getBoolean(property));
}
@@ -154,7 +156,7 @@
//Short c = Short.valueOf(s);
dataObject_a.setDouble(property, s);// c dataobject's a property has value boolean 'true'
- this.assertEquals(false, dataObject_a.getBoolean(property));
+ assertEquals(false, dataObject_a.getBoolean(property));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -182,7 +184,7 @@
//Short c = Short.valueOf(s);
dataObject_a.setFloat(property, s.floatValue());// c dataobject's a property has value boolean 'true'
- this.assertEquals(false, dataObject_a.getBoolean(property));
+ assertEquals(false, dataObject_a.getBoolean(property));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -210,7 +212,7 @@
//Short c = Short.valueOf(s);
dataObject_a.setInt(property, s);// c dataobject's a property has value boolean 'true'
- this.assertEquals(true, dataObject_a.getBoolean(property));
+ assertEquals(true, dataObject_a.getBoolean(property));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -238,7 +240,7 @@
//Short c = Short.valueOf(s);
dataObject_a.setLong(property, s);// c dataobject's a property has value boolean 'true'
- this.assertEquals(false, dataObject_a.getBoolean(property));
+ assertEquals(false, dataObject_a.getBoolean(property));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -266,7 +268,7 @@
//Short c = Short.valueOf(s);
dataObject_a.setShort(property, s);// c dataobject's a property has value boolean 'true'
- this.assertEquals(false, dataObject_a.getBoolean(property));
+ assertEquals(false, dataObject_a.getBoolean(property));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -293,7 +295,7 @@
Boolean B_STR = Boolean.valueOf(str);
dataObject_a.setString(property, str);// add it to instance list
- this.assertEquals(B_STR.booleanValue(), dataObject_a.getBoolean("PName-a/PName-b/PName-c"));
+ assertEquals(B_STR.booleanValue(), dataObject_a.getBoolean("PName-a/PName-b/PName-c"));
}
//11. purpose: getDouble with Undefined string Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanWithIndexConversionTest.java
index 2942d3b..aa1c69f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBooleanWithIndexConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -36,14 +38,14 @@
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionFromDefinedBooleanProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
boolean b = true;
dataObject.setBoolean(PROPERTY_INDEX, b);// add it to instance list
- this.assertEquals(b, dataObject.getBoolean(PROPERTY_INDEX));
+ assertEquals(b, dataObject.getBoolean(PROPERTY_INDEX));
}
//2. purpose: getBoolean with Undefined Property
@@ -60,7 +62,7 @@
//3. purpose: getBoolean with Byte property
public void testGetBooleanFromByte() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte theValue= 0;
dataObject.set(property, theValue);
@@ -76,14 +78,14 @@
//4. purpose: getBoolean with character property
public void testGetBooleanFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
Character b = Character.valueOf('0');
dataObject.setChar(PROPERTY_INDEX, b.charValue());// add it to instance list
- this.assertEquals(false, dataObject.getBoolean(PROPERTY_INDEX));
+ assertEquals(false, dataObject.getBoolean(PROPERTY_INDEX));
/*SDOProperty property = new SDOProperty();
property.setName(PROPERTY_NAME);
@@ -99,14 +101,14 @@
//5. purpose: getBoolean with Double Property
public void testGetBooleanFromDouble() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
Double b = Double.valueOf(0);
dataObject.setDouble(PROPERTY_INDEX, b.doubleValue());// add it to instance list
- this.assertEquals(false, dataObject.getBoolean(PROPERTY_INDEX));
+ assertEquals(false, dataObject.getBoolean(PROPERTY_INDEX));
/*SDOProperty property = new SDOProperty();
property.setName(PROPERTY_NAME);
@@ -122,14 +124,14 @@
//6. purpose: getBoolean with float Property
public void testGetBooleanFromFloat() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
Float b = Float.valueOf(1.01f);
dataObject.setFloat(PROPERTY_INDEX, b.floatValue());// add it to instance list
- this.assertEquals(true, dataObject.getBoolean(PROPERTY_INDEX));
+ assertEquals(true, dataObject.getBoolean(PROPERTY_INDEX));
/*SDOProperty property = new SDOProperty();
property.setName(PROPERTY_NAME);
@@ -145,14 +147,14 @@
//7. purpose: getBooleab with int Property
public void testGetBooleanFromInt() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
Integer b = Integer.valueOf(1);
dataObject.setLong(PROPERTY_INDEX, b.intValue());// add it to instance list
- this.assertEquals(true, dataObject.getBoolean(PROPERTY_INDEX));
+ assertEquals(true, dataObject.getBoolean(PROPERTY_INDEX));
/*SDOProperty property = new SDOProperty();
property.setName(PROPERTY_NAME);
@@ -168,14 +170,14 @@
//8. purpose: getBoolea with long Property
public void testGetBooleanFromLong() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
Long b = Long.valueOf(1);
dataObject.setLong(PROPERTY_INDEX, b.longValue());// add it to instance list
- this.assertEquals(true, dataObject.getBoolean(PROPERTY_INDEX));
+ assertEquals(true, dataObject.getBoolean(PROPERTY_INDEX));
/*SDOProperty property = new SDOProperty();
property.setName(PROPERTY_NAME);
@@ -207,20 +209,20 @@
//10. purpose: getDouble with Defined String Property
public void testGetBooleanConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "true";
Boolean B_STR = Boolean.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(B_STR.booleanValue(), dataObject.getBoolean(PROPERTY_INDEX));
+ assertEquals(B_STR.booleanValue(), dataObject.getBoolean(PROPERTY_INDEX));
}
//12. purpose: getBoolean with bytes property
public void testGetBooleanFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new byte[]{10, 100});
@@ -233,7 +235,7 @@
//13. purpose: getBoolean with decimal property
public void testGetBooleanFromDecimal() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
dataObject.set(property, new BigDecimal(10));
@@ -248,7 +250,7 @@
//14. purpose: getBoolean with integer property
public void testGetBooleanFromInteger() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
dataObject.set(property, new BigInteger("0"));
@@ -263,7 +265,7 @@
//22. purpose: getDouble with date property
public void testGetBooleanFromDate() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByPositionalPathTest.java
index b0c379b..4393107 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.model.dataobject;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -31,17 +32,17 @@
// normal test: a/b.0/c as path
public void testGetByPositionalPathString() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
dataObject_c.set(property_c, "test");
- this.assertEquals("test", dataObject_a.get(property));
+ assertEquals("test", dataObject_a.get(property));
}
// normal test: a/b.0/c as path
public void testGetByPositionalPathStringObj() {
- this.assertEquals(dataObject_c, dataObject_a.get("PName-a/PName-b.0"));
+ assertEquals(dataObject_c, dataObject_a.get("PName-a/PName-b.0"));
}
@@ -56,13 +57,13 @@
*/
dataObject_a.set(property4, "test");
- this.assertEquals("test", dataObject_a.get(property4));
+ assertEquals("test", dataObject_a.get(property4));
}
// purpose: test a nonexisted dataobject in the path
public void testGetByPositionalPathStringWithDataObjectNotInPosition() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
dataObject_c.set(property_c, "test");
@@ -78,19 +79,19 @@
// purpose: test one of properties is not existed in path
public void testGetByPositionalPathStringWithDataObjectNotExistedProperty() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
dataObject_c.set(property_c, "test");
- this.assertNull(dataObject_a.get("PName-a/PName-f.0/PName-c"));
+ assertNull(dataObject_a.get("PName-a/PName-f.0/PName-c"));
}
// purpose: test one of properties is not existed in path
public void testGetByPositionalPathStringWithPropertyNameContainingDot() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
dataObject_c.set(property_c, "test");
- this.assertNull(dataObject_a.get(UNDEFINED_PATH));
+ assertNull(dataObject_a.get(UNDEFINED_PATH));
//this.assertNull(dataObject_a.get(property));
/*try{
@@ -101,21 +102,21 @@
// purpose: test path as ".."
public void testGetByPositionalPathStringWithContainerPath() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
dataObject_c.set(property_c, "test");
- this.assertTrue(dataObject_a == dataObject_b.get(".."));
+ assertTrue(dataObject_a == dataObject_b.get(".."));
}
// purpose: test path as "/"
public void testGetByPositionalPathStringWithRootPath() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
dataObject_c.set(property_c, "test");
- this.assertTrue(dataObject_a == dataObject_c.get("/"));
+ assertTrue(dataObject_a == dataObject_c.get("/"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByPositionalPathTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByPositionalPathTestCases.java
index 276d843..aa8654f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByPositionalPathTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByPositionalPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,6 +65,7 @@
protected SDOProperty property_c_bNotSDODataOject;
protected SDOProperty property_a_pathLength_1;
+ @Override
public void setUp() {// set up as a/b/c
super.setUp();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteByPositionalPathTest.java
index dd03d41..f180b43 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteByPositionalPathTest.java
@@ -20,6 +20,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -37,7 +39,7 @@
//1. purpose: getByte with boolean property
public void testGetByteFromBoolean() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(property, true);
try {
@@ -49,20 +51,20 @@
//2. purpose: getByte with Defined Byte Property
public void testGetByteConversionFromDefinedByteProperty() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals(by, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getByte(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTE);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
byte by = 12;
List b = new ArrayList();
@@ -71,15 +73,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setByte(property3, by);
- this.assertEquals(by, dataObject_a.getByte(property3));
+ assertEquals(by, dataObject_a.getByte(property3));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTE);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
byte by = 12;
List b = new ArrayList();
@@ -87,18 +89,18 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setByte(property + ".0", by);
- this.assertEquals(by, dataObject_a.getByte(property + ".0"));
+ assertEquals(by, dataObject_a.getByte(property + ".0"));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject_a.setByte(property1, by);// c dataobject's a property has value boolean 'true'
- this.assertEquals(by, dataObject_a.getByte(property1));
+ assertEquals(by, dataObject_a.getByte(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -130,7 +132,7 @@
//4. purpose: getByte with character property
public void testGetByteFromCharacter() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_CHARACTER);
char theValue = 'e';
dataObject_c.set(property, theValue);
@@ -143,35 +145,35 @@
//5. purpose: getByte with Defined Double Property
public void testGetByteConversionFromDefinedDoubleProperty() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((byte)db, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)db, dataObject_a.getByte(propertyPath_a_b_c));
}
//7. purpose: getByte with Defined float Property
public void testGetByteConversionFromDefinedFloatProperty() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((byte)fl, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)fl, dataObject_a.getByte(propertyPath_a_b_c));
}
//9. purpose: getByte with Defined int Property
public void testGetByteConversionFromDefinedIntProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((byte)in, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)in, dataObject_a.getByte(propertyPath_a_b_c));
}
@@ -179,42 +181,42 @@
//11. purpose: getByte with Defined long Property
public void testGetByteConversionFromDefinedLongProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((byte)lg, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)lg, dataObject_a.getByte(propertyPath_a_b_c));
}
//13. purpose: getByte with Defined short Property
public void testGetByteConversionFromDefinedShortProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((byte)shr, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)shr, dataObject_a.getByte(propertyPath_a_b_c));
}
//15. purpose: getByte with Defined String Property
public void testGetByteConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
Byte s_d = Byte.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.byteValue(), dataObject_a.getByte(property));
+ assertEquals(s_d.byteValue(), dataObject_a.getByte(property));
}
//17. purpose: getByte with bytes property
public void testGetByteFromBytes() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BYTES);
dataObject_c.set(property, new byte[]{10, 100});
@@ -227,7 +229,7 @@
//18. purpose: getByte with decimal property
public void testGetByteFromDecimal() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_DECIMAL);
BigDecimal theValue =new BigDecimal(10);
dataObject_c.set(property, theValue);
@@ -242,7 +244,7 @@
//19. purpose: getByte with decimal property
public void testGetByteFromInteger() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger theValue =new BigInteger("10");
dataObject_c.set(property, theValue);
@@ -258,7 +260,7 @@
//20. purpose: getByte with date property
public void testGetByteFromDate() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_DATE);
dataObject_c.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionTest.java
index a0b06a4..470ba8c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -34,7 +36,7 @@
//1. purpose: getByte with boolean property
public void testGetByteFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.getType().getDeclaredProperties().add(property);
dataObject.set(property, true);
@@ -48,14 +50,14 @@
//2. purpose: getByte with Defined Byte Property
public void testGetByteConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals(by, dataObject.getByte(property));
+ assertEquals(by, dataObject.getByte(property));
}
//3. purpose: getByte with Undefined Byte Property
@@ -73,7 +75,7 @@
//4. purpose: getByte with character property
public void testGetByteFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
char theValue = 'e';
dataObject.set(property, theValue);
@@ -87,13 +89,13 @@
//5. purpose: getByte with Defined Double Property
public void testGetByteConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((byte)db, dataObject.getByte(property));
+ assertEquals((byte)db, dataObject.getByte(property));
}
//6. purpose: getByte with Undefined Double Property
@@ -112,13 +114,13 @@
//7. purpose: getByte with Defined float Property
public void testGetByteConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((byte)fl, dataObject.getByte(property));
+ assertEquals((byte)fl, dataObject.getByte(property));
}
//8. purpose: getByte with Undefined float Property
@@ -137,12 +139,12 @@
//9. purpose: getByte with Defined int Property
public void testGetByteConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((byte)in, dataObject.getByte(property));
+ assertEquals((byte)in, dataObject.getByte(property));
}
//10. purpose: getByte with Undefined int Property
@@ -161,13 +163,13 @@
//11. purpose: getByte with Defined long Property
public void testGetByteConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((byte)lg, dataObject.getByte(property));
+ assertEquals((byte)lg, dataObject.getByte(property));
}
//12. purpose: getByte with Undefined long Property
@@ -186,13 +188,13 @@
//13. purpose: getByte with Defined short Property
public void testGetByteConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((byte)shr, dataObject.getByte(property));
+ assertEquals((byte)shr, dataObject.getByte(property));
}
//14. purpose: getByte with Undefined short Property
@@ -211,14 +213,14 @@
//15. purpose: getByte with Defined String Property
public void testGetByteConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
Byte s_d = Byte.valueOf(str);
dataObject.setString(property, str);// add it to instance list
- this.assertEquals(s_d.byteValue(), dataObject.getByte(property));
+ assertEquals(s_d.byteValue(), dataObject.getByte(property));
}
//16. purpose: getDouble with Undefined string Property
@@ -236,7 +238,7 @@
//17. purpose: getByte with bytes property
public void testGetByteFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte[] theValue = new byte[]{10,100};
dataObject.set(property, theValue);
@@ -249,7 +251,7 @@
//18. purpose: getByte with decimal property
public void testGetByteFromDecimal() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
BigDecimal theValue = new BigDecimal(12);
dataObject.set(property, theValue);
@@ -264,7 +266,7 @@
//19. purpose: getByte with decimal property
public void testGetByteFromInteger() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger theValue = new BigInteger("12");
dataObject.set(property, theValue);
@@ -279,7 +281,7 @@
//20. purpose: getByte with date property
public void testGetByteFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
@@ -300,7 +302,7 @@
}
public void testGetByteFromBooleanObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEANOBJECT);
Boolean theValue = Boolean.TRUE;
dataObject.set(property, theValue);
@@ -313,18 +315,18 @@
public void testGetByteConversionFromDefinedByteObjectProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
byte by = 12;
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals(by, dataObject.getByte(property));
+ assertEquals(by, dataObject.getByte(property));
}
public void testGetByteFromCharacterObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
Character theValue = Character.valueOf('e');
dataObject.set(property, theValue);
@@ -337,55 +339,55 @@
public void testGetByteConversionFromDefinedDoubleObjectProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
double db = 12;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((byte)db, dataObject.getByte(property));
+ assertEquals((byte)db, dataObject.getByte(property));
}
public void testGetByteConversionFromDefinedFloatObjectProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOATOBJECT);
float fl = 12;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((byte)fl, dataObject.getByte(property));
+ assertEquals((byte)fl, dataObject.getByte(property));
}
public void testGetByteConversionFromDefinedIntObjectProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
int in = 12;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((byte)in, dataObject.getByte(property));
+ assertEquals((byte)in, dataObject.getByte(property));
}
public void testGetByteConversionFromDefinedLongObjectProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONGOBJECT);
long lg = 12;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((byte)lg, dataObject.getByte(property));
+ assertEquals((byte)lg, dataObject.getByte(property));
}
public void testGetByteConversionFromDefinedShortObjectProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORTOBJECT);
short shr = 12;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((byte)shr, dataObject.getByte(property));
+ assertEquals((byte)shr, dataObject.getByte(property));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionWithPathTest.java
index de07efb..0a9deb7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteConversionWithPathTest.java
@@ -19,6 +19,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -60,7 +62,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals(by, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getByte(propertyPath_a_b_c));
}
//3. purpose: getByte with Undefined Byte Property
@@ -104,7 +106,7 @@
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((byte)db, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)db, dataObject_a.getByte(propertyPath_a_b_c));
}
//6. purpose: getByte with Undefined Double Property
@@ -132,7 +134,7 @@
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((byte)fl, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)fl, dataObject_a.getByte(propertyPath_a_b_c));
}
//8. purpose: getByte with Undefined float Property
@@ -161,7 +163,7 @@
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((byte)in, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)in, dataObject_a.getByte(propertyPath_a_b_c));
}
//10. purpose: getByte with Undefined int Property
@@ -190,7 +192,7 @@
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((byte)lg, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)lg, dataObject_a.getByte(propertyPath_a_b_c));
}
//12. purpose: getByte with Undefined long Property
@@ -219,7 +221,7 @@
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((byte)shr, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)shr, dataObject_a.getByte(propertyPath_a_b_c));
}
//14. purpose: getByte with Undefined short Property
@@ -249,7 +251,7 @@
Byte s_d = Byte.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.byteValue(), dataObject_a.getByte(property));
+ assertEquals(s_d.byteValue(), dataObject_a.getByte(property));
}
//16. purpose: getDouble with Undefined string Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteWithIndexConversionTest.java
index 8c45f21..5480349 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetByteWithIndexConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getByte with boolean property
public void testGetByteFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -48,14 +50,14 @@
//2. purpose: getByte with Defined Byte Property
public void testGetByteConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject.setByte(PROPERTY_INDEX, by);// add it to instance list
- this.assertEquals(by, dataObject.getByte(PROPERTY_INDEX));
+ assertEquals(by, dataObject.getByte(PROPERTY_INDEX));
}
//3. purpose: getByte with Undefined Property
@@ -72,7 +74,7 @@
//4. purpose: getByte with character property
public void testGetByteFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
char theValue = 'e';
dataObject.set(property, theValue);
@@ -86,39 +88,39 @@
//5. purpose: getByte with Defined Double Property
public void testGetByteConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject.setDouble(PROPERTY_INDEX, db);// add it to instance list
- this.assertEquals((byte)db, dataObject.getByte(PROPERTY_INDEX));
+ assertEquals((byte)db, dataObject.getByte(PROPERTY_INDEX));
}
//7. purpose: getByte with Defined float Property
public void testGetByteConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
- this.assertEquals((byte)fl, dataObject.getByte(PROPERTY_INDEX));
+ assertEquals((byte)fl, dataObject.getByte(PROPERTY_INDEX));
}
//9. purpose: getByte with Defined int Property
public void testGetByteConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(PROPERTY_INDEX, in);// add it to instance list
- this.assertEquals((byte)in, dataObject.getByte(property));
+ assertEquals((byte)in, dataObject.getByte(property));
}
@@ -126,46 +128,46 @@
//11. purpose: getByte with Defined long Property
public void testGetByteConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(PROPERTY_INDEX, lg);// add it to instance list
- this.assertEquals((byte)lg, dataObject.getByte(PROPERTY_INDEX));
+ assertEquals((byte)lg, dataObject.getByte(PROPERTY_INDEX));
}
//13. purpose: getByte with Defined short Property
public void testGetByteConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(PROPERTY_INDEX, shr);// add it to instance list
- this.assertEquals((byte)shr, dataObject.getByte(PROPERTY_INDEX));
+ assertEquals((byte)shr, dataObject.getByte(PROPERTY_INDEX));
}
//15. purpose: getByte with Defined String Property
public void testGetByteConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
Byte s_d = Byte.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(s_d.byteValue(), dataObject.getByte(PROPERTY_INDEX));
+ assertEquals(s_d.byteValue(), dataObject.getByte(PROPERTY_INDEX));
}
//17. purpose: getByte with bytes property
public void testGetByteFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte[] theValue = new byte[]{10, 100};
dataObject.set(property, theValue);
@@ -178,7 +180,7 @@
//18. purpose: getByte with decimal property
public void testGetByteFromDecimal() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
BigDecimal theValue = new BigDecimal("12");
@@ -194,7 +196,7 @@
//19. purpose: getByte with decimal property
public void testGetByteFromInteger() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger theValue = new BigInteger("12");
dataObject.set(property, theValue);
@@ -209,7 +211,7 @@
//20. purpose: getByte with date property
public void testGetByteFromDate() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesByPositionalPathTest.java
index 847ef2c..bf7935f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,8 @@
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -36,7 +38,7 @@
//1. purpose: getBytes with Boolean property
public void testGetBytesFromBoolean() {
- property_c = (SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
+ property_c = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property_c.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(property_c, true);
try {
@@ -48,7 +50,7 @@
//2. purpose: getBytes with Byte property
public void testGetBytesFromByte() {
- property_c = (SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
+ property_c = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property_c.setType(SDOConstants.SDO_BYTE);
dataObject_c.set(property_c, new String("aaa").getBytes()[0]);
try {
@@ -60,7 +62,7 @@
//3. purpose: getBytes with character property
public void testGetBytesFromCharacter() {
- property_c = (SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
+ property_c = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property_c.setType(SDOConstants.SDO_CHARACTER);
dataObject_c.set(property_c, 'c');
try {
@@ -72,7 +74,7 @@
//4. purpose: getBytes with Double Property
public void testGetBytesFromDouble() {
- property_c = (SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
+ property_c = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property_c.setType(SDOConstants.SDO_DOUBLE);
double doubleValue = 2;
dataObject_c.set(property_c, doubleValue);
@@ -85,7 +87,7 @@
//5. purpose: getBytes with float Property
public void testGetBytesFromFloat() {
- property_c = (SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
+ property_c = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property_c.setType(SDOConstants.SDO_FLOAT);
float floatValue = 2;
dataObject_c.set(property_c, floatValue);
@@ -98,7 +100,7 @@
//6. purpose: getBytes with int Property
public void testGetBytesFromInt() {
- property_c = (SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
+ property_c = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property_c.setType(SDOConstants.SDO_INT);
int intValue = 2;
dataObject_c.set(property_c, intValue);
@@ -111,7 +113,7 @@
//7. purpose: getBytes with long Property
public void testGetBytesFromLong() {
- property_c = (SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
+ property_c = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property_c.setType(SDOConstants.SDO_LONG);
long longValue = 2;
dataObject_c.set(property_c, longValue);
@@ -126,7 +128,7 @@
//8. purpose: getBytes with short Property
public void testGetBytesFromShort() {
- property_c = (SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
+ property_c = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property_c.setType(SDOConstants.SDO_SHORT);
short shortValue = 2;
@@ -141,7 +143,7 @@
//9. purpose: getBytes with string Property
public void testGetBytesFromString() {
- property_c = (SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
+ property_c = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property_c.setType(SDOConstants.SDO_STRING);
String test = "test";
dataObject_c.set(property_c, test);
@@ -156,20 +158,20 @@
//10. purpose: getBytes with Defined Bytes Property
public void testGetBytesConversionFromDefinedBytesProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTES);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTES);
byte[] b = { 12, 13 };
dataObject_a.setBytes(propertyPath_a_b_c, b);// add it to instance list
- this.assertTrue(Arrays.equals(b, dataObject_a.getBytes(propertyPath_a_b_c)));
+ assertTrue(Arrays.equals(b, dataObject_a.getBytes(propertyPath_a_b_c)));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTES);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTES);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
byte[] bb = { 12, 13 };
List b = new ArrayList();
@@ -178,15 +180,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBytes(property3, bb);
- this.assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property3)));
+ assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property3)));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTES);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTES);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
byte[] bb = { 12, 13 };
List b = new ArrayList();
@@ -194,19 +196,19 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBytes(property + ".0", bb);
- this.assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property + ".0")));
+ assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property + ".0")));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTES);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTES);
byte[] bb = { 12, 13 };
dataObject_a.setBytes(property1, bb);// c dataobject's a property has value boolean 'true'
- this.assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property1)));
+ assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property1)));
}
/* public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -229,7 +231,7 @@
//12. purpose: getBytes with decimal property
public void testGetBytesFromDecimal() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
dataObject_c.set(property_c, new BigDecimal(2));
try {
@@ -259,7 +261,7 @@
//22. purpose: getBytes with date property
public void testGetBytesFromDate() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DATE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DATE);
dataObject_c.set(property_c, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesConversionTest.java
index 7922c7c..5d55f5d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,8 @@
import java.math.BigInteger;
import java.util.Arrays;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -35,7 +37,7 @@
//1. purpose: getBytes with Boolean property
public void testGetBytesFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -47,7 +49,7 @@
//2. purpose: getBytes with Byte property
public void testGetBytesFromByte() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte theByte = new String("abc").getBytes()[0];
dataObject.set(property, theByte);
@@ -60,7 +62,7 @@
//3. purpose: getBytes with character property
public void testGetBytesFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'c');
try {
@@ -72,7 +74,7 @@
//4. purpose: getBytes with Double Property
public void testGetBytesFromDouble() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double doubleValue = 2.0;
dataObject.set(property, doubleValue);
@@ -85,7 +87,7 @@
//5. purpose: getBytes with float Property
public void testGetBytesFromFloat() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float floatValue= 123;
dataObject.set(property, floatValue);
@@ -99,7 +101,7 @@
//6. purpose: getBytes with int Property
public void testGetBytesFromInt() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int intValue= 123;
dataObject.set(property, intValue);
@@ -112,7 +114,7 @@
//7. purpose: getBytes with long Property
public void testGetBytesFromLong() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long longValue = 123;
dataObject.set(property, longValue);
@@ -125,7 +127,7 @@
//8. purpose: getBytes with short Property
public void testGetBytesFromShort() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shortValue = 123;
dataObject.set(property, shortValue);
@@ -138,7 +140,7 @@
//9. purpose: getBytes with string Property
public void testGetBytesFromString() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
dataObject.set(property, ")A64");
try {
@@ -152,14 +154,14 @@
//10. purpose: getBytes with Defined Bytes Property
public void testGetBytesConversionFromDefinedBytesProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte[] b = { 12, 13 };
dataObject.setBytes(property, b);// add it to instance list
- this.assertTrue(Arrays.equals(b, dataObject.getBytes(property)));
+ assertTrue(Arrays.equals(b, dataObject.getBytes(property)));
}
//11. purpose: getBytes with Undefined Bytes Property
@@ -177,7 +179,7 @@
//12. purpose: getBytes with decimal property
public void testGetBytesFromDecimal() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
dataObject.set(property, new BigDecimal(2));
try {
@@ -190,7 +192,7 @@
//13. purpose: getBytes with Defined Bytes Property !! OX PRO !!
public void testGetBytesConversionFromDefinedIntegerProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bin = new BigInteger("12");
@@ -198,7 +200,7 @@
dataObject.setBigInteger(property, bin);// add it to instance list
byte[] b1 = dataObject.getBytes(property);
- this.assertTrue(Arrays.equals(b, b1));
+ assertTrue(Arrays.equals(b, b1));
}
//11. purpose: getBytes with Undefined Integer Property
@@ -216,7 +218,7 @@
//22. purpose: getBytes with date property
public void testGetBytesFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesConversionWithPathTest.java
index 822036e..4663b17 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import java.math.BigInteger;
import java.util.Arrays;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -187,7 +189,7 @@
dataObject_a.setBytes(propertyPath_a_b_c, b);// add it to instance list
- this.assertTrue(Arrays.equals(b, dataObject_a.getBytes(propertyPath_a_b_c)));
+ assertTrue(Arrays.equals(b, dataObject_a.getBytes(propertyPath_a_b_c)));
}
//11. purpose: getBytes with Undefined Bytes Property
@@ -235,7 +237,7 @@
dataObject_a.setBigInteger(propertyPath_a_b_c, bin);// add it to instance list
byte[] b1 = dataObject_a.getBytes(propertyPath_a_b_c);
- this.assertTrue(Arrays.equals(b, b1));
+ assertTrue(Arrays.equals(b, b1));
}
//11. purpose: getBytes with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesWithIndexConversionTest.java
index 60cb4d5..610d138 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetBytesWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,8 @@
import java.math.BigInteger;
import java.util.Arrays;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -37,7 +39,7 @@
//1. purpose: getBytes with Boolean property
public void testGetBytesFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -49,7 +51,7 @@
//2. purpose: getBytes with Byte property
public void testGetBytesFromByte() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
dataObject.set(property, new String("ddd").getBytes()[0]);
try {
@@ -61,7 +63,7 @@
//3. purpose: getBytes with character property
public void testGetBytesFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'd');
@@ -74,7 +76,7 @@
//4. purpose: getBytes with Double Property
public void testGetBytesFromDouble() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double doubleValue = 3;
dataObject.set(property, doubleValue);
@@ -88,7 +90,7 @@
//5. purpose: getBytes with float Property
public void testGetBytesFromFloat() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float floatValue = 3;
dataObject.set(property, floatValue);
@@ -103,7 +105,7 @@
//6. purpose: getBytes with int Property
public void testGetBytesFromInt() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
int intValue = 3;
dataObject.set(property, intValue);
@@ -117,7 +119,7 @@
//7. purpose: getBytes with long Property
public void testGetBytesFromLong() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long longValue = 3;
dataObject.set(property, longValue);
@@ -132,7 +134,7 @@
//8. purpose: getBytes with short Property
public void testGetBytesFromShort() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shortValue = 3;
@@ -148,7 +150,7 @@
//9. purpose: getBytes with string Property
public void testGetBytesFromString() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
dataObject.set(property, new String("0A64"));
@@ -164,14 +166,14 @@
//10. purpose: getBytes with Defined Bytes Property
public void testGetBytesConversionFromDefinedBytesProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte[] b = { 12, 13 };
dataObject.setBytes(PROPERTY_INDEX, b);// add it to instance list
- this.assertTrue(Arrays.equals(b, dataObject.getBytes(PROPERTY_INDEX)));
+ assertTrue(Arrays.equals(b, dataObject.getBytes(PROPERTY_INDEX)));
}
//11. purpose: getBytes with Undefined Property
@@ -186,7 +188,7 @@
//12. purpose: getBytes with decimal property
public void testGetBytesFromDecimal() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
dataObject.set(property, new BigDecimal(2));
@@ -200,7 +202,7 @@
//13. purpose: getBytes with Defined Bytes Property !! OX PRO !!
public void testGetBytesConversionFromDefinedIntegerProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bin = new BigInteger("12");
@@ -208,12 +210,12 @@
dataObject.setBigInteger(PROPERTY_INDEX, bin);// add it to instance list
- this.assertTrue(Arrays.equals(b, dataObject.getBytes(PROPERTY_INDEX)));
+ assertTrue(Arrays.equals(b, dataObject.getBytes(PROPERTY_INDEX)));
}
//22. purpose: getBytes with date property
public void testGetBytesFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterByPositionalPathTest.java
index bb36023..372a265 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterByPositionalPathTest.java
@@ -20,6 +20,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -36,7 +38,7 @@
//1. purpose: getChar with Boolean property
public void testGetCharacterFromBoolean() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(property, true);
@@ -49,7 +51,7 @@
//2. purpose: getChar with Byte property
public void testGetCharacterFromByte() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BYTE);
byte theValue = 10;
dataObject_c.set(property, theValue);
@@ -65,20 +67,20 @@
//3. purpose: getChar with Defined Character Property
public void testGetCharacterConversionFromDefinedCharacterProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_CHARACTER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_CHARACTER);
char b = '1';
dataObject_a.setChar(propertyPath_a_b_c, b);// add it to instance list
- this.assertEquals(b, dataObject_a.getChar(propertyPath_a_b_c));
+ assertEquals(b, dataObject_a.getChar(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetCharacterConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_CHARACTER);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_CHARACTER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
char bb = '1';
List b = new ArrayList();
@@ -87,15 +89,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setChar(property3, bb);
- this.assertEquals(bb, dataObject_a.getChar(property3));
+ assertEquals(bb, dataObject_a.getChar(property3));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetCharacterConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_CHARACTER);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_CHARACTER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
char bb = '1';
List b = new ArrayList();
@@ -103,19 +105,19 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setChar(property + ".0", bb);
- this.assertEquals(bb, dataObject_a.getChar(property + ".0"));
+ assertEquals(bb, dataObject_a.getChar(property + ".0"));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetCharacterConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_CHARACTER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_CHARACTER);
char bb = '1';
dataObject_a.setChar(property1, bb);// c dataobject's a property has value boolean 'true'
- this.assertEquals(bb, dataObject_a.getChar(property1));
+ assertEquals(bb, dataObject_a.getChar(property1));
}
/* public void testGetCharacterConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -147,7 +149,7 @@
//5. purpose: getChar with Double Property
public void testGetCharacterFromDouble() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_DOUBLE);
double theValue = 10;
dataObject_c.set(property, theValue);
@@ -163,7 +165,7 @@
//6. purpose: getChar with float Property
public void testGetCharacterFromFloat() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_FLOAT);
float theValue = 10;
dataObject_c.set(property, theValue);
@@ -179,7 +181,7 @@
//7. purpose: getChar with int Property
public void testGetCharacterFromInt() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_INT);
int theValue = 10;
dataObject_c.set(property, theValue);
@@ -195,7 +197,7 @@
//8. purpose: getChar with long Property
public void testGetCharacterFromLong() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_LONG);
long theValue = 10;
dataObject_c.set(property, theValue);
@@ -210,7 +212,7 @@
//9. purpose: getChar with short Property
public void testGetCharacterFromShort() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_SHORT);
short theValue = 10;
dataObject_c.set(property, theValue);
@@ -227,20 +229,20 @@
//10. purpose: getChar with Defined String Property
public void testGetCharacterConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
char str = 'c';
Character B_STR = Character.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, B_STR.toString());// add it to instance list
- this.assertEquals(str, dataObject_a.getChar(property));
+ assertEquals(str, dataObject_a.getChar(property));
}
//12. purpose: getChar with bytes property
public void testGetCharacterFromBytes() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BYTES);
dataObject_c.set(property, new byte[]{10, 100});;
@@ -253,7 +255,7 @@
//13. purpose: getChar with decimal property
public void testGetCharacterFromDecimal() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_DECIMAL);
BigDecimal theValue = new BigDecimal(10);
dataObject_c.set(property, theValue);
@@ -269,7 +271,7 @@
//14. purpose: getChar with integer property
public void testGetCharacterFromInteger() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger theValue = new BigInteger("10");
dataObject_c.set(property, theValue);
@@ -285,7 +287,7 @@
//22. purpose: getChar with date property
public void testGetCharacterFromDate() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_DATE);
dataObject_c.set(property, Calendar.getInstance().getTime());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionTest.java
index 57a36ed..e826594 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getChar with Boolean property
public void testGetCharacterFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -47,7 +49,7 @@
//2. purpose: getChar with Byte property
public void testGetCharacterFromByte() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte theValue = 1;
dataObject.set(property,theValue);
@@ -63,14 +65,14 @@
//3. purpose: getChar with Defined Character Property
public void testGetCharacterConversionFromDefinedCharacterProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
char b = '1';
dataObject.setChar(property, b);// add it to instance list
- this.assertEquals(b, dataObject.getChar(property));
+ assertEquals(b, dataObject.getChar(property));
}
//4. purpose: getChar with Undefined Boolean Property
@@ -88,7 +90,7 @@
//5. purpose: getChar with Double Property
public void testGetCharacterFromDouble() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double theValue = 1;
dataObject.set(property, theValue);
@@ -103,7 +105,7 @@
//6. purpose: getChar with float Property
public void testGetCharacterFromFloat() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float theValue = 1;
dataObject.set(property, theValue);
@@ -118,7 +120,7 @@
//7. purpose: getChar with int Property
public void testGetCharacterFromInt() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int theValue = 1;
dataObject.set(property, theValue);
@@ -133,7 +135,7 @@
//8. purpose: getChar with long Property
public void testGetCharacterFromLong() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long theValue = 1;
dataObject.set(property, theValue);
@@ -148,7 +150,7 @@
//9. purpose: getChar with short Property
public void testGetCharacterFromShort() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short theValue = 1;
dataObject.set(property, theValue);
@@ -164,14 +166,14 @@
//10. purpose: getChar with Defined String Property
public void testGetCharacterConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
char str = 'c';
Character B_STR = Character.valueOf(str);
dataObject.setString(property, B_STR.toString());// add it to instance list
- this.assertEquals(str, dataObject.getChar(property));
+ assertEquals(str, dataObject.getChar(property));
}
//11. purpose: getChar with Undefined boolean Property
@@ -189,7 +191,7 @@
//12. purpose: getChar with bytes property
public void testGetCharacterFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte[] bytes = new byte[]{10,100};
dataObject.set(property, bytes);
@@ -202,7 +204,7 @@
//13. purpose: getChar with decimal property
public void testGetCharacterFromDecimal() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
BigDecimal theValue = new BigDecimal(1);
dataObject.set(property, theValue);
@@ -217,7 +219,7 @@
//14. purpose: getChar with integer property
public void testGetCharacterFromInteger() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger theValue = new BigInteger("1");
@@ -233,7 +235,7 @@
//22. purpose: getChar with date property
public void testGetCharacterFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
@@ -255,7 +257,7 @@
//1. purpose: getChar with Boolean property
public void testGetCharacterObjectFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEANOBJECT);
dataObject.set(property, true);
try {
@@ -266,7 +268,7 @@
}
public void testGetCharacterFromByteObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
Byte theValue = Byte.valueOf("10");
dataObject.set(property, theValue);
@@ -281,7 +283,7 @@
public void testGetCharacterConversionFromDefinedCharacterObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
char b = '1';
@@ -290,7 +292,7 @@
}
public void testGetCharacterFromDoubleObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
Double theValue = Double.valueOf("1");
dataObject.set(property, theValue);
@@ -304,7 +306,7 @@
}
public void testGetCharacterFromFloatObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOATOBJECT);
Float theValue = Float.valueOf("1");
dataObject.set(property, theValue);
@@ -320,7 +322,7 @@
//7. purpose: getChar with int Property
public void testGetCharacterFromIntObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
Integer theValue = Integer.valueOf("1");
dataObject.set(property, theValue);
@@ -336,7 +338,7 @@
//8. purpose: getChar with long Property
public void testGetCharacterFromLongObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONGOBJECT);
Long theValue = Long.valueOf("1");
dataObject.set(property, theValue);
@@ -352,7 +354,7 @@
//9. purpose: getChar with short Property
public void testGetCharacterFromShortObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORTOBJECT);
Short theValue = Short.valueOf("1");
dataObject.set(property, theValue);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionWithPathTest.java
index 73a12d8..c9a65a5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterConversionWithPathTest.java
@@ -19,6 +19,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -83,7 +85,7 @@
dataObject_a.setChar(propertyPath_a_b_c, b);// add it to instance list
- this.assertEquals(b, dataObject_a.getChar(propertyPath_a_b_c));
+ assertEquals(b, dataObject_a.getChar(propertyPath_a_b_c));
}
//4. purpose: getChar with Undefined Character Property
@@ -204,7 +206,7 @@
Character B_STR = Character.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, B_STR.toString());// add it to instance list
- this.assertEquals(str, dataObject_a.getChar(property));
+ assertEquals(str, dataObject_a.getChar(property));
}
//11. purpose: getChar with Undefined boolean Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterWithIndexConversionTest.java
index 27c9c2e..26b8df6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetCharacterWithIndexConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getChar with Boolean property
public void testGetCharacterFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, false);
@@ -50,7 +52,7 @@
//2. purpose: getChar with Byte property
public void testGetCharacterFromByte() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte theValue = 2;
dataObject.set(property,theValue);
@@ -75,7 +77,7 @@
dataObject.setChar(PROPERTY_INDEX, b);// add it to instance list
- this.assertEquals(b, dataObject.getChar(PROPERTY_INDEX));
+ assertEquals(b, dataObject.getChar(PROPERTY_INDEX));
}
//4. purpose: getChar with Undefined Boolean Property
@@ -91,7 +93,7 @@
//5. purpose: getChar with Double Property
public void testGetCharacterFromDouble() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double theValue = 10;
dataObject.set(property, theValue);
@@ -106,7 +108,7 @@
//6. purpose: getChar with float Property
public void testGetCharacterFromFloat() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float theValue = 10;
dataObject.set(property, theValue);
@@ -121,7 +123,7 @@
//7. purpose: getChar with int Property
public void testGetCharacterFromInt() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int theValue = 10;
dataObject.set(property, theValue);
@@ -136,7 +138,7 @@
//8. purpose: getChar with long Property
public void testGetCharacterFromLong() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long theValue = 10;
dataObject.set(property, theValue);
@@ -151,7 +153,7 @@
//9. purpose: getChar with short Property
public void testGetCharacterFromShort() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short theValue = 10;
dataObject.set(property, theValue);
@@ -176,12 +178,12 @@
Character B_STR = Character.valueOf(str);
dataObject.setString(PROPERTY_INDEX, B_STR.toString());// add it to instance list
- this.assertEquals(str, dataObject.getChar(PROPERTY_INDEX));
+ assertEquals(str, dataObject.getChar(PROPERTY_INDEX));
}
//12. purpose: getChar with bytes property
public void testGetCharacterFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new byte[]{10, 100});
try {
@@ -193,7 +195,7 @@
//13. purpose: getChar with decimal property
public void testGetCharacterFromDecimal() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
BigDecimal theValue = new BigDecimal(10);
dataObject.set(property, theValue);
@@ -208,7 +210,7 @@
//14. purpose: getChar with integer property
public void testGetCharacterFromInteger() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger theValue = new BigInteger("10");
dataObject.set(property, theValue);
@@ -223,7 +225,7 @@
//22. purpose: getChar with date property
public void testGetCharacterFromDate() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectByPositionalPathTest.java
index 79d75f8..d820d0b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectByPositionalPathTest.java
@@ -17,6 +17,8 @@
import commonj.sdo.DataObject;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -36,8 +38,8 @@
// purpose: pass a/b, to get dataObjcet c
public void testGetDataObjectConversionFromDefinedProperty() {
- this.assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b.0"));
- this.assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b[1]"));
+ assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b.0"));
+ assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b[1]"));
}
// purpose: opencontent properties
@@ -67,7 +69,7 @@
dataObject_b.set(property, objects);// add it to instance list
dataObject_a.setDataObject("PName-a/openTest[1]", b);
- this.assertEquals(b, dataObject_a.getDataObject("PName-a/openTest[number=1]"));
+ assertEquals(b, dataObject_a.getDataObject("PName-a/openTest[number=1]"));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -75,8 +77,8 @@
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(dataObjectType);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(dataObjectType);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
SDODataObject bb = new SDODataObject();
List b = new ArrayList();
@@ -85,7 +87,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDataObject(property3, bb);
- this.assertEquals(bb, dataObject_a.getDataObject(property3));
+ assertEquals(bb, dataObject_a.getDataObject(property3));
}
@@ -94,8 +96,8 @@
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(dataObjectType);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(dataObjectType);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
SDODataObject bb = new SDODataObject();
List b = new ArrayList();
@@ -103,7 +105,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDataObject(property + ".0", bb);
- this.assertEquals(bb, dataObject_a.getDataObject(property + ".0"));
+ assertEquals(bb, dataObject_a.getDataObject(property + ".0"));
}
@@ -111,18 +113,18 @@
public void testGetDataObjectConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(dataObjectType);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(dataObjectType);
SDODataObject bb = new SDODataObject();
dataObject_a.setDataObject(property1, bb);// c dataobject's a property has value boolean 'true'
- this.assertEquals(bb, dataObject_a.getDataObject(property1));
+ assertEquals(bb, dataObject_a.getDataObject(property1));
}
//2. purpose: getDataObject with property value is not dataobject
public void testGetDataObjectConversionFromUndefinedProperty() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BOOLEAN);
boolean c = true;
Boolean C = Boolean.valueOf(c);
@@ -139,7 +141,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -149,6 +151,6 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionTest.java
index 4a8e6f0..bd518a5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,6 +15,7 @@
package org.eclipse.persistence.testing.sdo.model.dataobject;
import commonj.sdo.Property;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -35,28 +36,28 @@
public void testGetDataObjectConversionFromDefinedProperty() {
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(dataObjectType);
SDODataObject b = new SDODataObject();
dataObject.setDataObject(property, b);// add it to instance list
- this.assertEquals(b, dataObject.getDataObject(property));
+ assertEquals(b, dataObject.getDataObject(property));
}
public void testGetDataObjectConversionFromDefinedPropertyWithPath() {
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(dataObjectType);
SDODataObject b = new SDODataObject();
dataObject.setDataObject(PROPERTY_NAME, b);// add it to instance list
- this.assertEquals(b, dataObject.getDataObject(property));
+ assertEquals(b, dataObject.getDataObject(property));
}
//2. purpose: getDataObject with Undefined Boolean Property
@@ -79,7 +80,7 @@
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(dataObjectType);
type.setOpen(true);
@@ -107,7 +108,7 @@
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME));
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(dataObjectType);
type.addDeclaredProperty(property);
type.setOpen(true);
@@ -116,7 +117,7 @@
dataObject.setDataObject(PROPERTY_INDEX, b);// add it to instance list
- this.assertEquals(b, dataObject.getDataObject(PROPERTY_INDEX));
+ assertEquals(b, dataObject.getDataObject(PROPERTY_INDEX));
}
//purpose: getDouble with nul value
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionWithPathTest.java
index 368c141..cbb696f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDataObjectConversionWithPathTest.java
@@ -15,6 +15,7 @@
package org.eclipse.persistence.testing.sdo.model.dataobject;
import commonj.sdo.Property;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -33,7 +34,7 @@
// purpose: pass a/b, to get dataObjcet c
public void testGetDataObjectConversionFromDefinedProperty() {
- this.assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b"));
+ assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b"));
}
// purpose: opencontent properties
@@ -50,7 +51,7 @@
dataObject_b.setDataObject(property, b);// add it to instance list
- this.assertEquals(b, dataObject_a.getDataObject("PName-a/openTest"));
+ assertEquals(b, dataObject_a.getDataObject("PName-a/openTest"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -76,7 +77,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -86,6 +87,6 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateByPositionalPathTest.java
index 378bf67..104713c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -21,6 +21,7 @@
import java.util.List;
import java.util.TimeZone;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -37,7 +38,7 @@
//1. purpose: getDate with Boolean property
public void testGetDateFromBooleane() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(property_c, "true");
try {
dataObject_a.getDate(propertyPath_a_b_c);
@@ -104,14 +105,14 @@
//8. purpose: getDate with Defined long Property
public void testGetDateConversionFromDefinedLongProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long l = 12;
Date d = new Date(l);
dataObject_c.setLong(property_c, l);// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
}
//10. purpose: getDate with short Property
@@ -128,7 +129,7 @@
//11. purpose: getDate with Defined String Property
public void testGetDateConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
;
Calendar controlCalendar = Calendar.getInstance();
controlCalendar.clear();
@@ -140,14 +141,14 @@
dataObject_c.setString(property_c, "2001-01-01");// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
}
//11. purpose: getDate with Defined String Property
public void testGetDateConversionFromDefinedStringPropertyList() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
Calendar controlCalendar = Calendar.getInstance();
controlCalendar.clear();
@@ -161,7 +162,7 @@
objects.add("2001-01-01");
dataObject_c.set(property_c, objects);// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c + ".0"));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c + ".0"));
}
//13. purpose: getDate with bytes property
@@ -177,7 +178,7 @@
//14. purpose: getBoolean with decimal property
public void testGetBooleanFromDecimal() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_DECIMAL);
dataObject_c.set(property_c, new BigDecimal(15));
try {
@@ -203,20 +204,20 @@
//16. purpose: getDate with Defined Date Property
public void testGetDateConversionFromDefinedDateProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DATE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DATE);
long l = 12000;
Date d = new Date(l);
dataObject_a.setDate(propertyPath_a_b_c, d);// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetDateConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DATE);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DATE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
long l = 12000;
Date d = new Date(l);
@@ -226,15 +227,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDate(property3, d);
- this.assertEquals(d, dataObject_a.getDate(property3));
+ assertEquals(d, dataObject_a.getDate(property3));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetDateConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DATE);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DATE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
long l = 12000;
Date d = new Date(l);
@@ -243,20 +244,20 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDate(property + ".0", d);
- this.assertEquals(d, dataObject_a.getDate(property + ".0"));
+ assertEquals(d, dataObject_a.getDate(property + ".0"));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DATE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DATE);
long l = 12000;
Date d = new Date(l);
dataObject_a.setDate(property1, d);// c dataobject's a property has value boolean 'true'
- this.assertEquals(d, dataObject_a.getDate(property1));
+ assertEquals(d, dataObject_a.getDate(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionTest.java
index 6f6f166..391e7e0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionTest.java
@@ -20,6 +20,7 @@
import java.util.Date;
import java.util.TimeZone;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -38,7 +39,7 @@
//1. purpose: getDate with Boolean property
public void testGetDateFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -50,7 +51,7 @@
//2. purpose: getDate with Byte property
public void testGetDateFromByte() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
dataObject.set(property, new String("Abc").getBytes()[0]);
try {
@@ -62,7 +63,7 @@
//3. purpose: getDate with character property
public void testGetDateFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, 'c');
try {
@@ -74,7 +75,7 @@
//4. purpose: getDate with Double Property
public void testGetDateFromDouble() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double doubleValue = 2;
dataObject.set(property, doubleValue);
@@ -87,7 +88,7 @@
//5. purpose: getDate with float Property
public void testGetDateFromFloat() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float floatValue = 2;
dataObject.set(property, floatValue);
@@ -100,7 +101,7 @@
//7. purpose: getDate with int Property
public void testGetDateFromInt() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int intValue = 2;
dataObject.set(property, intValue);
@@ -114,7 +115,7 @@
//8. purpose: getDate with Defined long Property
public void testGetDateConversionFromDefinedLongProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long l = 12;
@@ -122,7 +123,7 @@
dataObject.setLong(property, l);// add it to instance list
- this.assertEquals(d, dataObject.getDate(property));
+ assertEquals(d, dataObject.getDate(property));
}
//9. purpose: getDate with Undefined Boolean Property
@@ -130,7 +131,7 @@
SDOProperty property = new SDOProperty(aHelperContext);
property.setName(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
- ((SDOType)dataObject.getType()).setOpen(true);
+ dataObject.getType().setOpen(true);
try {
Date value = dataObject.getDate(property);
assertEquals(null, value);
@@ -140,7 +141,7 @@
//10. purpose: getDate with short Property
public void testGetDateFromShort() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shortValue = 2;
dataObject.set(property, shortValue);
@@ -154,7 +155,7 @@
//11. purpose: getDate with Defined String Property
public void testGetDateConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
Calendar controlCalendar = Calendar.getInstance();
@@ -167,7 +168,7 @@
dataObject.setString(property, "2001-01-01");// add it to instance list
- this.assertEquals(d, dataObject.getDate(property));
+ assertEquals(d, dataObject.getDate(property));
}
//12. purpose: getDate with Undefined string Property
@@ -185,7 +186,7 @@
//13. purpose: getDate with bytes property
public void testGetDateFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("abcd").getBytes());
try {
@@ -197,7 +198,7 @@
//14. purpose: getBoolean with decimal property
public void testGetDateFromDecimal() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
dataObject.set(property, new BigDecimal(2));
try {
@@ -209,7 +210,7 @@
//15. purpose: getDate with integer property
public void testGetDateFromInteger() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
dataObject.set(property, Integer.valueOf(2));
try {
@@ -222,14 +223,14 @@
//16. purpose: getDate with Defined Date Property
public void testGetDateConversionFromDefinedDateProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
long l = 12000;
Date d = new Date(l);
dataObject.setDate(property, d);// add it to instance list
- this.assertEquals(d, dataObject.getDate(property));
+ assertEquals(d, dataObject.getDate(property));
}
//12. purpose: getDate with Undefined string Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionWithPathTest.java
index 4f6ea62..7074ea9 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateConversionWithPathTest.java
@@ -19,6 +19,7 @@
import java.util.Date;
import java.util.TimeZone;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -142,7 +143,7 @@
dataObject_c.setLong(property_c, l);// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
}
//9. purpose: getDate with Undefined Boolean Property
@@ -195,7 +196,7 @@
dataObject_a.setString(propertyPath_a_b_c, "2001-01-01");// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
}
//12. purpose: getDate with Undefined string Property
@@ -274,7 +275,7 @@
Date d = new Date(l);
dataObject_a.setDate(propertyPath_a_b_c, d);// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
}
//12. purpose: getDate with Undefined string Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateWithIndexConversionTest.java
index 0134610..f5e133c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDateWithIndexConversionTest.java
@@ -20,6 +20,7 @@
import java.util.Date;
import java.util.TimeZone;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -37,7 +38,7 @@
//1. purpose: getDate with Boolean property
public void testGetDateFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -49,7 +50,7 @@
//2. purpose: getDate with Byte property
public void testGetDateFromByte() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
dataObject.set(property, new String("eee").getBytes()[0]);
try {
@@ -61,7 +62,7 @@
//3. purpose: getDate with character property
public void testGetDateFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'c');
try {
@@ -73,7 +74,7 @@
//4. purpose: getDate with Double Property
public void testGetDateFromDouble() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double doubleValue =3;
dataObject.set(property, doubleValue);
@@ -86,7 +87,7 @@
//5. purpose: getDate with float Property
public void testGetDateFromFloat() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float floatValue = 3;
dataObject.set(property, floatValue);
@@ -99,7 +100,7 @@
//7. purpose: getDate with int Property
public void testGetDateFromInt() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int intValue = 3;
dataObject.set(property, intValue);
@@ -113,7 +114,7 @@
//8. purpose: getDate with Defined long Property
public void testGetDateConversionFromDefinedLongProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long l = 12;
@@ -121,7 +122,7 @@
dataObject.setLong(PROPERTY_INDEX, l);// add it to instance list
- this.assertEquals(d, dataObject.getDate(PROPERTY_INDEX));
+ assertEquals(d, dataObject.getDate(PROPERTY_INDEX));
}
//9. purpose: getDate with Undefined Boolean Property
@@ -135,7 +136,7 @@
//10. purpose: getDate with short Property
public void testGetDateFromShort() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shortValue = 3;
dataObject.set(property, shortValue);
@@ -149,7 +150,7 @@
//11. purpose: getDate with Defined String Property
public void testGetDateConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
Calendar controlCalendar = Calendar.getInstance();
@@ -162,7 +163,7 @@
dataObject.setString(property, "2001-01-01");// add it to instance list
- this.assertEquals(d, dataObject.getDate(PROPERTY_INDEX));
+ assertEquals(d, dataObject.getDate(PROPERTY_INDEX));
}
//12. purpose: getDate with Undefined string Property
@@ -176,7 +177,7 @@
//13. purpose: getDate with bytes property
public void testGetDateFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("eee").getBytes());
try {
@@ -188,7 +189,7 @@
//14. purpose: getBoolean with decimal property
public void testGetDateFromDecimal() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
dataObject.set(property, new BigDecimal(11));
try {
@@ -200,7 +201,7 @@
//15. purpose: getDate with integer property
public void testGetDateFromInteger() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
dataObject.set(property, Integer.valueOf(2));
try {
@@ -213,14 +214,14 @@
//16. purpose: getDate with Defined Date Property
public void testGetDateConversionFromDefinedDateProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
long l = 12000;
Date d = new Date(l);
dataObject.setDate(PROPERTY_INDEX, d);// add it to instance list
- this.assertEquals(d, dataObject.getDate(PROPERTY_INDEX));
+ assertEquals(d, dataObject.getDate(PROPERTY_INDEX));
}
//12. purpose: getDate with Undefined string Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalByPositionalPathTest.java
index bc67954..8391e13 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -35,7 +37,7 @@
//1. purpose: getBigDecimal with boolean property
public void testGetDecimalFromBoolean() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(prop, true);
try {
@@ -48,7 +50,7 @@
//2. purpose: getBigDecimal with byte property
public void testGetDecimalFromByte() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BYTE);
byte theByte = 100;
dataObject_c.set(prop, theByte);
@@ -65,7 +67,7 @@
//3. purpose: getBigDecimal with character property
public void testGetDecimalFromCharacter() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_CHARACTER);
dataObject_c.set(prop, 'e');
@@ -79,71 +81,71 @@
//5. purpose: getBigDecimal with Defined Double Property
public void testGetDecimalConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
double db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//7. purpose: getBigDecimal with Defined float Property
public void testGetIntConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
float fl = 12;
BigDecimal bd = new BigDecimal(fl);
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//9. purpose: getBigDecimal with Defined int Property
public void testGetDecimalConversionFromDefinedIntProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
int in = 12;
BigDecimal bd = new BigDecimal(in);
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//11. purpose: getBigDecimal with Defined long Property
public void testGetDecimalConversionFromDefinedLongProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long lg = 12;
BigDecimal bd = new BigDecimal(lg);
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//14. purpose: getBigDecimal with Defined String Property
public void testGetDecimalConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
BigDecimal bd = new BigDecimal(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(property));
+ assertEquals(bd, dataObject_a.getBigDecimal(property));
}
//17. purpose: getBigDecimal with bytes property
public void testGetDecimalFromBytes() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BYTES);
dataObject_c.set(prop, new String("eee").getBytes());
@@ -157,20 +159,20 @@
//18. purpose: getBigDecimal with Defined Decimal Property
public void testGetDecimalConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
int db = 12;
BigDecimal bd = new BigDecimal(db);
@@ -180,15 +182,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigDecimal(property3, bd);
- this.assertEquals(bd, dataObject_a.getBigDecimal(property3));
+ assertEquals(bd, dataObject_a.getBigDecimal(property3));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
int db = 12;
BigDecimal bd = new BigDecimal(db);
@@ -197,20 +199,20 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigDecimal(property + ".0", bd);
- this.assertEquals(bd, dataObject_a.getBigDecimal(property + ".0"));
+ assertEquals(bd, dataObject_a.getBigDecimal(property + ".0"));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(property1, bd);// c dataobject's a property has value boolean 'true'
- this.assertEquals(bd, dataObject_a.getBigDecimal(property1));
+ assertEquals(bd, dataObject_a.getBigDecimal(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -244,20 +246,20 @@
//20. purpose: getDecimal with Defined integer Property
public void testGetDecimalConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
BigDecimal bd = new BigDecimal(bi);
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//22. purpose: getBigDecimal with date property
public void testGetDecimalFromDate() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_DATE);
dataObject_c.set(prop, Calendar.getInstance().getTime());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionTest.java
index f6433d5..6763319 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getBigDecimal with boolean property
public void testGetDecimalFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -47,7 +49,7 @@
//2. purpose: getBigDecimal with byte property
public void testGetDecimalFromByte() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte theByte = 10;
dataObject.set(property, theByte);
@@ -62,7 +64,7 @@
//3. purpose: getBigDecimal with character property
public void testGetDecimalFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, Character.valueOf('y'));
try {
@@ -75,14 +77,14 @@
//5. purpose: getBigDecimal with Defined Double Property
public void testGetDecimalConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(property));
+ assertEquals(bd, dataObject.getBigDecimal(property));
}
//6. purpose: getBigDecimal with Undefined Double Property
@@ -101,14 +103,14 @@
//7. purpose: getBigDecimal with Defined float Property
public void testGetIntConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
BigDecimal bd = new BigDecimal(fl);
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(property));
+ assertEquals(bd, dataObject.getBigDecimal(property));
}
//8. purpose: getBigDecimal with Undefined float Property
@@ -127,14 +129,14 @@
//9. purpose: getBigDecimal with Defined int Property
public void testGetDecimalConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
BigDecimal bd = new BigDecimal(in);
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(property));
+ assertEquals(bd, dataObject.getBigDecimal(property));
}
//10. purpose: getBigDecimal with Undefined int Property
@@ -153,14 +155,14 @@
//11. purpose: getBigDecimal with Defined long Property
public void testGetDecimalConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
BigDecimal bd = new BigDecimal(lg);
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(property));
+ assertEquals(bd, dataObject.getBigDecimal(property));
}
//12. purpose: getBigDecimal with Undefined long Property
@@ -178,7 +180,7 @@
//13. purpose: getBigDecimal with Undefined short Property
public void testGetDecimalConversionFromUnDefinedShortProperty() {
- ((SDOType)dataObject.getType()).setOpen(true);
+ dataObject.getType().setOpen(true);
SDOProperty property = new SDOProperty(aHelperContext);
property.setName(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
@@ -196,14 +198,14 @@
//14. purpose: getBigDecimal with Defined String Property
public void testGetDecimalConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
BigDecimal bd = new BigDecimal(str);
dataObject.setString(property, str);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(property));
+ assertEquals(bd, dataObject.getBigDecimal(property));
}
//15. purpose: getBigDecimal with Undefined string Property
@@ -221,7 +223,7 @@
//17. purpose: getBigDecimal with bytes property
public void testGetDecimalFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("rty").getBytes());
try {
@@ -234,14 +236,14 @@
//18. purpose: getBigDecimal with Defined Decimal Property
public void testGetDecimalConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject.setBigDecimal(property, bd);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(property));
+ assertEquals(bd, dataObject.getBigDecimal(property));
}
//19. purpose: getBigDecimal with Undefined decimal Property
@@ -260,14 +262,14 @@
//20. purpose: getDecimal with Defined integer Property
public void testGetDecimalConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
BigDecimal bd = new BigDecimal(bi);
dataObject.setBigInteger(property, bi);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(property));
+ assertEquals(bd, dataObject.getBigDecimal(property));
}
//21. purpose: getBigDecimal with Undefined Integer Property
@@ -285,7 +287,7 @@
//22. purpose: getBigDecimal with date property
public void testGetDecimalFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionWithpathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionWithpathTest.java
index 33e823a..04c3c54 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionWithpathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalConversionWithpathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -92,7 +94,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//6. purpose: getBigDecimal with Undefined Double Property
@@ -123,7 +125,7 @@
BigDecimal bd = new BigDecimal(fl);
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//8. purpose: getBigDecimal with Undefined float Property
@@ -154,7 +156,7 @@
BigDecimal bd = new BigDecimal(in);
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//10. purpose: getBigDecimal with Undefined int Property
@@ -185,7 +187,7 @@
BigDecimal bd = new BigDecimal(lg);
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//12. purpose: getBigDecimal with Undefined long Property
@@ -231,7 +233,7 @@
BigDecimal bd = new BigDecimal(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(property));
+ assertEquals(bd, dataObject_a.getBigDecimal(property));
}
//15. purpose: getBigDecimal with Undefined string Property
@@ -277,7 +279,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//19. purpose: getBigDecimal with Undefined decimal Property
@@ -308,7 +310,7 @@
BigDecimal bd = new BigDecimal(bi);
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//21. purpose: getBigDecimal with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalWithIndexConversionTest.java
index 2531118..30706af 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDecimalWithIndexConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getBigDecimal with boolean property
public void testGetDecimalFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -47,7 +49,7 @@
//2. purpose: getBigDecimal with byte property
public void testGetDecimalFromByte() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte theByte = 7;
dataObject.set(property, theByte);
@@ -62,7 +64,7 @@
//3. purpose: getBigDecimal with character property
public void testGetDecimalFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'k');
try {
@@ -75,20 +77,20 @@
//5. purpose: getBigDecimal with Defined Double Property
public void testGetDecimalConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject.setDouble(PROPERTY_INDEX, db);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
}
//7. purpose: getBigDecimal with Defined float Property
public void testGetIntConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_INDEX);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_INDEX);
property.setName(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
@@ -96,51 +98,51 @@
BigDecimal bd = new BigDecimal(fl);
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
}
//9. purpose: getBigDecimal with Defined int Property
public void testGetDecimalConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
BigDecimal bd = new BigDecimal(in);
dataObject.setInt(PROPERTY_INDEX, in);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
}
//11. purpose: getBigDecimal with Defined long Property
public void testGetDecimalConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
BigDecimal bd = new BigDecimal(lg);
dataObject.setLong(PROPERTY_INDEX, lg);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
}
//14. purpose: getBigDecimal with Defined String Property
public void testGetDecimalConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
BigDecimal bd = new BigDecimal(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
}
//17. purpose: getBigDecimal with bytes property
public void testGetDecimalFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("eee").getBytes());
try {
@@ -153,14 +155,14 @@
//18. purpose: getBigDecimal with Defined Decimal Property
public void testGetDecimalConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject.setBigDecimal(PROPERTY_INDEX, bd);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
}
//19. purpose: getBigDecimal with Undefined decimal Property
@@ -178,19 +180,19 @@
//20. purpose: getDecimal with Defined integer Property
public void testGetDecimalConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
BigDecimal bd = new BigDecimal(bi);
dataObject.setBigInteger(PROPERTY_INDEX, bi);// add it to instance list
- this.assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigDecimal(PROPERTY_INDEX));
}
//22. purpose: getBigDecimal with date property
public void testGetDecimalFromDate() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleByPositionalPathTest.java
index 1234f8c..b001c0e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleByPositionalPathTest.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -35,7 +37,7 @@
//1. purpose: getDouble with boolean property
public void testGetDoubleFromBoolean() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(property, true);
@@ -49,7 +51,7 @@
//2. purpose: getDouble with Defined Byte Property
public void testGetDoubleConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTE);
byte by = 12;
@@ -57,7 +59,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((double)by, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(by, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//3. purpose: getDouble with Undefined Byte Property
@@ -71,7 +73,7 @@
//4. purpose: getDouble with character property
public void testGetDoubleFromCharacter() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject_c.set(property, 'e');
@@ -85,20 +87,20 @@
//5. purpose: getDouble with Defined Double Property
public void testGetDoubleConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
double db = 12;
double delta = 0.0;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((double)db, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(db, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
double db = 12;
double delta = 0.0;
@@ -108,15 +110,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDouble(property3, db);
- this.assertEquals(db, dataObject_a.getDouble(property3), delta);
+ assertEquals(db, dataObject_a.getDouble(property3), delta);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
double db = 12;
double delta = 0.0;
@@ -125,19 +127,19 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDouble(property + ".0", db);
- this.assertEquals(db, dataObject_a.getDouble(property + ".0"), delta);
+ assertEquals(db, dataObject_a.getDouble(property + ".0"), delta);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
-((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
+dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
double db = 12;
double delta = 0.0;
dataObject_a.setDouble(property1, db);// c dataobject's a property has value boolean 'true'
- this.assertEquals(db, dataObject_a.getDouble(property1), delta);
+ assertEquals(db, dataObject_a.getDouble(property1), delta);
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -163,52 +165,52 @@
//7. purpose: getDouble with Defined float Property
public void testGetDoubleConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
float fl = 12;
double delta = 0.0;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((double)fl, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(fl, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//9. purpose: getDouble with Defined int Property
public void testGetDoubleConversionFromDefinedIntProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
int in = 12;
double delta = 0.0;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((double)in, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(in, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//11. purpose: getDouble with Defined long Property
public void testGetDoubleConversionFromDefinedLongProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long lg = 12;
double delta = 0.0;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((double)lg, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals((double)lg, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//13. purpose: getDouble with Defined short Property
public void testGetDoubleConversionFromDefinedShortProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
short shr = 12;
double delta = 0.0;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((double)shr, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(shr, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
@@ -216,19 +218,19 @@
//15. purpose: getDouble with Defined String Property
public void testGetDoubleConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
Double s_d = Double.valueOf(str);
double delta = 0.0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(s_d.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//17. purpose: getDouble with bytes property
public void testGetDoubleFromBytes() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BYTES);
dataObject_c.set(property, new byte[]{10, 100});
@@ -242,14 +244,14 @@
//18. purpose: getDouble with Defined Decimal Property
public void testGetDoubleConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
double db = 12;
BigDecimal bd = new BigDecimal(db);
double delta = 0.0;
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(bd.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
@@ -258,18 +260,18 @@
// dataObject's type add int property
// !! OX PRO BIGINTEGER TO DOUBLE !!
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
double delta = 0.0;
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(bi.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//22. purpose: getDouble with date property
public void testGetDoubleFromDate() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_DATE);
dataObject_c.set(property, Calendar.getInstance().getTime());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionTest.java
index 5e1aa3b..10cde1b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -34,7 +36,7 @@
//1. purpose: getDouble with boolean property
public void testGetDoubleFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -49,7 +51,7 @@
//2. purpose: getDouble with Defined Byte Property
public void testGetDoubleConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
@@ -57,7 +59,7 @@
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((double)by, dataObject.getDouble(property), delta);
+ assertEquals(by, dataObject.getDouble(property), delta);
}
//3. purpose: getDouble with Undefined Byte Property
@@ -75,7 +77,7 @@
//4. purpose: getDouble with character property
public void testGetDoubleFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'e');
try {
@@ -88,14 +90,14 @@
//5. purpose: getDouble with Defined Double Property
public void testGetDoubleConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
double delta = 0.0;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((double)db, dataObject.getDouble(property), delta);
+ assertEquals(db, dataObject.getDouble(property), delta);
}
//6. purpose: getDouble with Undefined Double Property
@@ -114,14 +116,14 @@
//7. purpose: getDouble with Defined float Property
public void testGetDoubleConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
double delta = 0.0;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((double)fl, dataObject.getDouble(property), delta);
+ assertEquals(fl, dataObject.getDouble(property), delta);
}
//8. purpose: getDouble with Undefined float Property
@@ -140,14 +142,14 @@
//9. purpose: getDouble with Defined int Property
public void testGetDoubleConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
double delta = 0.0;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((double)in, dataObject.getDouble(property), delta);
+ assertEquals(in, dataObject.getDouble(property), delta);
}
//10. purpose: getDouble with Undefined int Property
@@ -166,14 +168,14 @@
//11. purpose: getDouble with Defined long Property
public void testGetDoubleConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
double delta = 0.0;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((double)lg, dataObject.getDouble(property), delta);
+ assertEquals((double)lg, dataObject.getDouble(property), delta);
}
//12. purpose: getDouble with Undefined long Property
@@ -192,14 +194,14 @@
//13. purpose: getDouble with Defined short Property
public void testGetDoubleConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
double delta = 0.0;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((double)shr, dataObject.getDouble(property), delta);
+ assertEquals(shr, dataObject.getDouble(property), delta);
}
//14. purpose: getDouble with Undefined short Property
@@ -218,7 +220,7 @@
//15. purpose: getDouble with Defined String Property
public void testGetDoubleConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
@@ -226,7 +228,7 @@
double delta = 0.0;
dataObject.setString(property, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject.getDouble(property), delta);
+ assertEquals(s_d.doubleValue(), dataObject.getDouble(property), delta);
}
//16. purpose: getDouble with Undefined string Property
@@ -244,7 +246,7 @@
//17. purpose: getDouble with bytes property
public void testGetDoubleFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte[] bytes = new byte[]{10,100};
dataObject.set(property, bytes);
@@ -258,7 +260,7 @@
//18. purpose: getDouble with Defined Decimal Property
public void testGetDoubleConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
double db = 12;
@@ -266,7 +268,7 @@
double delta = 0.0;
dataObject.setBigDecimal(property, bd);// add it to instance list
- this.assertEquals(bd.doubleValue(), dataObject.getDouble(property), delta);
+ assertEquals(bd.doubleValue(), dataObject.getDouble(property), delta);
}
//19. purpose: getDouble with Undefined decimal Property
@@ -285,14 +287,14 @@
//20. purpose: getDouble with Defined integer Property
public void testGetDoubleConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
double delta = 0.0;
dataObject.setBigInteger(property, bi);// add it to instance list
- this.assertEquals(bi.doubleValue(), dataObject.getDouble(property), delta);
+ assertEquals(bi.doubleValue(), dataObject.getDouble(property), delta);
}
//21. purpose: getDouble with Undefined Integer Property
@@ -310,7 +312,7 @@
//22. purpose: getDouble with date property
public void testGetDoubleFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
@@ -331,7 +333,7 @@
}
public void testGetDoubleFromBooleanObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEANOBJECT);
dataObject.set(property, false);
try {
@@ -344,7 +346,7 @@
//2. purpose: getDouble with Defined Byte Property
public void testGetDoubleConversionFromDefinedBytePObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
byte by = 12;
@@ -352,11 +354,11 @@
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((double)by, dataObject.getDouble(property), delta);
+ assertEquals(by, dataObject.getDouble(property), delta);
}
public void testGetDoubleFromCharacterObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
dataObject.set(property, 'e');
try {
@@ -369,65 +371,65 @@
//5. purpose: getDouble with Defined Double Property
public void testGetDoubleConversionFromDefinedDoubleObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
double db = 12;
double delta = 0.0;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((double)db, dataObject.getDouble(property), delta);
+ assertEquals(db, dataObject.getDouble(property), delta);
}
//7. purpose: getDouble with Defined float Property
public void testGetDoubleConversionFromDefinedFloatObject() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOATOBJECT);
float fl = 12;
double delta = 0.0;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((double)fl, dataObject.getDouble(property), delta);
+ assertEquals(fl, dataObject.getDouble(property), delta);
}
//9. purpose: getDouble with Defined int Property
public void testGetDoubleConversionFromDefinedIntObject() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
int in = 12;
double delta = 0.0;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((double)in, dataObject.getDouble(property), delta);
+ assertEquals(in, dataObject.getDouble(property), delta);
}
//11. purpose: getDouble with Defined long Property
public void testGetDoubleConversionFromDefinedLongObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONGOBJECT);
long lg = 12;
double delta = 0.0;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((double)lg, dataObject.getDouble(property), delta);
+ assertEquals((double)lg, dataObject.getDouble(property), delta);
}
//13. purpose: getDouble with Defined short Property
public void testGetDoubleConversionFromDefinedShortObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORTOBJECT);
short shr = 12;
double delta = 0.0;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((double)shr, dataObject.getDouble(property), delta);
+ assertEquals(shr, dataObject.getDouble(property), delta);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionWithPathTest.java
index 776f0dc..8699730 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleConversionWithPathTest.java
@@ -19,6 +19,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -62,7 +64,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((double)by, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(by, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//3. purpose: getDouble with Undefined Byte Property
@@ -108,7 +110,7 @@
double delta = 0.0;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((double)db, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(db, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//6. purpose: getDouble with Undefined Double Property
@@ -139,7 +141,7 @@
double delta = 0.0;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((double)fl, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(fl, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//8. purpose: getDouble with Undefined float Property
@@ -170,7 +172,7 @@
double delta = 0.0;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((double)in, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(in, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//10. purpose: getDouble with Undefined int Property
@@ -201,7 +203,7 @@
double delta = 0.0;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((double)lg, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals((double)lg, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//12. purpose: getDouble with Undefined long Property
@@ -232,7 +234,7 @@
double delta = 0.0;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((double)shr, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(shr, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//14. purpose: getDouble with Undefined short Property
@@ -264,7 +266,7 @@
double delta = 0.0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(s_d.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//16. purpose: getDouble with Undefined string Property
@@ -311,7 +313,7 @@
double delta = 0.0;
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(bd.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//19. purpose: getDouble with Undefined decimal Property
@@ -342,7 +344,7 @@
double delta = 0.0;
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(bi.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//21. purpose: getDouble with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleWithIndexConversionTest.java
index 9e75353..94b8a7d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetDoubleWithIndexConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getDouble with boolean property
public void testGetDoubleFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -48,7 +50,7 @@
//2. purpose: getDouble with Defined Byte Property
public void testGetDoubleConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
@@ -56,7 +58,7 @@
dataObject.setByte(PROPERTY_INDEX, by);// add it to instance list
- this.assertEquals((double)by, dataObject.getDouble(PROPERTY_INDEX), delta);
+ assertEquals(by, dataObject.getDouble(PROPERTY_INDEX), delta);
}
//3. purpose: getDouble with Undefined Byte Property
@@ -73,7 +75,7 @@
//4. purpose: getDouble with character property
public void testGetDoubleFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'e');
try {
@@ -86,72 +88,72 @@
//5. purpose: getDouble with Defined Double Property
public void testGetDoubleConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
double delta = 0.0;
dataObject.setDouble(PROPERTY_INDEX, db);// add it to instance list
- this.assertEquals((double)db, dataObject.getDouble(PROPERTY_INDEX), delta);
+ assertEquals(db, dataObject.getDouble(PROPERTY_INDEX), delta);
}
//7. purpose: getDouble with Defined float Property
public void testGetDoubleConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
double delta = 0.0;
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
- this.assertEquals((double)fl, dataObject.getDouble(PROPERTY_INDEX), delta);
+ assertEquals(fl, dataObject.getDouble(PROPERTY_INDEX), delta);
}
//9. purpose: getDouble with Defined int Property
public void testGetDoubleConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
double delta = 0.0;
dataObject.setInt(PROPERTY_INDEX, in);// add it to instance list
- this.assertEquals((double)in, dataObject.getDouble(PROPERTY_INDEX), delta);
+ assertEquals(in, dataObject.getDouble(PROPERTY_INDEX), delta);
}
//11. purpose: getDouble with Defined long Property
public void testGetDoubleConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
double delta = 0.0;
dataObject.setLong(PROPERTY_INDEX, lg);// add it to instance list
- this.assertEquals((double)lg, dataObject.getDouble(PROPERTY_INDEX), delta);
+ assertEquals((double)lg, dataObject.getDouble(PROPERTY_INDEX), delta);
}
//13. purpose: getDouble with Defined short Property
public void testGetDoubleConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
double delta = 0.0;
dataObject.setShort(PROPERTY_INDEX, shr);// add it to instance list
- this.assertEquals((double)shr, dataObject.getDouble(PROPERTY_INDEX), delta);
+ assertEquals(shr, dataObject.getDouble(PROPERTY_INDEX), delta);
}
//15. purpose: getDouble with Defined String Property
public void testGetDoubleConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
@@ -159,12 +161,12 @@
double delta = 0.0;
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject.getDouble(PROPERTY_INDEX), delta);
+ assertEquals(s_d.doubleValue(), dataObject.getDouble(PROPERTY_INDEX), delta);
}
//17. purpose: getDouble with bytes property
public void testGetDoubleFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new byte[] { 10, 100 });
try {
@@ -177,7 +179,7 @@
//18. purpose: getDouble with Defined Decimal Property
public void testGetDoubleConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
double db = 12;
@@ -185,25 +187,25 @@
double delta = 0.0;
dataObject.setBigDecimal(PROPERTY_INDEX, bd);// add it to instance list
- this.assertEquals(bd.doubleValue(), dataObject.getDouble(PROPERTY_INDEX), delta);
+ assertEquals(bd.doubleValue(), dataObject.getDouble(PROPERTY_INDEX), delta);
}
//20. purpose: getDouble with Defined integer Property
public void testGetDoubleConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
double delta = 0.0;
dataObject.setBigInteger(PROPERTY_INDEX, bi);// add it to instance list
- this.assertEquals(bi.doubleValue(), dataObject.getDouble(PROPERTY_INDEX), delta);
+ assertEquals(bi.doubleValue(), dataObject.getDouble(PROPERTY_INDEX), delta);
}
//22. purpose: getDouble with date property
public void testGetDoubleFromDate() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatByPositionalPathTest.java
index 0bfc06c..6387d40 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatByPositionalPathTest.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -35,7 +37,7 @@
//1. purpose: getFloat with boolean property
public void testGetFloatFromBoolean() {
- SDOProperty prop= ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop= dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(prop, true);
try {
@@ -48,14 +50,14 @@
//2. purpose: getFloat with Defined Byte Property
public void testGetFloatConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTE);
byte by = 12;
float delta = 0;
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((float)by, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(by, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//3. purpose: getFloat with Undefined Byte Property
@@ -70,7 +72,7 @@
//4. purpose: getFloat with character property
public void testGetFloatFromCharacter() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_CHARACTER);
dataObject_c.set(prop, 'e');
try {
@@ -83,33 +85,33 @@
//5. purpose: getFloat with Defined Double Property
public void testGetFloatConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
double db = 12;
float delta = 0;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((float)db, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals((float)db, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//7. purpose: getFloat with Defined float Property
public void testGetFloatConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
float fl = 12;
float delta = 0;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((float)fl, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(fl, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
float fl = 12;
float delta = 0;
@@ -119,15 +121,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setFloat(property3, fl);
- this.assertEquals(fl, dataObject_a.getFloat(property3), delta);
+ assertEquals(fl, dataObject_a.getFloat(property3), delta);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
float fl = 12;
float delta = 0;
@@ -136,13 +138,13 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setFloat(property + ".0", fl);
- this.assertEquals(fl, dataObject_a.getFloat(property + ".0"), delta);
+ assertEquals(fl, dataObject_a.getFloat(property + ".0"), delta);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
float fl = 12;
@@ -150,7 +152,7 @@
dataObject_a.setFloat(property1, fl);// c dataobject's a property has value boolean 'true'
- this.assertEquals(fl, dataObject_a.getFloat(property1), delta);
+ assertEquals(fl, dataObject_a.getFloat(property1), delta);
}
/* public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -176,39 +178,39 @@
//9. purpose: getFloat with Defined int Property
public void testGetFloatConversionFromDefinedIntProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
int in = 12;
float delta = 0;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((float)in, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals((float)in, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//11. purpose: getFloat with Defined long Property
public void testGetFloatConversionFromDefinedLongProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long lg = 12;
float delta = 0;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((float)lg, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals((float)lg, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//13. purpose: getFloat with Defined short Property
public void testGetFloatConversionFromDefinedShortProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
short shr = 12;
float delta = 0;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((float)shr, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(shr, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
@@ -216,21 +218,21 @@
//15. purpose: getFloat with Defined String Property
public void testGetFloatConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
Float s_d = Float.valueOf(str);
float delta = 0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(s_d.doubleValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//17. purpose: getFloat with bytes property
public void testGetFloatFromBytes() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BYTES);
dataObject_c.set(prop, new String("eee").getBytes());
@@ -244,34 +246,34 @@
//18. purpose: getFloat with Defined Decimal Property
public void testGetFloatConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
float db = 12;
BigDecimal bd = new BigDecimal(db);
float delta = 0;
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(bd.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//20. purpose: getFloat with Defined integer Property
public void testGetFloatConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
float delta = 0;
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(bi.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//22. purpose: getFloat with date property
public void testGetFloatFromDate() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_DATE);
dataObject_c.set(prop, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionTest.java
index 501bc02..98f9e05 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -34,7 +36,7 @@
//1. purpose: getFloat with boolean property
public void testGetFloatFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -47,7 +49,7 @@
//2. purpose: getFloat with Defined Byte Property
public void testGetFloatConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
@@ -55,7 +57,7 @@
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((float)by, dataObject.getFloat(property), delta);
+ assertEquals(by, dataObject.getFloat(property), delta);
}
//3. purpose: getFloat with Undefined Byte Property
@@ -73,7 +75,7 @@
//4. purpose: getFloat with character property
public void testGetFloatFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 't');
try {
@@ -86,14 +88,14 @@
//5. purpose: getFloat with Defined Double Property
public void testGetFloatConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
float delta = 0;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((float)db, dataObject.getFloat(property), delta);
+ assertEquals((float)db, dataObject.getFloat(property), delta);
}
//6. purpose: getFloat with Undefined Double Property
@@ -112,14 +114,14 @@
//7. purpose: getFloat with Defined float Property
public void testGetFloatConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
float delta = 0;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((float)fl, dataObject.getFloat(property), delta);
+ assertEquals(fl, dataObject.getFloat(property), delta);
}
//8. purpose: getFloat with Undefined float Property
@@ -138,14 +140,14 @@
//9. purpose: getFloat with Defined int Property
public void testGetFloatConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
float delta = 0;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((float)in, dataObject.getFloat(property), delta);
+ assertEquals((float)in, dataObject.getFloat(property), delta);
}
//10. purpose: getFloat with Undefined int Property
@@ -164,14 +166,14 @@
//11. purpose: getFloat with Defined long Property
public void testGetFloatConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
float delta = 0;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((float)lg, dataObject.getFloat(property), delta);
+ assertEquals((float)lg, dataObject.getFloat(property), delta);
}
//12. purpose: getFloat with Undefined long Property
@@ -190,14 +192,14 @@
//13. purpose: getFloat with Defined short Property
public void testGetFloatConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
float delta = 0;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((float)shr, dataObject.getFloat(property), delta);
+ assertEquals(shr, dataObject.getFloat(property), delta);
}
//14. purpose: getFloat with Undefined short Property
@@ -216,7 +218,7 @@
//15. purpose: getFloat with Defined String Property
public void testGetFloatConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
@@ -224,7 +226,7 @@
float delta = 0;
dataObject.setString(property, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject.getFloat(property), delta);
+ assertEquals(s_d.doubleValue(), dataObject.getFloat(property), delta);
}
//16. purpose: getFloat with Undefined string Property
@@ -242,7 +244,7 @@
//17. purpose: getFloat with bytes property
public void testGetFloatFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("123").getBytes());
try {
@@ -255,7 +257,7 @@
//18. purpose: getFloat with Defined Decimal Property
public void testGetFloatConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
float db = 12;
@@ -263,7 +265,7 @@
float delta = 0;
dataObject.setBigDecimal(property, bd);// add it to instance list
- this.assertEquals(bd.floatValue(), dataObject.getFloat(property), delta);
+ assertEquals(bd.floatValue(), dataObject.getFloat(property), delta);
}
//19. purpose: getFloat with Undefined decimal Property
@@ -282,14 +284,14 @@
//20. purpose: getFloat with Defined integer Property
public void testGetFloatConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
float delta = 0;
dataObject.setBigInteger(property, bi);// add it to instance list
- this.assertEquals(bi.floatValue(), dataObject.getFloat(property), delta);
+ assertEquals(bi.floatValue(), dataObject.getFloat(property), delta);
}
//21. purpose: getFloat with Undefined Integer Property
@@ -307,7 +309,7 @@
//22. purpose: getFloat with date property
public void testGetFloatFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
@@ -328,7 +330,7 @@
}
public void testGetFloatFromBooleanObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, Boolean.TRUE);
try {
@@ -341,7 +343,7 @@
//2. purpose: getFloat with Defined Byte Property
public void testGetFloatConversionFromDefinedByteObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
byte by = 12;
@@ -349,12 +351,12 @@
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((float)by, dataObject.getFloat(property), delta);
+ assertEquals(by, dataObject.getFloat(property), delta);
}
//4. purpose: getFloat with character property
public void testGetFloatFromCharacterObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
dataObject.set(property, Character.valueOf('y'));
try {
@@ -367,64 +369,64 @@
//5. purpose: getFloat with Defined Double Property
public void testGetFloatConversionFromDefinedDoubleObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
double db = 12;
float delta = 0;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((float)db, dataObject.getFloat(property), delta);
+ assertEquals((float)db, dataObject.getFloat(property), delta);
}
//7. purpose: getFloat with Defined float Property
public void testGetFloatConversionFromDefinedFloatObject() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOATOBJECT);
float fl = 12;
float delta = 0;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((float)fl, dataObject.getFloat(property), delta);
+ assertEquals(fl, dataObject.getFloat(property), delta);
}
//9. purpose: getFloat with Defined int Property
public void testGetFloatConversionFromDefinedIntObject() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
int in = 12;
float delta = 0;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((float)in, dataObject.getFloat(property), delta);
+ assertEquals((float)in, dataObject.getFloat(property), delta);
}
//11. purpose: getFloat with Defined long Property
public void testGetFloatConversionFromDefinedLongObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONGOBJECT);
long lg = 12;
float delta = 0;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((float)lg, dataObject.getFloat(property), delta);
+ assertEquals((float)lg, dataObject.getFloat(property), delta);
}
//13. purpose: getFloat with Defined short Property
public void testGetFloatConversionFromDefinedShortObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORTOBJECT);
short shr = 12;
float delta = 0;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((float)shr, dataObject.getFloat(property), delta);
+ assertEquals(shr, dataObject.getFloat(property), delta);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionWithPathTest.java
index cbe67df..623ba60 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatConversionWithPathTest.java
@@ -19,6 +19,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -63,7 +65,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((float)by, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(by, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//3. purpose: getFloat with Undefined Byte Property
@@ -110,7 +112,7 @@
float delta = 0;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((float)db, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals((float)db, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//6. purpose: getFloat with Undefined Double Property
@@ -141,7 +143,7 @@
float delta = 0;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((float)fl, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(fl, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//8. purpose: getFloat with Undefined float Property
@@ -172,7 +174,7 @@
float delta = 0;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((float)in, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals((float)in, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//10. purpose: getFloat with Undefined int Property
@@ -203,7 +205,7 @@
float delta = 0;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((float)lg, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals((float)lg, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//12. purpose: getFloat with Undefined long Property
@@ -234,7 +236,7 @@
float delta = 0;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((float)shr, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(shr, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//14. purpose: getFloat with Undefined short Property
@@ -266,7 +268,7 @@
float delta = 0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(s_d.doubleValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//16. purpose: getFloat with Undefined string Property
@@ -314,7 +316,7 @@
float delta = 0;
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(bd.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//19. purpose: getFloat with Undefined decimal Property
@@ -345,7 +347,7 @@
float delta = 0;
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(bi.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//21. purpose: getFloat with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatWithIndexConversionTest.java
index 4381ae5..3b4c76a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetFloatWithIndexConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getFloat with boolean property
public void testGetFloatFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -58,7 +60,7 @@
dataObject.setByte(PROPERTY_INDEX, by);// add it to instance list
- this.assertEquals((float)by, dataObject.getFloat(PROPERTY_INDEX), delta);
+ assertEquals(by, dataObject.getFloat(PROPERTY_INDEX), delta);
}
//3. purpose: getFloat with Undefined Byte Property
@@ -74,7 +76,7 @@
//4. purpose: getFloat with character property
public void testGetFloatFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'c');
try {
@@ -96,7 +98,7 @@
float delta = 0;
dataObject.setDouble(PROPERTY_INDEX, db);// add it to instance list
- this.assertEquals((float)db, dataObject.getFloat(PROPERTY_INDEX), delta);
+ assertEquals((float)db, dataObject.getFloat(PROPERTY_INDEX), delta);
}
//7. purpose: getFloat with Defined float Property
@@ -111,7 +113,7 @@
float delta = 0;
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
- this.assertEquals((float)fl, dataObject.getFloat(PROPERTY_INDEX), delta);
+ assertEquals(fl, dataObject.getFloat(PROPERTY_INDEX), delta);
}
//9. purpose: getFloat with Defined int Property
@@ -126,7 +128,7 @@
float delta = 0;
dataObject.setInt(PROPERTY_INDEX, in);// add it to instance list
- this.assertEquals((float)in, dataObject.getFloat(PROPERTY_INDEX), delta);
+ assertEquals((float)in, dataObject.getFloat(PROPERTY_INDEX), delta);
}
//11. purpose: getFloat with Defined long Property
@@ -141,7 +143,7 @@
float delta = 0;
dataObject.setLong(PROPERTY_INDEX, lg);// add it to instance list
- this.assertEquals((float)lg, dataObject.getFloat(PROPERTY_INDEX), delta);
+ assertEquals((float)lg, dataObject.getFloat(PROPERTY_INDEX), delta);
}
//13. purpose: getFloat with Defined short Property
@@ -156,7 +158,7 @@
float delta = 0;
dataObject.setShort(PROPERTY_INDEX, shr);// add it to instance list
- this.assertEquals((float)shr, dataObject.getFloat(PROPERTY_INDEX), delta);
+ assertEquals(shr, dataObject.getFloat(PROPERTY_INDEX), delta);
}
//15. purpose: getFloat with Defined String Property
@@ -172,12 +174,12 @@
float delta = 0;
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject.getFloat(PROPERTY_INDEX), delta);
+ assertEquals(s_d.doubleValue(), dataObject.getFloat(PROPERTY_INDEX), delta);
}
//17. purpose: getFloat with bytes property
public void testGetFloatFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("eee").getBytes());
try {
@@ -200,7 +202,7 @@
float delta = 0;
dataObject.setBigDecimal(PROPERTY_INDEX, bd);// add it to instance list
- this.assertEquals(bd.floatValue(), dataObject.getFloat(PROPERTY_INDEX), delta);
+ assertEquals(bd.floatValue(), dataObject.getFloat(PROPERTY_INDEX), delta);
}
//20. purpose: getFloat with Defined integer Property
@@ -215,12 +217,12 @@
float delta = 0;
dataObject.setBigInteger(PROPERTY_INDEX, bi);// add it to instance list
- this.assertEquals(bi.floatValue(), dataObject.getFloat(PROPERTY_INDEX), delta);
+ assertEquals(bi.floatValue(), dataObject.getFloat(PROPERTY_INDEX), delta);
}
//22. purpose: getFloat with date property
public void testGetFloatFromDate() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntByPositionalPathTest.java
index 96b8422..8dbdde2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntByPositionalPathTest.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -35,7 +37,7 @@
//1. purpose: getInt with boolean property
public void testGetIntFromBoolean() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(prop, true);
try {
@@ -48,13 +50,13 @@
//2. purpose: getInt with Defined Byte Property
public void testGetIntConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((int)by, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getInt(propertyPath_a_b_c));
}
//3. purpose: getInt with Undefined Byte Property
@@ -69,7 +71,7 @@
//4. purpose: getInt with character property
public void testGetIntFromCharacter() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_CHARACTER);
dataObject_c.set(prop, 'e');
try {
@@ -82,43 +84,43 @@
//5. purpose: getInt with Defined Double Property
public void testGetIntConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((int)db, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals((int)db, dataObject_a.getInt(propertyPath_a_b_c));
}
//7. purpose: getInt with Defined float Property
public void testGetIntConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((int)fl, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals((int)fl, dataObject_a.getInt(propertyPath_a_b_c));
}
//9. purpose: getInt with Defined int Property
public void testGetIntConversionFromDefinedIntProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((int)in, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(in, dataObject_a.getInt(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
int in = 12;
List b = new ArrayList();
@@ -127,14 +129,14 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setInt(property3, in);
- this.assertEquals(in, dataObject_a.getInt(property3));
+ assertEquals(in, dataObject_a.getInt(property3));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
int in = 12;
List b = new ArrayList();
@@ -142,18 +144,18 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setInt(property + ".0", in);
- this.assertEquals(in, dataObject_a.getInt(property + ".0"));
+ assertEquals(in, dataObject_a.getInt(property + ".0"));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
int in = 12;
dataObject_a.setInt(property1, in);// c dataobject's a property has value boolean 'true'
- this.assertEquals(in, dataObject_a.getInt(property1));
+ assertEquals(in, dataObject_a.getInt(property1));
}
/* public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -178,44 +180,44 @@
//11. purpose: getInt with Defined long Property
public void testGetIntConversionFromDefinedLongProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((int)lg, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals((int)lg, dataObject_a.getInt(propertyPath_a_b_c));
}
//13. purpose: getInt with Defined short Property
public void testGetIntConversionFromDefinedShortProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((int)shr, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(shr, dataObject_a.getInt(propertyPath_a_b_c));
}
//15. purpose: getInt with Defined String Property
public void testGetIntConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
Integer s_d = Integer.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(s_d.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
}
//17. purpose: getInt with bytes property
public void testGetIntFromBytes() {
- SDOProperty prop =((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BYTES);
dataObject_c.set(prop, new String("eee").getBytes());
try {
@@ -228,31 +230,31 @@
//18. purpose: getInt with Defined Decimal Property
public void testGetIntConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.intValue(), dataObject_a.getInt(property));
+ assertEquals(bd.intValue(), dataObject_a.getInt(property));
}
//20. purpose: getInt with Defined integer Property
public void testGetIntConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(bi.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
}
//22. purpose: getInt with date property
public void testGetIntFromDate() {
- SDOProperty prop =((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_DATE);
dataObject_c.set(prop, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionTest.java
index 1b16bd5..d2fe7fb 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionTest.java
@@ -19,6 +19,8 @@
import java.math.BigInteger;
import java.util.Calendar;
import java.util.Date;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.exceptions.SDOException;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -38,7 +40,7 @@
//1. purpose: getInt with boolean property
public void testGetIntFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
@@ -49,14 +51,14 @@
//2. purpose: getInt with Defined Byte Property
public void testGetIntConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((int)by, dataObject.getInt(property));
+ assertEquals(by, dataObject.getInt(property));
}
//3. purpose: getInt with Undefined Byte Property
@@ -74,7 +76,7 @@
//4. purpose: getInt with character property
public void testGetIntFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'c');
try {
@@ -86,7 +88,7 @@
//4. purpose: getInt with character property
public void testGetIntFromNullCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
try {
int value = dataObject.getInt(property);
@@ -98,13 +100,13 @@
//5. purpose: getInt with Defined Double Property
public void testGetIntConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((int)db, dataObject.getInt(property));
+ assertEquals((int)db, dataObject.getInt(property));
}
//6. purpose: getInt with Undefined Double Property
@@ -123,13 +125,13 @@
//7. purpose: getInt with Defined float Property
public void testGetIntConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((int)fl, dataObject.getInt(property));
+ assertEquals((int)fl, dataObject.getInt(property));
}
//8. purpose: getInt with Undefined float Property
@@ -148,13 +150,13 @@
//9. purpose: getInt with Defined int Property
public void testGetIntConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((int)in, dataObject.getInt(property));
+ assertEquals(in, dataObject.getInt(property));
}
//10. purpose: getInt with Undefined int Property
@@ -173,13 +175,13 @@
//11. purpose: getInt with Defined long Property
public void testGetIntConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((int)lg, dataObject.getInt(property));
+ assertEquals((int)lg, dataObject.getInt(property));
}
//12. purpose: getInt with Undefined long Property
@@ -198,13 +200,13 @@
//13. purpose: getInt with Defined short Property
public void testGetIntConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((int)shr, dataObject.getInt(property));
+ assertEquals(shr, dataObject.getInt(property));
}
//14. purpose: getInt with Undefined short Property
@@ -223,14 +225,14 @@
//15. purpose: getInt with Defined String Property
public void testGetIntConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
Integer s_d = Integer.valueOf(str);
dataObject.setString(property, str);// add it to instance list
- this.assertEquals(s_d.intValue(), dataObject.getInt(property));
+ assertEquals(s_d.intValue(), dataObject.getInt(property));
}
//16. purpose: getInt with Undefined string Property
@@ -248,7 +250,7 @@
//17. purpose: getInt with bytes property
public void testGetIntFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
String testString = "abc";
byte[] bytes = testString.getBytes();
@@ -264,14 +266,14 @@
//18. purpose: getInt with Defined Decimal Property
public void testGetIntConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject.setBigDecimal(property, bd);// add it to instance list
- this.assertEquals(bd.intValue(), dataObject.getInt(property));
+ assertEquals(bd.intValue(), dataObject.getInt(property));
}
//19. purpose: getInt with Undefined decimal Property
@@ -290,13 +292,13 @@
//20. purpose: getInt with Defined integer Property
public void testGetIntConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject.setBigInteger(property, bi);// add it to instance list
- this.assertEquals(bi.intValue(), dataObject.getInt(property));
+ assertEquals(bi.intValue(), dataObject.getInt(property));
}
//21. purpose: getInt with Undefined Integer Property
@@ -314,7 +316,7 @@
//22. purpose: getInt with date property
public void testGetIntFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
Date theDate = Calendar.getInstance().getTime();
dataObject.set(property, theDate);
@@ -337,7 +339,7 @@
//1. purpose: getInt with boolean property
public void testGetIntFromBooleanObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEANOBJECT);
dataObject.set(property, true);
@@ -349,19 +351,19 @@
//2. purpose: getInt with Defined Byte Property
public void testGetIntConversionFromDefinedByteObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
byte by = 12;
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((int)by, dataObject.getInt(property));
+ assertEquals(by, dataObject.getInt(property));
}
//4. purpose: getInt with character property
public void testGetIntFromCharacterObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
dataObject.set(property, "t");
try {
@@ -374,84 +376,84 @@
//5. purpose: getInt with Defined Double Property
public void testGetIntConversionFromDefinedDoubleObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
double db = 12;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((int)db, dataObject.getInt(property));
+ assertEquals((int)db, dataObject.getInt(property));
}
//7. purpose: getInt with Defined float Property
public void testGetIntConversionFromDefinedFloatObject() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOATOBJECT);
float fl = 12;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((int)fl, dataObject.getInt(property));
+ assertEquals((int)fl, dataObject.getInt(property));
}
//9. purpose: getInt with Defined int Property
public void testGetIntConversionFromDefinedIntObject() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
int in = 12;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((int)in, dataObject.getInt(property));
+ assertEquals(in, dataObject.getInt(property));
}
//9. purpose: getInt with Defined int Property
public void testGetIntConversionFromNullDefinedIntObject() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
int value = dataObject.getInt(property);
- this.assertEquals(0, value);
+ assertEquals(0, value);
}
//11. purpose: getInt with Defined long Property
public void testGetIntConversionFromDefinedLongObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONGOBJECT);
long lg = 12;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((int)lg, dataObject.getInt(property));
+ assertEquals((int)lg, dataObject.getInt(property));
}
//13. purpose: getInt with Defined short Property
public void testGetIntConversionFromDefinedShortObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORTOBJECT);
short shr = 12;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((int)shr, dataObject.getInt(property));
+ assertEquals(shr, dataObject.getInt(property));
}
// purpose: setString with incorrect Integer as String Property
public void testInvalidIntFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty) type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
String str = "12&";
try {
dataObject.setString(property, str);
} catch (SDOException sdo) {
- this.assertEquals(sdo.getErrorCode(), SDOException.INVALID_PROPERTY_VALUE);
+ assertEquals(sdo.getErrorCode(), SDOException.INVALID_PROPERTY_VALUE);
}
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionWithPathTest.java
index 4fa8102..9d17cee 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntConversionWithPathTest.java
@@ -17,6 +17,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -60,7 +62,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((int)by, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getInt(propertyPath_a_b_c));
}
//3. purpose: getInt with Undefined Byte Property
@@ -106,7 +108,7 @@
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((int)db, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals((int)db, dataObject_a.getInt(propertyPath_a_b_c));
}
//6. purpose: getInt with Undefined Double Property
@@ -136,7 +138,7 @@
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((int)fl, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals((int)fl, dataObject_a.getInt(propertyPath_a_b_c));
}
//8. purpose: getInt with Undefined float Property
@@ -166,7 +168,7 @@
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((int)in, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(in, dataObject_a.getInt(propertyPath_a_b_c));
}
//10. purpose: getInt with Undefined int Property
@@ -196,7 +198,7 @@
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((int)lg, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals((int)lg, dataObject_a.getInt(propertyPath_a_b_c));
}
//12. purpose: getInt with Undefined long Property
@@ -226,7 +228,7 @@
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((int)shr, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(shr, dataObject_a.getInt(propertyPath_a_b_c));
}
//14. purpose: getInt with Undefined short Property
@@ -257,7 +259,7 @@
Integer s_d = Integer.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(s_d.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
}
//16. purpose: getInt with Undefined string Property
@@ -304,7 +306,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.intValue(), dataObject_a.getInt(property));
+ assertEquals(bd.intValue(), dataObject_a.getInt(property));
}
//19. purpose: getInt with Undefined decimal Property
@@ -334,7 +336,7 @@
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(bi.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
}
//21. purpose: getInt with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntWithIndexConversionTest.java
index f81a42a..f8f9e86 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntWithIndexConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getInt with boolean property
public void testGetIntFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
@@ -47,14 +49,14 @@
//2. purpose: getInt with Defined Byte Property
public void testGetIntConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject.setByte(PROPERTY_INDEX, by);// add it to instance list
- this.assertEquals((int)by, dataObject.getInt(PROPERTY_INDEX));
+ assertEquals(by, dataObject.getInt(PROPERTY_INDEX));
}
//3. purpose: getInt with Undefined Byte Property
@@ -71,7 +73,7 @@
//4. purpose: getInt with character property
public void testGetIntFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'e');
try {
@@ -84,13 +86,13 @@
//5. purpose: getInt with Defined Double Property
public void testGetIntConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject.setDouble(PROPERTY_INDEX, db);// add it to instance list
- this.assertEquals((int)db, dataObject.getInt(PROPERTY_INDEX));
+ assertEquals((int)db, dataObject.getInt(PROPERTY_INDEX));
}
@@ -98,70 +100,70 @@
//7. purpose: getInt with Defined float Property
public void testGetIntConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
- this.assertEquals((int)fl, dataObject.getInt(PROPERTY_INDEX));
+ assertEquals((int)fl, dataObject.getInt(PROPERTY_INDEX));
}
//9. purpose: getInt with Defined int Property
public void testGetIntConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(PROPERTY_INDEX, in);// add it to instance list
- this.assertEquals((int)in, dataObject.getInt(PROPERTY_INDEX));
+ assertEquals(in, dataObject.getInt(PROPERTY_INDEX));
}
//11. purpose: getInt with Defined long Property
public void testGetIntConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(PROPERTY_INDEX, lg);// add it to instance list
- this.assertEquals((int)lg, dataObject.getInt(PROPERTY_INDEX));
+ assertEquals((int)lg, dataObject.getInt(PROPERTY_INDEX));
}
//13. purpose: getInt with Defined short Property
public void testGetIntConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(PROPERTY_INDEX, shr);// add it to instance list
- this.assertEquals((int)shr, dataObject.getInt(PROPERTY_INDEX));
+ assertEquals(shr, dataObject.getInt(PROPERTY_INDEX));
}
//15. purpose: getInt with Defined String Property
public void testGetIntConversionFromDefinedStringProperty() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
Integer s_d = Integer.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(s_d.intValue(), dataObject.getInt(PROPERTY_INDEX));
+ assertEquals(s_d.intValue(), dataObject.getInt(PROPERTY_INDEX));
}
//17. purpose: getInt with bytes property
public void testGetIntFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("rrr").getBytes());
try {
@@ -174,34 +176,34 @@
//18. purpose: getInt with Defined Decimal Property
public void testGetIntConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject.setBigDecimal(PROPERTY_INDEX, bd);// add it to instance list
- this.assertEquals(bd.intValue(), dataObject.getInt(PROPERTY_INDEX));
+ assertEquals(bd.intValue(), dataObject.getInt(PROPERTY_INDEX));
}
//20. purpose: getInt with Defined integer Property
public void testGetIntConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject.setBigInteger(PROPERTY_INDEX, bi);// add it to instance list
- this.assertEquals(bi.intValue(), dataObject.getInt(PROPERTY_INDEX));
+ assertEquals(bi.intValue(), dataObject.getInt(PROPERTY_INDEX));
}
//22. purpose: getInt with date property
public void testGetIntFromDate() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerByPositionalPathTest.java
index dc95255..f996356 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -35,7 +37,7 @@
//1. purpose: getBigInteger with boolean property
public void testGetIntegerFromBoolean() {
- SDOProperty prop =((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(prop, true);
@@ -48,7 +50,7 @@
//2. purpose: getBigInteger with byte property
public void testGetIntegerFromByte() {
- SDOProperty prop =((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BYTE);
byte theByte = 10;
dataObject_c.set(prop, theByte);
@@ -65,7 +67,7 @@
//3. purpose: getBigInteger with character property
public void testGetIntegerFromCharacter() {
- SDOProperty prop =((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_CHARACTER);
dataObject_c.set(prop, 'e');
@@ -79,14 +81,14 @@
//5. purpose: getBigInteger with Defined Double Property
public void testGetIntegerConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
double db = 12;
int il = (int)db;
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(property));
+ assertEquals(bd, dataObject_a.getBigInteger(property));
}
//6. purpose: getBigInteger with Undefined Double Property
@@ -103,46 +105,46 @@
//7. purpose: getBigInteger with Defined float Property
public void testGetIntegerConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
float fl = 12;
int il = (int)fl;
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(property));
+ assertEquals(bd, dataObject_a.getBigInteger(property));
}
//9. purpose: getBigInteger with Defined int Property
public void testGetIntegerConversionFromDefinedIntProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
int in = 12;
BigInteger bd = new BigInteger(String.valueOf(in));
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//11. purpose: getBigInteger with Defined long Property
public void testGetIntegerConversionFromDefinedLongProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long lg = 12;
BigInteger bd = new BigInteger(String.valueOf(lg));
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//13. purpose: getBigInteger with Undefined short Property
public void testGetIntegerConversionFromUnDefinedShortProperty() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
try {
BigInteger value = dataObject_a.getBigInteger(propertyPath_a_b_c);
@@ -155,13 +157,13 @@
//14. purpose: getBigInteger with Defined String Property
public void testGetgetIntegerConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
BigInteger bd = new BigInteger(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
@@ -186,14 +188,14 @@
//18. purpose: getBigInteger with Defined Decimal Property
public void testGetIntegerConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
BigInteger bd_ = new BigInteger(String.valueOf(bd));
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd_, dataObject_a.getBigInteger(property));
+ assertEquals(bd_, dataObject_a.getBigInteger(property));
}
@@ -201,19 +203,19 @@
//20. purpose: getBigInteger with Defined integer Property
public void testGetIntegerConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bi, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
BigInteger bi = new BigInteger("12");
List b = new ArrayList();
@@ -222,15 +224,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigInteger(property3, bi);
- this.assertEquals(bi, dataObject_a.getBigInteger(property3));
+ assertEquals(bi, dataObject_a.getBigInteger(property3));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
BigInteger bi = new BigInteger("12");
List b = new ArrayList();
@@ -238,19 +240,19 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigInteger(property + ".0", bi);
- this.assertEquals(bi, dataObject_a.getBigInteger(property + ".0"));
+ assertEquals(bi, dataObject_a.getBigInteger(property + ".0"));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(property1, bi);// c dataobject's a property has value boolean 'true'
- this.assertEquals(bi, dataObject_a.getBigInteger(property1));
+ assertEquals(bi, dataObject_a.getBigInteger(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -275,7 +277,7 @@
//22. purpose: getBigInteger with date property
public void testGetIntegerFromDate() {
- SDOProperty prop =((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_DATE);
dataObject_c.set(prop, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerConversionTest.java
index 38e6439..6886bbc 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getBigInteger with boolean property
public void testGetIntegerFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -47,7 +49,7 @@
//2. purpose: getBigInteger with byte property
public void testGetIntegerFromByte() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte theByte = 10;
@@ -63,7 +65,7 @@
//3. purpose: getBigInteger with character property
public void testGetIntegerFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'd');
try {
@@ -76,7 +78,7 @@
//5. purpose: getBigInteger with Defined Double Property
public void testGetIntegerConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
@@ -84,7 +86,7 @@
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(property));
+ assertEquals(bd, dataObject.getBigInteger(property));
}
//6. purpose: getBigInteger with Undefined Double Property
@@ -103,7 +105,7 @@
//7. purpose: getBigInteger with Defined float Property
public void testGetIntegerConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
@@ -111,7 +113,7 @@
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(property));
+ assertEquals(bd, dataObject.getBigInteger(property));
}
//8. purpose: getBigInteger with Undefined float Property
@@ -130,14 +132,14 @@
//9. purpose: getBigInteger with Defined int Property
public void testGetIntegerConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
BigInteger bd = new BigInteger(String.valueOf(in));
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(property));
+ assertEquals(bd, dataObject.getBigInteger(property));
}
//10. purpose: getBigInteger with Undefined int Property
@@ -156,14 +158,14 @@
//11. purpose: getBigInteger with Defined long Property
public void testGetIntegerConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
BigInteger bd = new BigInteger(String.valueOf(lg));
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(property));
+ assertEquals(bd, dataObject.getBigInteger(property));
}
//12. purpose: getBigInteger with Undefined long Property
@@ -181,7 +183,7 @@
//13. purpose: getBigInteger with Undefined short Property
public void testGetIntegerConversionFromUnDefinedShortProperty() {
- ((SDOType)dataObject.getType()).setOpen(true);
+ dataObject.getType().setOpen(true);
SDOProperty property = new SDOProperty(aHelperContext);
property.setName(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
@@ -199,14 +201,14 @@
//14. purpose: getBigInteger with Defined String Property
public void testGetgetIntegerConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
BigInteger bd = new BigInteger(str);
dataObject.setString(property, str);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(property));
+ assertEquals(bd, dataObject.getBigInteger(property));
}
//15. purpose: getBigInteger with Undefined string Property
@@ -225,7 +227,7 @@
//16. purpose: getBigInteger with Defined Bytes Property !! OX Pro !!
public void testGetIntegerConversionFromDefinedBytesProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte[] b = { 12, 13 };
@@ -233,7 +235,7 @@
dataObject.setBytes(property, b);// add it to instance list
- this.assertEquals(bin, dataObject.getBigInteger(property));
+ assertEquals(bin, dataObject.getBigInteger(property));
}
//17. purpose: getBigInteger with Undefined Bytes Property
@@ -251,7 +253,7 @@
//17. purpose: getBigDecimal with bytes property
public void testGetDecimalFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("abcd").getBytes());
try {
@@ -264,7 +266,7 @@
//18. purpose: getBigInteger with Defined Decimal Property
public void testGetIntegerConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
int db = 12;
@@ -272,7 +274,7 @@
BigInteger bd_ = new BigInteger(String.valueOf(bd));
dataObject.setBigDecimal(property, bd);// add it to instance list
- this.assertEquals(bd_, dataObject.getBigInteger(property));
+ assertEquals(bd_, dataObject.getBigInteger(property));
}
//19. purpose: getBigInteger with Undefined decimal Property
@@ -291,13 +293,13 @@
//20. purpose: getBigInteger with Defined integer Property
public void testGetIntegerConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject.setBigInteger(property, bi);// add it to instance list
- this.assertEquals(bi, dataObject.getBigInteger(property));
+ assertEquals(bi, dataObject.getBigInteger(property));
}
//21. purpose: getBigInteger with Undefined Integer Property
@@ -315,7 +317,7 @@
//22. purpose: getBigInteger with date property
public void testGetIntegerFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerConversionWithPathTest.java
index b0fb816..d81fe26 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerConversionWithPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -96,7 +98,7 @@
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(property));
+ assertEquals(bd, dataObject_a.getBigInteger(property));
}
//6. purpose: getBigInteger with Undefined Double Property
@@ -128,7 +130,7 @@
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(property));
+ assertEquals(bd, dataObject_a.getBigInteger(property));
}
//8. purpose: getBigInteger with Undefined float Property
@@ -159,7 +161,7 @@
BigInteger bd = new BigInteger(String.valueOf(in));
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//10. purpose: getBigInteger with Undefined int Property
@@ -190,7 +192,7 @@
BigInteger bd = new BigInteger(String.valueOf(lg));
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//12. purpose: getBigInteger with Undefined long Property
@@ -237,7 +239,7 @@
BigInteger bd = new BigInteger(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//15. purpose: getBigInteger with Undefined string Property
@@ -269,7 +271,7 @@
dataObject_a.setBytes(propertyPath_a_b_c, b);// add it to instance list
- this.assertEquals(bin, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bin, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//17. purpose: getBigInteger with Undefined Bytes Property
@@ -301,7 +303,7 @@
BigInteger bd_ = new BigInteger(String.valueOf(bd));
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd_, dataObject_a.getBigInteger(property));
+ assertEquals(bd_, dataObject_a.getBigInteger(property));
}
//19. purpose: getBigInteger with Undefined decimal Property
@@ -331,7 +333,7 @@
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bi, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//21. purpose: getBigInteger with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerWithIndexConversionTest.java
index 1f382ec..887decc 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetIntegerWithIndexConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getBigInteger with boolean property
public void testGetIntegerFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -47,7 +49,7 @@
//2. purpose: getBigInteger with byte property
public void testGetIntegerFromByte() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte theByte = 8;
dataObject.set(property, theByte);
@@ -62,7 +64,7 @@
//3. purpose: getBigInteger with character property
public void testGetIntegerFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'e');
try {
@@ -75,7 +77,7 @@
//5. purpose: getBigInteger with Defined Double Property
public void testGetIntegerConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
@@ -83,13 +85,13 @@
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject.setDouble(PROPERTY_INDEX, db);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
}
//7. purpose: getBigInteger with Defined float Property
public void testGetIntegerConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
@@ -97,33 +99,33 @@
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
}
//9. purpose: getBigInteger with Defined int Property
public void testGetIntegerConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
BigInteger bd = new BigInteger(String.valueOf(in));
dataObject.setInt(PROPERTY_INDEX, in);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
}
//11. purpose: getBigInteger with Defined long Property
public void testGetIntegerConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
BigInteger bd = new BigInteger(String.valueOf(lg));
dataObject.setLong(PROPERTY_INDEX, lg);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
}
//14. purpose: getBigInteger with Defined String Property
@@ -138,13 +140,13 @@
BigInteger bd = new BigInteger(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
+ assertEquals(bd, dataObject.getBigInteger(PROPERTY_INDEX));
}
//16. purpose: getBigInteger with Defined Bytes Property !! OX PRO !!
public void testGetIntegerConversionFromDefinedBytesProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
byte[] b = { 12, 13 };
@@ -152,7 +154,7 @@
dataObject.setBytes(PROPERTY_INDEX, b);// add it to instance list
- this.assertEquals(bin, dataObject.getBigInteger(PROPERTY_INDEX));
+ assertEquals(bin, dataObject.getBigInteger(PROPERTY_INDEX));
}
//17. purpose: getBigInteger with Undefined Bytes Property
@@ -168,7 +170,7 @@
//17. purpose: getBigDecimal with bytes property
public void testGetDecimalFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("eee").getBytes());
try {
@@ -181,7 +183,7 @@
//18. purpose: getBigInteger with Defined Decimal Property
public void testGetIntegerConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
int db = 12;
@@ -189,24 +191,24 @@
BigInteger bd_ = new BigInteger(String.valueOf(bd));
dataObject.setBigDecimal(PROPERTY_INDEX, bd);// add it to instance list
- this.assertEquals(bd_, dataObject.getBigInteger(PROPERTY_INDEX));
+ assertEquals(bd_, dataObject.getBigInteger(PROPERTY_INDEX));
}
//20. purpose: getBigInteger with Defined integer Property
public void testGetIntegerConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject.setBigInteger(PROPERTY_INDEX, bi);// add it to instance list
- this.assertEquals(bi, dataObject.getBigInteger(PROPERTY_INDEX));
+ assertEquals(bi, dataObject.getBigInteger(PROPERTY_INDEX));
}
//22. purpose: getBigInteger with date property
public void testGetIntegerFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListByPositionalPathTest.java
index 3bf9914..b5bd7ae 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListByPositionalPathTest.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -27,8 +29,8 @@
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BOOLEAN);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
Boolean bb = Boolean.valueOf(true);
List b = new ArrayList();
@@ -37,15 +39,15 @@
dataObject_a.setList("PName-a/PName-b.0/PName-c", b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBoolean(property3, true);
- this.assertEquals(bb, dataObject_a.getList("PName-a/PName-b.0/PName-c").get(0));
+ assertEquals(bb, dataObject_a.getList("PName-a/PName-b.0/PName-c").get(0));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
String bb = "test";
List b = new ArrayList();
@@ -53,7 +55,7 @@
dataObject_a.setList("PName-a/PName-b[1]/PName-c", b);// c dataobject's a property has value boolean 'true'
dataObject_a.setString(property + ".0", bb);
- this.assertEquals(bb, dataObject_a.getList("PName-a/PName-b.0/PName-c").get(0));
+ assertEquals(bb, dataObject_a.getList("PName-a/PName-b.0/PName-c").get(0));
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListConversionTest.java
index 8ab444a..32eb701 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetListConversionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import commonj.sdo.Property;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -42,7 +44,7 @@
dataObject_a_pathLength_1.setList("PName-a-length-1", b);
- this.assertEquals(b, dataObject_a_pathLength_1.getList("PName-a-length-1"));
+ assertEquals(b, dataObject_a_pathLength_1.getList("PName-a-length-1"));
}
//6. purpose: getList(Path) with path length 1: "a"
@@ -67,7 +69,7 @@
dataObject_a_pathLength_1.setList(property_a_pathLength_1, b);
- this.assertEquals(b, dataObject_a_pathLength_1.getList(property_a_pathLength_1));
+ assertEquals(b, dataObject_a_pathLength_1.getList(property_a_pathLength_1));
}
//6. purpose: getList(Path) with defined property
@@ -80,7 +82,7 @@
dataObject_a_pathLength_1.setList(property_a_pathLength_1, b);
dataObject_a_pathLength_1.set(PROPERTY_NAME_A_LENGTH_1 + ".0", "test");
- this.assertEquals(1, dataObject_a_pathLength_1.getList(property_a_pathLength_1).size());
+ assertEquals(1, dataObject_a_pathLength_1.getList(property_a_pathLength_1).size());
}
//6. purpose: getList(Path) with defined property
@@ -93,8 +95,8 @@
dataObject_a_pathLength_1.setList(property_a_pathLength_1, b);
dataObject_a_pathLength_1.set(PROPERTY_NAME_A_LENGTH_1 + "[1]", "test");
- this.assertEquals(1, dataObject_a_pathLength_1.getList(property_a_pathLength_1).size());
- this.assertEquals("test", dataObject_a_pathLength_1.getList(property_a_pathLength_1).get(0));
+ assertEquals(1, dataObject_a_pathLength_1.getList(property_a_pathLength_1).size());
+ assertEquals("test", dataObject_a_pathLength_1.getList(property_a_pathLength_1).get(0));
}
//6. purpose: getList(Path) with defined property value null
@@ -105,7 +107,7 @@
dataObject_a_pathLength_1.setList(property_a_pathLength_1, b);
- this.assertNotNull(dataObject_a_pathLength_1.getList(property_a_pathLength_1));
+ assertNotNull(dataObject_a_pathLength_1.getList(property_a_pathLength_1));
}
//6. purpose: getList(Path) with path length 1: "a"
@@ -131,7 +133,7 @@
dataObject_a_pathLength_1.setList(0, b);
- this.assertEquals(b, dataObject_a_pathLength_1.getList(0));
+ assertEquals(b, dataObject_a_pathLength_1.getList(0));
}
//6. purpose: getBoolean with Undefined Boolean Property
@@ -168,7 +170,7 @@
property_a_pathLength_1.setMany(true);
List value = dataObject_a_pathLength_1.getList("PName-a-length-1");
- this.assertEquals(new ArrayList(), value);
+ assertEquals(new ArrayList(), value);
}
public void testGetListConversionWithNullValueByProperty() {
@@ -176,7 +178,7 @@
property_a_pathLength_1.setMany(true);
List value = dataObject_a_pathLength_1.getList(PROPERTY_NAME_A_LENGTH_1);
- this.assertEquals(new ArrayList(), value);
+ assertEquals(new ArrayList(), value);
}
public void testSameListObject() {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongByPositionalPathTest.java
index b9394f0..65d0f02 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongByPositionalPathTest.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -35,7 +37,7 @@
//1. purpose: getLong with boolean property
public void testGetLongFromBoolean() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(prop, true);
@@ -49,20 +51,20 @@
//2. purpose: getLong with Defined Byte Property
public void testGetLongConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((long)by, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getLong(propertyPath_a_b_c));
}
//4. purpose: getLong with character property
public void testGetLongFromCharacter() {
- SDOProperty prop =((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_CHARACTER);
dataObject_c.set(prop, 't');
@@ -76,12 +78,12 @@
//5. purpose: getLong with Defined Double Property
public void testGetLongConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((long)db, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals((long)db, dataObject_a.getLong(propertyPath_a_b_c));
}
@@ -89,42 +91,42 @@
public void testGetLongConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((long)fl, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals((long)fl, dataObject_a.getLong(propertyPath_a_b_c));
}
//9. purpose: getLong with Defined int Property
public void testGetLongConversionFromDefinedIntProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((long)in, dataObject_a.getLong(property));
+ assertEquals(in, dataObject_a.getLong(property));
}
//11. purpose: getLong with Defined long Property
public void testGetLongConversionFromDefinedLongProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals(lg, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(lg, dataObject_a.getLong(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
long lg = 12;
List b = new ArrayList();
@@ -133,37 +135,37 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setLong(property3, lg);
long value = dataObject_a.getLong(property3);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(false);
- this.assertEquals(lg, value);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(false);
+ assertEquals(lg, value);
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
long lg = 12;
List b = new ArrayList();
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setLong(property + ".0", lg);
long value = dataObject_a.getLong(property + ".0");
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(false);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(false);
- this.assertEquals(lg,value );
+ assertEquals(lg,value );
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject_a.setLong(property1, lg);// c dataobject's a property has value boolean 'true'
- this.assertEquals(lg, dataObject_a.getLong(property1));
+ assertEquals(lg, dataObject_a.getLong(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -187,29 +189,29 @@
//13. purpose: getLong with Defined short Property
public void testGetLongConversionFromDefinedShortProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((long)shr, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(shr, dataObject_a.getLong(propertyPath_a_b_c));
}
//15. purpose: getLong with Defined String Property
public void testGetLongConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
Long s_d = Long.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(s_d.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
}
//17. purpose: getLong with bytes property
public void testGetLongFromBytes() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BYTES);
dataObject_c.set(prop, new String("eee").getBytes());
try {
@@ -222,13 +224,13 @@
//18. purpose: getLong with Defined Decimal Property
public void testGetLongConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
long db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(bd.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
}
@@ -236,24 +238,24 @@
//20. purpose: getLong with Defined integer Property
public void testGetLongConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(bi.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
}
//22. purpose: getLong with Defined date Property
public void testGetLongConversionFromDefinedDateProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DATE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DATE);
long d = 120000;
Date bi = new Date(d);
dataObject_a.setDate(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.getTime(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(bi.getTime(), dataObject_a.getLong(propertyPath_a_b_c));
}
//23. purpose: getLong with Undefined date Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionTest.java
index 1d60c8d..b8799ee 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -34,7 +36,7 @@
//1. purpose: getLong with boolean property
public void testGetLongFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -47,14 +49,14 @@
//2. purpose: getLong with Defined Byte Property
public void testGetLongConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((long)by, dataObject.getLong(property));
+ assertEquals(by, dataObject.getLong(property));
}
//3. purpose: getLong with Undefined Byte Property
@@ -72,7 +74,7 @@
//4. purpose: getLong with character property
public void testGetLongFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'c');
try {
@@ -85,13 +87,13 @@
//5. purpose: getLong with Defined Double Property
public void testGetLongConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((long)db, dataObject.getLong(property));
+ assertEquals((long)db, dataObject.getLong(property));
}
//6. purpose: getLong with Undefined Double Property
@@ -110,13 +112,13 @@
//7. purpose: getLong with Defined float Property
public void testGetLongConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((long)fl, dataObject.getLong(property));
+ assertEquals((long)fl, dataObject.getLong(property));
}
//8. purpose: getLong with Undefined float Property
@@ -135,13 +137,13 @@
//9. purpose: getLong with Defined int Property
public void testGetLongConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((long)in, dataObject.getLong(property));
+ assertEquals(in, dataObject.getLong(property));
}
//10. purpose: getLong with Undefined int Property
@@ -160,13 +162,13 @@
//11. purpose: getLong with Defined long Property
public void testGetLongConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals(lg, dataObject.getLong(property));
+ assertEquals(lg, dataObject.getLong(property));
}
//12. purpose: getLong with Undefined long Property
@@ -185,13 +187,13 @@
//13. purpose: getLong with Defined short Property
public void testGetLongConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((long)shr, dataObject.getLong(property));
+ assertEquals(shr, dataObject.getLong(property));
}
//14. purpose: getLong with Undefined short Property
@@ -210,14 +212,14 @@
//15. purpose: getLong with Defined String Property
public void testGetLongConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
Long s_d = Long.valueOf(str);
dataObject.setString(property, str);// add it to instance list
- this.assertEquals(s_d.longValue(), dataObject.getLong(property));
+ assertEquals(s_d.longValue(), dataObject.getLong(property));
}
//16. purpose: getLong with Undefined string Property
@@ -235,7 +237,7 @@
//17. purpose: getLong with bytes property
public void testGetLongFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("cde").getBytes());
try {
@@ -248,14 +250,14 @@
//18. purpose: getLong with Defined Decimal Property
public void testGetLongConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
long db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject.setBigDecimal(property, bd);// add it to instance list
- this.assertEquals(bd.longValue(), dataObject.getLong(property));
+ assertEquals(bd.longValue(), dataObject.getLong(property));
}
//19. purpose: getLong with Undefined decimal Property
@@ -274,13 +276,13 @@
//20. purpose: getLong with Defined integer Property
public void testGetLongConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject.setBigInteger(property, bi);// add it to instance list
- this.assertEquals(bi.longValue(), dataObject.getLong(property));
+ assertEquals(bi.longValue(), dataObject.getLong(property));
}
//21. purpose: getLong with Undefined Integer Property
@@ -299,14 +301,14 @@
//22. purpose: getLong with Defined date Property
public void testGetLongConversionFromDefinedDateProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
long d = 120000;
Date bi = new Date(d);
dataObject.setDate(property, bi);// add it to instance list
- this.assertEquals(bi.getTime(), dataObject.getLong(property));
+ assertEquals(bi.getTime(), dataObject.getLong(property));
}
//23. purpose: getLong with Undefined date Property
@@ -333,7 +335,7 @@
}
public void testGetLongFromBooleanObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEANOBJECT);
dataObject.set(property, Boolean.FALSE);
try {
@@ -346,19 +348,19 @@
//2. purpose: getLong with Defined Byte Property
public void testGetLongConversionFromDefinedByteObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
byte by = 12;
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((long)by, dataObject.getLong(property));
+ assertEquals(by, dataObject.getLong(property));
}
//4. purpose: getLong with character property
public void testGetLongFromCharacterObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
dataObject.set(property, Character.valueOf('v'));
try {
@@ -371,60 +373,60 @@
//5. purpose: getLong with Defined Double Property
public void testGetLongConversionFromDefinedDoubleObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
double db = 12;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((long)db, dataObject.getLong(property));
+ assertEquals((long)db, dataObject.getLong(property));
}
//7. purpose: getLong with Defined float Property
public void testGetLongConversionFromDefinedFloatObject() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOATOBJECT);
float fl = 12;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((long)fl, dataObject.getLong(property));
+ assertEquals((long)fl, dataObject.getLong(property));
}
//9. purpose: getLong with Defined int Property
public void testGetLongConversionFromDefinedIntObject() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
int in = 12;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((long)in, dataObject.getLong(property));
+ assertEquals(in, dataObject.getLong(property));
}
//11. purpose: getLong with Defined long Property
public void testGetLongConversionFromDefinedLongObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONGOBJECT);
long lg = 12;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals(lg, dataObject.getLong(property));
+ assertEquals(lg, dataObject.getLong(property));
}
//13. purpose: getLong with Defined short Property
public void testGetLongConversionFromDefinedShortObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORTOBJECT);
short shr = 12;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals((long)shr, dataObject.getLong(property));
+ assertEquals(shr, dataObject.getLong(property));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionWithPathTest.java
index 6c09885..401177f 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongConversionWithPathTest.java
@@ -19,6 +19,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -61,7 +63,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((long)by, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getLong(propertyPath_a_b_c));
}
//3. purpose: getLong with Undefined Byte Property
@@ -106,7 +108,7 @@
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((long)db, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals((long)db, dataObject_a.getLong(propertyPath_a_b_c));
}
//6. purpose: getLong with Undefined Double Property
@@ -136,7 +138,7 @@
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((long)fl, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals((long)fl, dataObject_a.getLong(propertyPath_a_b_c));
}
//8. purpose: getLong with Undefined float Property
@@ -166,7 +168,7 @@
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((long)in, dataObject_a.getLong(property));
+ assertEquals(in, dataObject_a.getLong(property));
}
//10. purpose: getLong with Undefined int Property
@@ -196,7 +198,7 @@
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals(lg, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(lg, dataObject_a.getLong(propertyPath_a_b_c));
}
//12. purpose: getLong with Undefined long Property
@@ -226,7 +228,7 @@
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((long)shr, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(shr, dataObject_a.getLong(propertyPath_a_b_c));
}
//14. purpose: getLong with Undefined short Property
@@ -257,7 +259,7 @@
Long s_d = Long.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(s_d.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
}
//16. purpose: getLong with Undefined string Property
@@ -303,7 +305,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(bd.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
}
//19. purpose: getLong with Undefined decimal Property
@@ -333,7 +335,7 @@
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(bi.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
}
//21. purpose: getLong with Undefined Integer Property
@@ -364,7 +366,7 @@
Date bi = new Date(d);
dataObject_a.setDate(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.getTime(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(bi.getTime(), dataObject_a.getLong(propertyPath_a_b_c));
}
//23. purpose: getLong with Undefined date Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongWithIndexConversionTest.java
index 1a77689..2857c0b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetLongWithIndexConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -35,7 +37,7 @@
//1. purpose: getLong with boolean property
public void testGetLongFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -48,14 +50,14 @@
//2. purpose: getLong with Defined Byte Property
public void testGetLongConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject.setByte(PROPERTY_INDEX, by);// add it to instance list
- this.assertEquals((long)by, dataObject.getLong(PROPERTY_INDEX));
+ assertEquals(by, dataObject.getLong(PROPERTY_INDEX));
}
//3. purpose: getLong with Undefined Byte Property
@@ -72,7 +74,7 @@
//4. purpose: getLong with character property
public void testGetLongFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'l');
try {
@@ -85,83 +87,83 @@
//5. purpose: getLong with Defined Double Property
public void testGetLongConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject.setDouble(PROPERTY_INDEX, db);// add it to instance list
- this.assertEquals((long)db, dataObject.getLong(PROPERTY_INDEX));
+ assertEquals((long)db, dataObject.getLong(PROPERTY_INDEX));
}
//7. purpose: getLong with Defined float Property
public void testGetLongConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
- this.assertEquals((long)fl, dataObject.getLong(PROPERTY_INDEX));
+ assertEquals((long)fl, dataObject.getLong(PROPERTY_INDEX));
}
//9. purpose: getLong with Defined int Property
public void testGetLongConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(PROPERTY_INDEX, in);// add it to instance list
- this.assertEquals((long)in, dataObject.getLong(PROPERTY_INDEX));
+ assertEquals(in, dataObject.getLong(PROPERTY_INDEX));
}
//11. purpose: getLong with Defined long Property
public void testGetLongConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(PROPERTY_INDEX, lg);// add it to instance list
- this.assertEquals(lg, dataObject.getLong(PROPERTY_INDEX));
+ assertEquals(lg, dataObject.getLong(PROPERTY_INDEX));
}
//13. purpose: getLong with Defined short Property
public void testGetLongConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(PROPERTY_INDEX, shr);// add it to instance list
- this.assertEquals((long)shr, dataObject.getLong(PROPERTY_INDEX));
+ assertEquals(shr, dataObject.getLong(PROPERTY_INDEX));
}
//15. purpose: getLong with Defined String Property
public void testGetLongConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
Long s_d = Long.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(s_d.longValue(), dataObject.getLong(PROPERTY_INDEX));
+ assertEquals(s_d.longValue(), dataObject.getLong(PROPERTY_INDEX));
}
//17. purpose: getLong with bytes property
public void testGetLongFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("eee").getBytes());
try {
@@ -174,7 +176,7 @@
//18. purpose: getLong with Defined Decimal Property
public void testGetLongConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
@@ -182,33 +184,33 @@
BigDecimal bd = new BigDecimal(db);
dataObject.setBigDecimal(PROPERTY_INDEX, bd);// add it to instance list
- this.assertEquals(bd.longValue(), dataObject.getLong(PROPERTY_INDEX));
+ assertEquals(bd.longValue(), dataObject.getLong(PROPERTY_INDEX));
}
//20. purpose: getLong with Defined integer Property
public void testGetLongConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject.setBigInteger(PROPERTY_INDEX, bi);// add it to instance list
- this.assertEquals(bi.longValue(), dataObject.getLong(PROPERTY_INDEX));
+ assertEquals(bi.longValue(), dataObject.getLong(PROPERTY_INDEX));
}
//22. purpose: getLong with Defined date Property
public void testGetLongConversionFromDefinedDateProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
long d = 120000;
Date bi = new Date(d);
dataObject.setDate(PROPERTY_INDEX, bi);// add it to instance list
- this.assertEquals(bi.getTime(), dataObject.getLong(PROPERTY_INDEX));
+ assertEquals(bi.getTime(), dataObject.getLong(PROPERTY_INDEX));
}
//purpose: getLong with nul value
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathTest.java
index c941cad..b44f040 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
try {
@@ -61,7 +62,7 @@
XMLDocument document = xmlHelper.load(inStream);
aRoot = (SDODataObject)document.getRootObject();
// reset changes if changeSummary=true
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot.getChangeSummary();
+ SDOChangeSummary aCS = aRoot.getChangeSummary();
if (aCS != null) {
//aCS.resetChanges();
aCS.endLogging();
@@ -147,34 +148,34 @@
public void testGetPathFromAncestorFromContainedToParent() {
SDODataObject target = (SDODataObject)aRoot5.get("items");
SDODataObject aSibling = (SDODataObject)aRoot5.get("items/item[2]");
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aSibling, target,(SDOChangeSummary)aSibling.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aSibling, target, aSibling.getChangeSummary());
assertNotNull(aPath);
assertEquals("ns0:item[2]", aPath);
}
public void testGetPathFromAncestorFromChildToRoot() {
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5,(SDOChangeSummary)anItem.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5, anItem.getChangeSummary());
assertNotNull(aPath);
assertEquals("ns0:items/ns0:item[2]", aPath);
}
public void testGetPathFromAncestorFromChildToCurrentObject() {
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,anItem,(SDOChangeSummary)anItem.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,anItem, anItem.getChangeSummary());
assertNotNull(aPath);
assertEquals(SDOConstants.EMPTY_STRING, aPath);
}
public void testGetPathFromAncestorFromRootToCurrentObject() {
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,aRoot5, aRoot5.getChangeSummary());
assertNotNull(aPath);
assertEquals(SDOConstants.EMPTY_STRING, aPath);
}
public void testGetPathFromAncestorFromRootToSibling() {
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,anItem,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,anItem, aRoot5.getChangeSummary());
assertEquals(SDOConstants.SDO_XPATH_INVALID_PATH, aPath);
}
@@ -182,7 +183,7 @@
public void testGetPathFromAncestorFromChildToSibling() {
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
SDODataObject aSibling = (SDODataObject)aRoot5.get("shipTo");
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aSibling,(SDOChangeSummary)anItem.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aSibling, anItem.getChangeSummary());
assertEquals(SDOConstants.SDO_XPATH_INVALID_PATH, aPath);
}
@@ -191,12 +192,12 @@
SDODataObject aSibling = (SDODataObject)aRoot5.get("items/item[2]");
// get changeSummary
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
assertFalse(aCS.isLogging());
// delete source object
aSibling.delete();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aSibling,target,(SDOChangeSummary)target.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aSibling,target, target.getChangeSummary());
assertEquals(SDOConstants.SDO_XPATH_INVALID_PATH, aPath);
}
@@ -205,12 +206,12 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
// get changeSummary
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
assertFalse(aCS.isLogging());
// delete source object, useXPathFormat
anItem.delete();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5, aRoot5.getChangeSummary());
assertNull(aPath);
// get path to root
@@ -223,21 +224,21 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
// get changeSummary
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
assertFalse(aCS.isLogging());
// delete source object
anItem.delete();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,anItem,(SDOChangeSummary)anItem.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,anItem, anItem.getChangeSummary());
assertNotNull(aPath);
assertEquals(SDOConstants.EMPTY_STRING, aPath);
}
public void testGetPathFromAncestorDeletedFromRootToCurrentObjectLoggingOff() {
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,aRoot5, aRoot5.getChangeSummary());
// get changeSummary
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
assertFalse(aCS.isLogging());
// delete source object
@@ -248,10 +249,10 @@
public void testGetPathFromAncestorDeletedFromRootToSiblingLoggingOff() {
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,anItem,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,anItem, aRoot5.getChangeSummary());
// get changeSummary
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
assertFalse(aCS.isLogging());
// delete source object
aRoot5.delete();
@@ -265,11 +266,11 @@
SDODataObject aSibling = (SDODataObject)aRoot5.get("items/item[2]");
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
// delete source object
aSibling.delete();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aSibling,target,(SDOChangeSummary)target.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aSibling,target, target.getChangeSummary());
assertNotNull(aPath);
// TODO: no storage of deleted indexed postition - defaults to size() = start of list for now
// see SDODataObject: index = ((SDODataObject)parent).getList(aChild).size();
@@ -280,13 +281,13 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("billTo");
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// modifydelete source object
((SDODataObject)aRoot5.get("billTo")).set("name", "new name");
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5,(SDOChangeSummary)anItem.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5, anItem.getChangeSummary());
assertNotNull(aPath);
assertEquals("ns0:billTo", aPath);
}
@@ -295,13 +296,13 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("billTo");
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// delete source object
((SDODataObject)aRoot5.get("billTo")).detach();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5, aRoot5.getChangeSummary());
assertNotNull(aPath);
assertEquals("ns0:billTo", aPath);
}
@@ -311,14 +312,14 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// delete source object
SDODataObject deletedObject = ((SDODataObject)aRoot5.get("items"));
deletedObject.delete();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5, aRoot5.getChangeSummary());
assertNotNull(aPath);
// TODO: no storage of deleted indexed postition - defaults to size() = start of list for now
@@ -331,14 +332,14 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// delete source object
//SDODataObject deletedObject = ((SDODataObject)aRoot5.get("items"));
anItem.delete();//detach();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5, aRoot5.getChangeSummary());
//SDODataObject anItemFromPath = (SDODataObject)aRoot5.get(aPath);
//System.out.println("testGetPathFromAncestorDeletedFromChildToRootLoggingOn: " + aPath);
@@ -352,14 +353,14 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("billTo/phone[1]");
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// delete source object
SDODataObject deletedObjectParent = ((SDODataObject)aRoot5.get("billTo"));
deletedObjectParent.delete();//detach();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5, aRoot5.getChangeSummary());
//SDODataObject anItemFromPath = (SDODataObject)aRoot5.get(aPath);
//System.out.println("testGetPathFromAncestorDeletedFromChildToRootLoggingOn: " + aPath);
@@ -374,14 +375,14 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// delete source object
//SDODataObject deletedObject = ((SDODataObject)aRoot5.get("items"));
anItem.delete();//detach();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5, aRoot5.getChangeSummary());
assertNotNull(aPath);
// TODO: no storage of deleted indexed postition - defaults to size() = start of list for now
@@ -395,7 +396,7 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// delete source object
@@ -403,7 +404,7 @@
anItem.detach();
//String aPath = anItem.getPathFromAncestor(aCS, aRoot5, useXPathFormat);
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,aRoot5, aRoot5.getChangeSummary());
//SDODataObject anItemFromPath = (SDODataObject)aRoot5.get(aPath);
assertNotNull(aPath);
@@ -416,23 +417,23 @@
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// delete source object
anItem.delete();
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,anItem,(SDOChangeSummary)anItem.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(anItem,anItem, anItem.getChangeSummary());
assertNotNull(aPath);
assertEquals(SDOConstants.EMPTY_STRING, aPath);
}
public void testGetXPathFromAncestorDeletedFromRootToCurrentObjectLoggingOn() {
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,aRoot5,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,aRoot5, aRoot5.getChangeSummary());
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// delete source object
@@ -443,10 +444,10 @@
public void testGetPathFromAncestorDeletedFromRootToSiblingLoggingOn() {
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,anItem,(SDOChangeSummary)aRoot5.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aRoot5,anItem, aRoot5.getChangeSummary());
// start logging
- SDOChangeSummary aCS = (SDOChangeSummary)aRoot5.getChangeSummary();
+ SDOChangeSummary aCS = aRoot5.getChangeSummary();
aCS.beginLogging();
assertTrue(aCS.isLogging());
// delete source object
@@ -457,7 +458,7 @@
public void testGetXPathFromAncestorFromContainedToParent() {
SDODataObject target = (SDODataObject)aRoot5.get("items");
SDODataObject aSibling = (SDODataObject)aRoot5.get("items/item[2]");
- String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aSibling,target,(SDOChangeSummary)aSibling.getChangeSummary());
+ String aPath = ((SDOMarshalListener)((SDOXMLHelper)xmlHelper).getXmlMarshaller().getMarshalListener()).getPathFromAncestor(aSibling,target, aSibling.getChangeSummary());
assertNotNull(aPath);
assertEquals("ns0:item[2]", aPath);
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortByPositionalPathTest.java
index 7a42884..1202b61 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortByPositionalPathTest.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -35,7 +37,7 @@
//1. purpose: getShort with boolean property
public void testGetShortFromBoolean() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject_c.set(property, true);
try {
@@ -48,14 +50,14 @@
//2. purpose: getShort with Defined Byte Property
public void testGetShortConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((short)by, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getShort(propertyPath_a_b_c));
}
//3. purpose: getShort with Undefined Byte Property
@@ -70,7 +72,7 @@
//4. purpose: getShort with character property
public void testGetShortFromCharacter() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject_c.set(property, 'e');
try {
@@ -83,25 +85,25 @@
//5. purpose: getShort with Defined Double Property
public void testGetShortConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((short)db, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)db, dataObject_a.getShort(propertyPath_a_b_c));
}
//7. purpose: getShort with Defined float Property
public void testGetShortConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((short)fl, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)fl, dataObject_a.getShort(propertyPath_a_b_c));
}
@@ -109,13 +111,13 @@
//9. purpose: getShort with Defined int Property
public void testGetShortConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((short)in, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)in, dataObject_a.getShort(propertyPath_a_b_c));
}
@@ -123,33 +125,33 @@
//11. purpose: getShort with Defined long Property
public void testGetShortConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((short)lg, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)lg, dataObject_a.getShort(propertyPath_a_b_c));
}
//13. purpose: getShort with Defined short Property
public void testGetShortConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals(shr, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals(shr, dataObject_a.getShort(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
short shr = 12;
List b = new ArrayList();
@@ -158,15 +160,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setShort(property3, shr);
- this.assertEquals(shr, dataObject_a.getShort(property3));
+ assertEquals(shr, dataObject_a.getShort(property3));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
short shr = 12;
List b = new ArrayList();
@@ -174,19 +176,19 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setShort(property + ".0", shr);
- this.assertEquals(shr, dataObject_a.getShort(property + ".0"));
+ assertEquals(shr, dataObject_a.getShort(property + ".0"));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject_a.setShort(property1, shr);// c dataobject's a property has value boolean 'true'
- this.assertEquals(shr, dataObject_a.getShort(property1));
+ assertEquals(shr, dataObject_a.getShort(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -211,20 +213,20 @@
//15. purpose: getShort with Defined String Property
public void testGetShortConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
Short s_d = Short.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.shortValue(), dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals(s_d.shortValue(), dataObject_a.getShort(propertyPath_a_b_c));
}
//17. purpose: getShort with bytes property
public void testGetShortFromBytes() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_BYTES);
dataObject_c.set(property, new String("eee").getBytes());
try {
@@ -236,7 +238,7 @@
//18. purpose: getShort with decimal property
public void testGetShortFromDecimal() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_DECIMAL);
dataObject_c.set(property, new BigDecimal(2));
try {
@@ -250,7 +252,7 @@
//19. purpose: getShort with integer property
public void testGetShortFromInteger() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_INTEGER);
dataObject_c.set(property, new BigInteger("3"));
try {
@@ -264,7 +266,7 @@
//22. purpose: getShort with date property
public void testGetShortFromDate() {
- SDOProperty property = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty property = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
property.setType(SDOConstants.SDO_DATE);
dataObject_c.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionTest.java
index dec9b54..1ee665b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -34,7 +36,7 @@
//1. purpose: getShort with boolean property
public void testGetShortFromBoolean() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
try {
@@ -48,14 +50,14 @@
//2. purpose: getShort with Defined Byte Property
public void testGetShortConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((short)by, dataObject.getShort(property));
+ assertEquals(by, dataObject.getShort(property));
}
//3. purpose: getShort with Undefined Byte Property
@@ -73,7 +75,7 @@
//4. purpose: getShort with character property
public void testGetShortFromCharacter() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property,'a');
try {
@@ -86,13 +88,13 @@
//5. purpose: getShort with Defined Double Property
public void testGetShortConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((short)db, dataObject.getShort(property));
+ assertEquals((short)db, dataObject.getShort(property));
}
//6. purpose: getShort with Undefined Double Property
@@ -111,13 +113,13 @@
//7. purpose: getShort with Defined float Property
public void testGetShortConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((short)fl, dataObject.getShort(property));
+ assertEquals((short)fl, dataObject.getShort(property));
}
//8. purpose: getShort with Undefined float Property
@@ -136,13 +138,13 @@
//9. purpose: getShort with Defined int Property
public void testGetShortConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((short)in, dataObject.getShort(property));
+ assertEquals((short)in, dataObject.getShort(property));
}
//10. purpose: getShort with Undefined int Property
@@ -161,13 +163,13 @@
//11. purpose: getShort with Defined long Property
public void testGetShortConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((short)lg, dataObject.getShort(property));
+ assertEquals((short)lg, dataObject.getShort(property));
}
//12. purpose: getShort with Undefined long Property
@@ -186,13 +188,13 @@
//13. purpose: getShort with Defined short Property
public void testGetShortConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals(shr, dataObject.getShort(property));
+ assertEquals(shr, dataObject.getShort(property));
}
//14. purpose: getShort with Undefined short Property
@@ -211,14 +213,14 @@
//15. purpose: getShort with Defined String Property
public void testGetShortConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
Short s_d = Short.valueOf(str);
dataObject.setString(property, str);// add it to instance list
- this.assertEquals(s_d.shortValue(), dataObject.getShort(property));
+ assertEquals(s_d.shortValue(), dataObject.getShort(property));
}
//16. purpose: getShort with Undefined string Property
@@ -236,7 +238,7 @@
//17. purpose: getShort with bytes property
public void testGetShortFromBytes() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte[] bytes = new String("abc").getBytes();
dataObject.set(property, bytes);
@@ -249,7 +251,7 @@
//18. purpose: getShort with decimal property
public void testGetShortFromDecimal() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
BigDecimal bd = new BigDecimal(2);
dataObject.set(property, bd);
@@ -263,7 +265,7 @@
//19. purpose: getShort with integer property
public void testGetShortFromInteger() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
dataObject.set(property, Integer.valueOf("123"));
try {
@@ -276,7 +278,7 @@
//22. purpose: getShort with date property
public void testGetShortFromDate() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
@@ -297,7 +299,7 @@
}
public void testGetShortFromBooleanObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEANOBJECT);
dataObject.set(property, Boolean.FALSE);
try {
@@ -310,19 +312,19 @@
//2. purpose: getShort with Defined Byte Property
public void testGetShortConversionFromDefinedBytePbject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTEOBJECT);
byte by = 12;
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals((short)by, dataObject.getShort(property));
+ assertEquals(by, dataObject.getShort(property));
}
//4. purpose: getShort with character property
public void testGetShortFromCharacterObject() {
- SDOProperty property = (SDOProperty)dataObject.getInstanceProperty(PROPERTY_NAME);
+ SDOProperty property = dataObject.getInstanceProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTEROBJECT);
dataObject.set(property,Character.valueOf('a'));
try {
@@ -335,60 +337,60 @@
//5. purpose: getShort with Defined Double Property
public void testGetShortConversionFromDefinedDoubleObject() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLEOBJECT);
double db = 12;
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals((short)db, dataObject.getShort(property));
+ assertEquals((short)db, dataObject.getShort(property));
}
//7. purpose: getShort with Defined float Property
public void testGetShortConversionFromDefinedFloatObject() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOATOBJECT);
float fl = 12;
dataObject.setFloat(property, fl);// add it to instance list
- this.assertEquals((short)fl, dataObject.getShort(property));
+ assertEquals((short)fl, dataObject.getShort(property));
}
//9. purpose: getShort with Defined int Property
public void testGetShortConversionFromDefinedIntObject() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTOBJECT);
int in = 12;
dataObject.setInt(property, in);// add it to instance list
- this.assertEquals((short)in, dataObject.getShort(property));
+ assertEquals((short)in, dataObject.getShort(property));
}
//11. purpose: getShort with Defined long Property
public void testGetShortConversionFromDefinedLongObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONGOBJECT);
long lg = 12;
dataObject.setLong(property, lg);// add it to instance list
- this.assertEquals((short)lg, dataObject.getShort(property));
+ assertEquals((short)lg, dataObject.getShort(property));
}
//13. purpose: getShort with Defined short Property
public void testGetShortConversionFromDefinedShortObject() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORTOBJECT);
short shr = 12;
dataObject.setShort(property, shr);// add it to instance list
- this.assertEquals(shr, dataObject.getShort(property));
+ assertEquals(shr, dataObject.getShort(property));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionWithPathTest.java
index 56e9994..d957e32 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortConversionWithPathTest.java
@@ -19,6 +19,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -61,7 +63,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((short)by, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getShort(propertyPath_a_b_c));
}
//3. purpose: getShort with Undefined Byte Property
@@ -106,7 +108,7 @@
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((short)db, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)db, dataObject_a.getShort(propertyPath_a_b_c));
}
//6. purpose: getShort with Undefined Double Property
@@ -136,7 +138,7 @@
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((short)fl, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)fl, dataObject_a.getShort(propertyPath_a_b_c));
}
//8. purpose: getShort with Undefined float Property
@@ -166,7 +168,7 @@
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((short)in, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)in, dataObject_a.getShort(propertyPath_a_b_c));
}
//10. purpose: getShort with Undefined int Property
@@ -196,7 +198,7 @@
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((short)lg, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)lg, dataObject_a.getShort(propertyPath_a_b_c));
}
//12. purpose: getShort with Undefined long Property
@@ -226,7 +228,7 @@
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals(shr, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals(shr, dataObject_a.getShort(propertyPath_a_b_c));
}
//14. purpose: getShort with Undefined short Property
@@ -257,7 +259,7 @@
Short s_d = Short.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.shortValue(), dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals(s_d.shortValue(), dataObject_a.getShort(propertyPath_a_b_c));
}
//16. purpose: getShort with Undefined string Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortWithIndexConversionTest.java
index bde9a44..ed883b6 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetShortWithIndexConversionTest.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Calendar;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -36,7 +38,7 @@
//1. purpose: getShort with boolean property
public void testGetShortFromBoolean() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
dataObject.set(property, true);
@@ -47,14 +49,14 @@
//2. purpose: getShort with Defined Byte Property
public void testGetShortConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
dataObject.setByte(PROPERTY_INDEX, by);// add it to instance list
- this.assertEquals((short)by, dataObject.getShort(PROPERTY_INDEX));
+ assertEquals(by, dataObject.getShort(PROPERTY_INDEX));
}
//3. purpose: getShort with Undefined Byte Property
@@ -70,7 +72,7 @@
//4. purpose: getShort with character property
public void testGetShortFromCharacter() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
dataObject.set(property, 'k');
try {
@@ -83,81 +85,81 @@
//5. purpose: getShort with Defined Double Property
public void testGetShortConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
dataObject.setDouble(PROPERTY_INDEX, db);// add it to instance list
- this.assertEquals((short)db, dataObject.getShort(PROPERTY_INDEX));
+ assertEquals((short)db, dataObject.getShort(PROPERTY_INDEX));
}
//7. purpose: getShort with Defined float Property
public void testGetShortConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
- this.assertEquals((short)fl, dataObject.getShort(PROPERTY_INDEX));
+ assertEquals((short)fl, dataObject.getShort(PROPERTY_INDEX));
}
//9. purpose: getShort with Defined int Property
public void testGetShortConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(PROPERTY_INDEX, in);// add it to instance list
- this.assertEquals((short)in, dataObject.getShort(PROPERTY_INDEX));
+ assertEquals((short)in, dataObject.getShort(PROPERTY_INDEX));
}
//11. purpose: getShort with Defined long Property
public void testGetShortConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(PROPERTY_INDEX, lg);// add it to instance list
- this.assertEquals((short)lg, dataObject.getShort(PROPERTY_INDEX));
+ assertEquals((short)lg, dataObject.getShort(PROPERTY_INDEX));
}
//13. purpose: getShort with Defined short Property
public void testGetShortConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(PROPERTY_INDEX, shr);// add it to instance list
- this.assertEquals(shr, dataObject.getShort(PROPERTY_INDEX));
+ assertEquals(shr, dataObject.getShort(PROPERTY_INDEX));
}
//15. purpose: getShort with Defined String Property
public void testGetShortConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
Short s_d = Short.valueOf(str);
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(s_d.shortValue(), dataObject.getShort(PROPERTY_INDEX));
+ assertEquals(s_d.shortValue(), dataObject.getShort(PROPERTY_INDEX));
}
//17. purpose: getShort with bytes property
public void testGetShortFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
dataObject.set(property, new String("rrr").getBytes());
try {
@@ -169,7 +171,7 @@
//18. purpose: getShort with decimal property
public void testGetShortFromDecimal() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
dataObject.set(property, new BigDecimal("2"));
try {
@@ -183,7 +185,7 @@
//19. purpose: getShort with integer property
public void testGetShortFromInteger() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
dataObject.set(property, new BigInteger("2"));
try {
@@ -197,7 +199,7 @@
//22. purpose: getShort with date property
public void testGetShortFromDate() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
dataObject.set(property, Calendar.getInstance().getTime());
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringByPositionalPathTest.java
index 95e299d..0addcf0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringByPositionalPathTest.java
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.TimeZone;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -40,13 +41,13 @@
//1. purpose: getString with Defined boolean Property
public void testGetStringConversionFromDefinedBoolean() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BOOLEAN);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BOOLEAN);
boolean str = true;
Boolean B_STR = Boolean.valueOf(str);
dataObject_a.setBoolean(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(B_STR.toString(), dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(B_STR.toString(), dataObject_a.getString(propertyPath_a_b_c));
}
//2. purpose: getString with Undefined boolean Property
@@ -62,14 +63,14 @@
//3. purpose: getString with Defined Byte Property
public void testGetStringConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_BYTE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_BYTE);
byte by = 12;
String by_ = String.valueOf(by);
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals(by_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(by_, dataObject_a.getString(propertyPath_a_b_c));
}
@@ -77,13 +78,13 @@
//4. purpose: getString with Defined character Property
public void testGetStringConversionFromDefinedCharacterProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_CHARACTER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_CHARACTER);
char str = 'c';
String str_ = String.valueOf(str);
dataObject_a.setChar(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(str_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(str_, dataObject_a.getString(propertyPath_a_b_c));
}
@@ -91,50 +92,50 @@
//6. purpose: getString with Defined Double Property
public void testGetStringConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DOUBLE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DOUBLE);
double db = 12;
String db_ = "12.0";// String.valueOf(12);
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals(db_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(db_, dataObject_a.getString(propertyPath_a_b_c));
}
//8. purpose: getString with Defined float Property
public void testGetIntConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_FLOAT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
String fl_ = String.valueOf(fl);
- this.assertEquals(fl_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(fl_, dataObject_a.getString(propertyPath_a_b_c));
}
//10. purpose: getString with Defined int Property
public void testGetStringConversionFromDefinedIntProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INT);
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
String in_ = String.valueOf(in);
- this.assertEquals(in_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(in_, dataObject_a.getString(propertyPath_a_b_c));
}
//12. purpose: getString with Defined long Property
public void testGetStringConversionFromDefinedLongProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_LONG);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
String lg_ = String.valueOf(lg);
- this.assertEquals(lg_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(lg_, dataObject_a.getString(propertyPath_a_b_c));
}
@@ -142,13 +143,13 @@
//14. purpose: getString with Defined short Property
public void testGetStringConversionFromDefinedShortProperty() {
// dataObject's type add short property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_SHORT);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
String shr_ = String.valueOf(shr);
- this.assertEquals(shr_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(shr_, dataObject_a.getString(propertyPath_a_b_c));
}
@@ -156,19 +157,19 @@
//16. purpose: getString with Defined String Property
public void testGetIntConversionFromDefinedStringProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(str, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(str, dataObject_a.getString(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
String str = "12";
List b = new ArrayList();
@@ -177,15 +178,15 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setString(property3, str);
- this.assertEquals(str, dataObject_a.getString(property3));
+ assertEquals(str, dataObject_a.getString(property3));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyDotPositionalSet() {
// dataObject's type add boolean property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setMany(true);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setMany(true);
String str = "12";
List b = new ArrayList();
@@ -193,19 +194,19 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setString(property + ".0", str);
- this.assertEquals(str, dataObject_a.getString(property + ".0"));
+ assertEquals(str, dataObject_a.getString(property + ".0"));
}
//1. purpose: getBoolean with Defined Boolean Property
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyBracketInPathMiddle() {
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_STRING);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_STRING);
String str = "12";
dataObject_a.setString(property1, str);// c dataobject's a property has value boolean 'true'
- this.assertEquals(str, dataObject_a.getString(property1));
+ assertEquals(str, dataObject_a.getString(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -229,7 +230,7 @@
//18. purpose: getString with bytes property
public void testGetStringFromBytes() {
- SDOProperty prop = ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C));
+ SDOProperty prop = dataObject_c.getInstanceProperty(PROPERTY_NAME_C);
prop.setType(SDOConstants.SDO_BYTES);
byte[] bytes = new byte[]{10, 100};
@@ -245,25 +246,25 @@
//19. purpose: getString with Defined Decimal Property
public void testGetStringConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DECIMAL);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.toString(), dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(bd.toString(), dataObject_a.getString(propertyPath_a_b_c));
}
//21. purpose: getString with Defined integer Property
public void testGetStringConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_INTEGER);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.toString(), dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(bi.toString(), dataObject_a.getString(propertyPath_a_b_c));
}
@@ -271,7 +272,7 @@
//23. purpose: getString with Defined date Property
public void testGetStringConversionFromDefinedDateProperty() {
// dataObject's type add int property
- ((SDOProperty)dataObject_c.getInstanceProperty(PROPERTY_NAME_C)).setType(SDOConstants.SDO_DATE);
+ dataObject_c.getInstanceProperty(PROPERTY_NAME_C).setType(SDOConstants.SDO_DATE);
//long d = 120000;
//Date bi = new Date(d);
@@ -287,7 +288,7 @@
//dataObject.setString(property, "2001-01-01");// add it to instance list
dataObject_a.setDate(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals("2001-01-01T00:00:00Z", dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals("2001-01-01T00:00:00Z", dataObject_a.getString(propertyPath_a_b_c));
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversion.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversion.java
index a5089dd..7b57eea 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversion.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversion.java
@@ -22,6 +22,7 @@
import java.util.Date;
import java.util.TimeZone;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -40,14 +41,14 @@
//1. purpose: getString with Defined boolean Property
public void testGetStringConversionFromDefinedBoolean() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
boolean str = true;
Boolean B_STR = Boolean.valueOf(str);
dataObject.setBoolean(property, str);// add it to instance list
- this.assertEquals(B_STR.toString(), dataObject.getString(property));
+ assertEquals(B_STR.toString(), dataObject.getString(property));
}
//2. purpose: getString with Undefined boolean Property
@@ -66,7 +67,7 @@
//3. purpose: getString with Defined Byte Property
public void testGetStringConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
@@ -74,7 +75,7 @@
dataObject.setByte(property, by);// add it to instance list
- this.assertEquals(by_, dataObject.getString(property));
+ assertEquals(by_, dataObject.getString(property));
}
//3. purpose: getString with Undefined Byte Property
@@ -93,14 +94,14 @@
//4. purpose: getString with Defined character Property
public void testGetStringConversionFromDefinedCharacterProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
char str = 'c';
String str_ = String.valueOf(str);
dataObject.setChar(property, str);// add it to instance list
- this.assertEquals(str_, dataObject.getString(property));
+ assertEquals(str_, dataObject.getString(property));
}
//5. purpose: getString with Undefined boolean Property
@@ -119,14 +120,14 @@
//6. purpose: getString with Defined Double Property
public void testGetStringConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
String db_ = "12.0";// String.valueOf(12);
dataObject.setDouble(property, db);// add it to instance list
- this.assertEquals(db_, dataObject.getString(property));
+ assertEquals(db_, dataObject.getString(property));
}
//7. purpose: getString with Undefined Double Property
@@ -145,14 +146,14 @@
//8. purpose: getString with Defined float Property
public void testGetIntConversionFromDefinedFloatProperty() {
// dataObject's type add float property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_FLOAT);
float fl = 12;
dataObject.setFloat(property, fl);// add it to instance list
String fl_ = String.valueOf(fl);
- this.assertEquals(fl_, dataObject.getString(property));
+ assertEquals(fl_, dataObject.getString(property));
}
//9. purpose: getString with Undefined float Property
@@ -171,14 +172,14 @@
//10. purpose: getString with Defined int Property
public void testGetStringConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(property, in);// add it to instance list
String in_ = String.valueOf(in);
- this.assertEquals(in_, dataObject.getString(property));
+ assertEquals(in_, dataObject.getString(property));
}
//11. purpose: getString with Undefined int Property
@@ -197,14 +198,14 @@
//12. purpose: getString with Defined long Property
public void testGetStringConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(property, lg);// add it to instance list
String lg_ = String.valueOf(lg);
- this.assertEquals(lg_, dataObject.getString(property));
+ assertEquals(lg_, dataObject.getString(property));
}
//13. purpose: getString with Undefined long Property
@@ -223,14 +224,14 @@
//14. purpose: getString with Defined short Property
public void testGetStringConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(property, shr);// add it to instance list
String shr_ = String.valueOf(shr);
- this.assertEquals(shr_, dataObject.getString(property));
+ assertEquals(shr_, dataObject.getString(property));
}
//15. purpose: getString with Undefined short Property
@@ -249,13 +250,13 @@
//16. purpose: getString with Defined String Property
public void testGetIntConversionFromDefinedStringProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_STRING);
String str = "12";
dataObject.setString(property, str);// add it to instance list
- this.assertEquals(str, dataObject.getString(property));
+ assertEquals(str, dataObject.getString(property));
}
//17. purpose: getString with Undefined string Property
@@ -273,7 +274,7 @@
//18. purpose: getString with bytes property
public void testGetStringFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte[] bytes = new byte[]{10, 100};
@@ -289,14 +290,14 @@
//19. purpose: getString with Defined Decimal Property
public void testGetStringConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject.setBigDecimal(property, bd);// add it to instance list
- this.assertEquals(bd.toString(), dataObject.getString(property));
+ assertEquals(bd.toString(), dataObject.getString(property));
}
//20. purpose: getString with Undefined decimal Property
@@ -314,13 +315,13 @@
//21. purpose: getString with Defined integer Property
public void testGetStringConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject.setBigInteger(property, bi);// add it to instance list
- this.assertEquals(bi.toString(), dataObject.getString(property));
+ assertEquals(bi.toString(), dataObject.getString(property));
}
//22. purpose: getString with Undefined Integer Property
@@ -339,7 +340,7 @@
//23. purpose: getString with Defined date Property
public void testGetStringConversionFromDefinedDateProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
//long d = 120000;
@@ -356,7 +357,7 @@
//dataObject.setString(property, "2001-01-01");// add it to instance list
dataObject.setDate(property, bi);// add it to instance list
- this.assertEquals("2001-01-01T00:00:00Z", dataObject.getString(property));
+ assertEquals("2001-01-01T00:00:00Z", dataObject.getString(property));
}
//23. purpose: getString with Undefined date Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversionWithPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversionWithPathTest.java
index f1f5915..37a667a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversionWithPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringConversionWithPathTest.java
@@ -20,6 +20,7 @@
import java.util.Date;
import java.util.TimeZone;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -47,7 +48,7 @@
Boolean B_STR = Boolean.valueOf(str);
dataObject_a.setBoolean(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(B_STR.toString(), dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(B_STR.toString(), dataObject_a.getString(propertyPath_a_b_c));
}
//2. purpose: getString with Undefined boolean Property
@@ -79,7 +80,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals(by_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(by_, dataObject_a.getString(propertyPath_a_b_c));
}
//3. purpose: getString with Undefined Byte Property
@@ -110,7 +111,7 @@
String str_ = String.valueOf(str);
dataObject_a.setChar(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(str_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(str_, dataObject_a.getString(propertyPath_a_b_c));
}
//5. purpose: getString with Undefined boolean Property
@@ -141,7 +142,7 @@
String db_ = "12.0";// String.valueOf(12);
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals(db_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(db_, dataObject_a.getString(propertyPath_a_b_c));
}
//7. purpose: getString with Undefined Double Property
@@ -172,7 +173,7 @@
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
String fl_ = String.valueOf(fl);
- this.assertEquals(fl_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(fl_, dataObject_a.getString(propertyPath_a_b_c));
}
//9. purpose: getString with Undefined float Property
@@ -203,7 +204,7 @@
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
String in_ = String.valueOf(in);
- this.assertEquals(in_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(in_, dataObject_a.getString(propertyPath_a_b_c));
}
//11. purpose: getString with Undefined int Property
@@ -234,7 +235,7 @@
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
String lg_ = String.valueOf(lg);
- this.assertEquals(lg_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(lg_, dataObject_a.getString(propertyPath_a_b_c));
}
//13. purpose: getString with Undefined long Property
@@ -265,7 +266,7 @@
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
String shr_ = String.valueOf(shr);
- this.assertEquals(shr_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(shr_, dataObject_a.getString(propertyPath_a_b_c));
}
//15. purpose: getString with Undefined short Property
@@ -295,7 +296,7 @@
String str = "12";
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(str, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(str, dataObject_a.getString(propertyPath_a_b_c));
}
//17. purpose: getString with Undefined string Property
@@ -344,7 +345,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.toString(), dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(bd.toString(), dataObject_a.getString(propertyPath_a_b_c));
}
//20. purpose: getString with Undefined decimal Property
@@ -374,7 +375,7 @@
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.toString(), dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(bi.toString(), dataObject_a.getString(propertyPath_a_b_c));
}
//22. purpose: getString with Undefined Integer Property
@@ -415,7 +416,7 @@
//dataObject.setString(property, "2001-01-01");// add it to instance list
dataObject_a.setDate(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals("2001-01-01T00:00:00Z", dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals("2001-01-01T00:00:00Z", dataObject_a.getString(propertyPath_a_b_c));
}
//23. purpose: getString with Undefined date Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringWithIndexConversionTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringWithIndexConversionTest.java
index e34d513..ff13a08 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringWithIndexConversionTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectGetStringWithIndexConversionTest.java
@@ -21,6 +21,7 @@
import java.util.Date;
import java.util.TimeZone;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -40,14 +41,14 @@
//1. purpose: getString with Defined boolean Property
public void testGetStringConversionFromDefinedBoolean() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BOOLEAN);
boolean str = true;
Boolean B_STR = Boolean.valueOf(str);
dataObject.setBoolean(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(B_STR.toString(), dataObject.getString(PROPERTY_INDEX));
+ assertEquals(B_STR.toString(), dataObject.getString(PROPERTY_INDEX));
}
//2. purpose: getString with Undefined boolean Property
@@ -64,40 +65,40 @@
//3. purpose: getString with Defined Byte Property
public void testGetStringConversionFromDefinedByteProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTE);
byte by = 12;
String by_ = String.valueOf(by);
dataObject.setByte(PROPERTY_INDEX, by);// add it to instance list
- this.assertEquals(by_, dataObject.getString(PROPERTY_INDEX));
+ assertEquals(by_, dataObject.getString(PROPERTY_INDEX));
}
//4. purpose: getString with Defined character Property
public void testGetStringConversionFromDefinedCharacterProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_CHARACTER);
char str = 'c';
String str_ = String.valueOf(str);
dataObject.setChar(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(str_, dataObject.getString(PROPERTY_INDEX));
+ assertEquals(str_, dataObject.getString(PROPERTY_INDEX));
}
//6. purpose: getString with Defined Double Property
public void testGetStringConversionFromDefinedDoubleProperty() {
// dataObject's type add boolean property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DOUBLE);
double db = 12;
String db_ = "12.0";//tring.valueOf(12);
dataObject.setDouble(PROPERTY_INDEX, db);// add it to instance list
- this.assertEquals(db_, dataObject.getString(PROPERTY_INDEX));
+ assertEquals(db_, dataObject.getString(PROPERTY_INDEX));
}
//8. purpose: getString with Defined float Property
@@ -112,46 +113,46 @@
dataObject.setFloat(PROPERTY_INDEX, fl);// add it to instance list
String fl_ = String.valueOf(fl);
- this.assertEquals(fl_, dataObject.getString(PROPERTY_INDEX));
+ assertEquals(fl_, dataObject.getString(PROPERTY_INDEX));
}
//10. purpose: getString with Defined int Property
public void testGetStringConversionFromDefinedIntProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INT);
int in = 12;
dataObject.setInt(PROPERTY_INDEX, in);// add it to instance list
String in_ = String.valueOf(in);
- this.assertEquals(in_, dataObject.getString(PROPERTY_INDEX));
+ assertEquals(in_, dataObject.getString(PROPERTY_INDEX));
}
//12. purpose: getString with Defined long Property
public void testGetStringConversionFromDefinedLongProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_LONG);
long lg = 12;
dataObject.setLong(PROPERTY_INDEX, lg);// add it to instance list
String lg_ = String.valueOf(lg);
- this.assertEquals(lg_, dataObject.getString(PROPERTY_INDEX));
+ assertEquals(lg_, dataObject.getString(PROPERTY_INDEX));
}
//14. purpose: getString with Defined short Property
public void testGetStringConversionFromDefinedShortProperty() {
// dataObject's type add short property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_SHORT);
short shr = 12;
dataObject.setShort(PROPERTY_INDEX, shr);// add it to instance list
String shr_ = String.valueOf(shr);
- this.assertEquals(shr_, dataObject.getString(PROPERTY_INDEX));
+ assertEquals(shr_, dataObject.getString(PROPERTY_INDEX));
}
//16. purpose: getString with Defined String Property
@@ -165,12 +166,12 @@
String str = "12";
dataObject.setString(PROPERTY_INDEX, str);// add it to instance list
- this.assertEquals(str, dataObject.getString(PROPERTY_INDEX));
+ assertEquals(str, dataObject.getString(PROPERTY_INDEX));
}
//18. purpose: getString with bytes property
public void testGetStringFromBytes() {
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_BYTES);
byte [] bytes = new byte[]{10, 100};
dataObject.set(property, bytes);
@@ -184,32 +185,32 @@
//19. purpose: getString with Defined Decimal Property
public void testGetStringConversionFromDefinedDecimalProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DECIMAL);
int db = 12;
BigDecimal bd = new BigDecimal(db);
dataObject.setBigDecimal(PROPERTY_INDEX, bd);// add it to instance list
- this.assertEquals(bd.toString(), dataObject.getString(PROPERTY_INDEX));
+ assertEquals(bd.toString(), dataObject.getString(PROPERTY_INDEX));
}
//21. purpose: getString with Defined integer Property
public void testGetStringConversionFromDefinedIntegerProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_INTEGER);
BigInteger bi = new BigInteger("12");
dataObject.setBigInteger(PROPERTY_INDEX, bi);// add it to instance list
- this.assertEquals(bi.toString(), dataObject.getString(PROPERTY_INDEX));
+ assertEquals(bi.toString(), dataObject.getString(PROPERTY_INDEX));
}
//23. purpose: getString with Defined date Property
public void testGetStringConversionFromDefinedDateProperty() {
// dataObject's type add int property
- SDOProperty property = ((SDOProperty)type.getProperty(PROPERTY_NAME));
+ SDOProperty property = type.getProperty(PROPERTY_NAME);
property.setType(SDOConstants.SDO_DATE);
Calendar controlCalendar = Calendar.getInstance();
@@ -223,7 +224,7 @@
//dataObject.setString(property, "2001-01-01");// add it to instance list
dataObject.setDate(property, bi);// add it to instance list
- this.assertEquals("2001-01-01T00:00:00Z", dataObject.getString(PROPERTY_INDEX));
+ assertEquals("2001-01-01T00:00:00Z", dataObject.getString(PROPERTY_INDEX));
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA102NillableCompositeObjectTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA102NillableCompositeObjectTestCases.java
index dfc8ae5..9a9a4ac 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA102NillableCompositeObjectTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA102NillableCompositeObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
Type stringType = SDOConstants.SDO_STRING;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA102NillableDirectTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA102NillableDirectTestCases.java
index 5302ece..e32e2f2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA102NillableDirectTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA102NillableDirectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -44,6 +44,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
Type stringType = SDOConstants.SDO_STRING;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA81TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA81TestCases.java
index c91ae8d..344c640 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA81TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA81TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
Type intType = SDOConstants.SDO_INT;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA90ConversionTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA90ConversionTestCases.java
index d93b59e..24d8413 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA90ConversionTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectJIRA90ConversionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -34,6 +34,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
Type intType = SDOConstants.SDO_INT;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectListWrapperTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectListWrapperTest.java
index 5af55da..ed992e3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectListWrapperTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectListWrapperTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -57,6 +57,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
String xsdString = getXSDString("org/eclipse/persistence/testing/sdo/helper/xmlhelper/PurchaseOrderDeep.xsd");
@@ -656,7 +657,7 @@
// TODO: 20060906 bidirectional
public void testListWrapperIterator() {
//log("SDODataObjectListWrapperTest.testListWrapperIterator()");
- List aList1 = (List)aRoot5.getList("items/item");
+ List aList1 = aRoot5.getList("items/item");
// Test step:
// start at index 2 in the bidirectional iterator
@@ -669,7 +670,7 @@
// int lastIndexOf(Object item)
public void testListWrapperLastIndexOfInternalNoDupl() {
//log("SDODataObjectListWrapperTest.testListWrapperLastIndexOfInternalNoDupl()");
- List aList1 = (List)aRoot5.getList("items/item");
+ List aList1 = aRoot5.getList("items/item");
SDODataObject anItem = (SDODataObject)aRoot5.get("items/item[2]");
int anIndex = aList1.lastIndexOf(anItem);
assertTrue(anIndex == (2 - 1));
@@ -678,7 +679,7 @@
// int lastIndexOf(Object item)
public void testListWrapperLastIndexOfNotExisting() {
//log("SDODataObjectListWrapperTest.testListWrapperLastIndexOfNotExisting()");
- List aList1 = (List)aRoot5.getList("items/item");
+ List aList1 = aRoot5.getList("items/item");
try {
SDODataObject anItem = (SDODataObject)aRoot.get("items/item[4]");
} catch (IndexOutOfBoundsException e) {
@@ -694,8 +695,8 @@
// ListIterator listIterator()
public void testListWrapperListIteratorIndirect() {
//log("SDODataObjectListWrapperTest.testListWrapperListIteratorIndirect()");
- List aList1 = (List)aRoot5.getList("items/item");
- List aList2 = (List)aRoot5.getList("items/item");
+ List aList1 = aRoot5.getList("items/item");
+ List aList2 = aRoot5.getList("items/item");
// testing equality will invoke the ListWrapper.listIterator() function
assertEquals(aList2, aList1);
@@ -705,7 +706,7 @@
// TODO: 20060906 bidirectional
public void testListWrapperListIteratorDirect() {
//log("SDODataObjectListWrapperTest.testListWrapperListIteratorDirect()");
- List aList1 = (List)aRoot5.getList("items/item");
+ List aList1 = aRoot5.getList("items/item");
// Test step:
// start at index 0 in the bidirectional iterator
@@ -719,7 +720,7 @@
// TODO: 20060906 bidirectional
public void testListWrapperListIteratorIndex() {
//log("SDODataObjectListWrapperTest.testListWrapperListIteratorIndex()");
- List aList1 = (List)aRoot5.getList("items/item");
+ List aList1 = aRoot5.getList("items/item");
// Test step:
// start at index 2 in the bidirectional iterator
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectOpenContentBug6011530TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectOpenContentBug6011530TestCases.java
index 7c6e1c6..d34c280 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectOpenContentBug6011530TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectOpenContentBug6011530TestCases.java
@@ -40,6 +40,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
Type stringType = SDOConstants.SDO_STRING;
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectSetGetWithIndexTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectSetGetWithIndexTest.java
index 98adf57..8e3b8cd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectSetGetWithIndexTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectSetGetWithIndexTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,6 +15,7 @@
package org.eclipse.persistence.testing.sdo.model.dataobject;
import commonj.sdo.Property;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOProperty;
import org.eclipse.persistence.exceptions.SDOException;
@@ -33,7 +34,7 @@
//purpose: a property index is in instance property boundry
public void testInstancePropertiesWithDefinedProperty() {
// check it is in the list
- this.assertTrue(DEFINED_PROPERTY_INDEX <= (dataObject.getInstanceProperties().size() - 1));
+ assertTrue(DEFINED_PROPERTY_INDEX <= (dataObject.getInstanceProperties().size() - 1));
}
//required conditions: none
@@ -42,13 +43,13 @@
dataObject.set(DEFINED_PROPERTY_INDEX, CONTROL_STRING_1);// set defined Property value
String testValue = (String)dataObject.get(DEFINED_PROPERTY_INDEX);
- this.assertEquals(CONTROL_STRING_1, testValue);// check value is set as we want
+ assertEquals(CONTROL_STRING_1, testValue);// check value is set as we want
}
//purpose: Confirm that index id out of boundry of instance properties list.
public void testInstancePropertiesWithUndefinedProperty() {
// check it is not in the list
- this.assertFalse(UNDEFINED_PROPERTY_INDEX <= (dataObject.getInstanceProperties().size() - 1));
+ assertFalse(UNDEFINED_PROPERTY_INDEX <= (dataObject.getInstanceProperties().size() - 1));
}
//required conditions: 1) DataObject is open
@@ -81,13 +82,13 @@
//purpose: check dataObject is not open
public void testDataObject_Not_Open() {
- this.assertFalse(dataObject_Not_Open.getType().isOpen());// check if DataObject is not Opened
+ assertFalse(dataObject_Not_Open.getType().isOpen());// check if DataObject is not Opened
}
//purpose: check property index is out of bountry of instance property list
public void testDataObject_Not_In_List() {
// check if it is undefined
- this.assertFalse(UNDEFINED_PROPERTY_INDEX < (dataObject_Not_Open.getInstanceProperties().size() - 1));
+ assertFalse(UNDEFINED_PROPERTY_INDEX < (dataObject_Not_Open.getInstanceProperties().size() - 1));
}
//!! !!
@@ -131,10 +132,10 @@
//purpose: UnsupportedOperationException can be thrown for read only Property when set.
public void testSetinvalidPropertyIndex_WithProperty_ReadOnly() {
// check if it is defined
- this.assertTrue(DEFINED_PROPERTY_READONLY_INDEX <= (dataObject_WithReadOnlyProperty.getInstanceProperties().size() - 1));
+ assertTrue(DEFINED_PROPERTY_READONLY_INDEX <= (dataObject_WithReadOnlyProperty.getInstanceProperties().size() - 1));
// check property is read only
- this.assertTrue(dataObject_WithReadOnlyProperty.getInstanceProperty(DEFINED_PROPERTY_READONLY_NAME).isReadOnly());
+ assertTrue(dataObject_WithReadOnlyProperty.getInstanceProperty(DEFINED_PROPERTY_READONLY_NAME).isReadOnly());
try {
dataObject_WithReadOnlyProperty.set(DEFINED_PROPERTY_READONLY_INDEX, CONTROL_STRING_1);// set undefined Property value
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectSetGetWithPropertyTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectSetGetWithPropertyTest.java
index 840f9a7..be34431 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectSetGetWithPropertyTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectSetGetWithPropertyTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
// Oracle - initial API and implementation from Oracle TopLink
package org.eclipse.persistence.testing.sdo.model.dataobject;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import commonj.sdo.Property;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -42,7 +43,7 @@
Property definedProperty = dataObject.getInstanceProperty(DEFINED_PROPERTY_NAME);
// check it is in the list
- this.assertTrue(dataObject.getInstanceProperties().contains(definedProperty));
+ assertTrue(dataObject.getInstanceProperties().contains(definedProperty));
}
//required conditions: none
@@ -53,7 +54,7 @@
dataObject.set(definedProperty, CONTROL_STRING_1);// set defined Property value
String testValue = (String)dataObject.get(definedProperty);
- this.assertEquals(CONTROL_STRING_1, testValue);// check value is set as we want
+ assertEquals(CONTROL_STRING_1, testValue);// check value is set as we want
}
//purpose: Confirm that the undefined property is not in instance properties.
@@ -62,7 +63,7 @@
undefinedProperty.setName(UNDEFINED_PROPERTY_NAME);
// check it is not in the list
- this.assertFalse(dataObject.getInstanceProperties().contains(undefinedProperty));
+ assertFalse(dataObject.getInstanceProperties().contains(undefinedProperty));
}
//required conditions: 1) DataObject is open
@@ -96,7 +97,7 @@
dataObject.set(undefinedProperty, CONTROL_STRING_1);// set undefined Property value
Object testValue = dataObject.get(undefinedProperty);// check it is in
- this.assertEquals(CONTROL_STRING_1, testValue);// also verify its value
+ assertEquals(CONTROL_STRING_1, testValue);// also verify its value
}
//required conditions: 1) DataObject is open
@@ -110,7 +111,7 @@
dataObject.set(undefinedProperty, CONTROL_STRING_1);// set undefined Property value
// check it is in the list
- this.assertTrue(dataObject.getInstanceProperties().contains(undefinedProperty));
+ assertTrue(dataObject.getInstanceProperties().contains(undefinedProperty));
}
//required conditions: 1) DataObject is not open
@@ -119,10 +120,10 @@
SDOProperty undefinedProperty = new SDOProperty(aHelperContext);// make a undefined Property
undefinedProperty.setName(UNDEFINED_PROPERTY_NAME);
- this.assertFalse(dataObject_Not_Open.getType().isOpen());// check if DataObject is not Opened
+ assertFalse(dataObject_Not_Open.getType().isOpen());// check if DataObject is not Opened
// check if it is undefined
- this.assertFalse(dataObject_Not_Open.getInstanceProperties().contains(undefinedProperty));
+ assertFalse(dataObject_Not_Open.getInstanceProperties().contains(undefinedProperty));
try {
dataObject_Not_Open.set(undefinedProperty, CONTROL_STRING_1);// set undefined Property value
@@ -137,10 +138,10 @@
SDOProperty undefinedProperty = new SDOProperty(aHelperContext);// make a undefined Property
undefinedProperty.setName(UNDEFINED_PROPERTY_NAME);
- this.assertFalse(dataObject_Not_Open.getType().isOpen());// check if DataObject is not Opened
+ assertFalse(dataObject_Not_Open.getType().isOpen());// check if DataObject is not Opened
// check if it is undefined
- this.assertFalse(dataObject_Not_Open.getInstanceProperties().contains(undefinedProperty));
+ assertFalse(dataObject_Not_Open.getInstanceProperties().contains(undefinedProperty));
try {
dataObject_Not_Open.get(undefinedProperty);// get undefined Property value
@@ -171,7 +172,7 @@
Property ReadOnlyProperty = dataObject_WithReadOnlyProperty.getInstanceProperty(DEFINED_PROPERTY_READONLY_NAME);// make a undefined Property
// check if it is undefined
- this.assertTrue(dataObject_WithReadOnlyProperty.getInstanceProperties().contains(ReadOnlyProperty));
+ assertTrue(dataObject_WithReadOnlyProperty.getInstanceProperties().contains(ReadOnlyProperty));
try {
dataObject_WithReadOnlyProperty.set(ReadOnlyProperty, CONTROL_STRING_1);// set undefined Property value
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestCases.java
index 2ffe639..2fb6660 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -51,6 +51,7 @@
}
+ @Override
public void setUp() {
super.setUp();
SDOType type = new SDOType(URINAME, TYPENAME);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectUnsetIsSetTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectUnsetIsSetTest.java
index 03b4838..9541b0b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectUnsetIsSetTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/SDODataObjectUnsetIsSetTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,6 +16,8 @@
import commonj.sdo.Property;
import java.lang.System;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -34,46 +36,46 @@
//purpose: if dataObject just been new and property has not been set, iset() return false
public void testIsSetWithNotYetSetDefinedProperty_SingleValue() {
Property test = dataObject.getInstanceProperty(DEFINED_PROPERTY_NAME);
- this.assertFalse(dataObject.isSet(test));
+ assertFalse(dataObject.isSet(test));
}
//purpose: if dataObject just been new and property has not been set, iset() return false
public void testIsSetWithNotYetSetDefinedProperty_SingleValue_Path() {
- this.assertFalse(dataObject.isSet(DEFINED_PROPERTY_NAME));
+ assertFalse(dataObject.isSet(DEFINED_PROPERTY_NAME));
}
//purpose: if dataObject just been new and property has not been set, iset() return false
public void testIsSetWithNotYetSetDefinedProperty_SingleValue_Index() {
- this.assertFalse(dataObject.isSet(0));
+ assertFalse(dataObject.isSet(0));
}
//purpose: if dataObject just been new and property has not been set, iset() return false
public void testIsSetWithNotYetSetDefinedProperty_SingleValue_Path_a_b() {
- this.assertFalse(dataObject_Path_a_b.isSet(DEFINED_PROPERTY_NAME_A_B));
+ assertFalse(dataObject_Path_a_b.isSet(DEFINED_PROPERTY_NAME_A_B));
}
//purpose: if property has not been unSet, iset() return false
public void testIsSetWithUnSetDefinedProperty_SingleValue() {
Property test = dataObject.getInstanceProperty(DEFINED_PROPERTY_NAME);
dataObject.unset(test);
- this.assertFalse(dataObject.isSet(test));
+ assertFalse(dataObject.isSet(test));
}
//purpose: if property has been set and then unSet, isSet() return true first and false later
public void testIsSetWithSetThenUnSetDefinedProperty_SingleValue() {
Property test = dataObject.getInstanceProperty(DEFINED_PROPERTY_NAME);
dataObject.set(test, CONTROL_STRING_1);
- this.assertTrue(dataObject.isSet(test));
+ assertTrue(dataObject.isSet(test));
dataObject.unset(test);
- this.assertFalse(dataObject.isSet(test));
+ assertFalse(dataObject.isSet(test));
}
//purpose: if current value isn't default value, iset() return false
public void testIsSetWithCurrentAsDefinedPropertyDefault_SingleValue() {
Property test = dataObject.getInstanceProperty(DEFINED_PROPERTY_NAME);
dataObject.set(test, CONTROL_STRING_2);
- this.assertFalse(((String)dataObject.get(test)).equals(DEFAULT_VALUE));
- this.assertTrue(dataObject.isSet(test));
+ assertFalse(dataObject.get(test).equals(DEFAULT_VALUE));
+ assertTrue(dataObject.isSet(test));
}
//purpose: if property has been set to default value, iset() return true.
@@ -82,7 +84,7 @@
public void testIsSetWithSetDefinedPropertyAsDefault_SingleValue() {
Property test = dataObject.getInstanceProperty(DEFINED_PROPERTY_NAME);
dataObject.set(test, test.getDefault());
- assertTrue(((String)dataObject.get(test)).equals(DEFAULT_VALUE));
+ assertTrue(dataObject.get(test).equals(DEFAULT_VALUE));
assertTrue(dataObject.isSet(test));
}
@@ -92,7 +94,7 @@
dataObject.set(test, CONTROL_STRING_1);
- this.assertTrue(dataObject.isSet(test));
+ assertTrue(dataObject.isSet(test));
}
//purpose: set a property's value, then unset it, get its value should now return defaule value.
@@ -121,14 +123,14 @@
dataObject.unset(0);
- this.assertEquals(DEFAULT_VALUE, (String)dataObject.get(DEFINED_PROPERTY_NAME));
+ assertEquals(DEFAULT_VALUE, (String)dataObject.get(DEFINED_PROPERTY_NAME));
}
//purpose: set a property's value, then unset it, get its value should now return defaule value.
public void testUnSetWithDefinedProperty_SingleValue_Path_a_b() {
dataObject_Path_a_b.unset(DEFINED_PROPERTY_NAME_A_B);
- this.assertEquals(DEFAULT_VALUE, (String)dataObject_Path_a_b.get(DEFINED_PROPERTY_NAME_A_B));
+ assertEquals(DEFAULT_VALUE, (String)dataObject_Path_a_b.get(DEFINED_PROPERTY_NAME_A_B));
}
//purpose: unset undefined property should cause exception
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentManyTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentManyTestCases.java
index 1157c13..d0ceeb8 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentManyTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentManyTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,7 @@
+ @Override
public SDOType getRootSDOType() {
SDOType type = new SDOType("http://testing", "myRoot");
type.setOpen(true);
@@ -67,6 +68,7 @@
return type;
}
+ @Override
public SDOType getFirstChildType() {
SDOType type = new SDOType("http://testing", "firstChildType");
type.setOpen(true);
@@ -90,6 +92,7 @@
return type;
}
+ @Override
public SDOType getSecondChildType() {
SDOType type = new SDOType("http://testing", "secondChildType");
type.setOpen(true);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentTestCases.java
index 32e2f34..f11dcee 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/ContainmentTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,6 +42,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
secondChildType = getSecondChildType();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/DeleteTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/DeleteTestCases.java
index 84e6235..9df3b61 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/DeleteTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/DeleteTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
rootDataObject.set("name", "mySampleRootName");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/DetachTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/DetachTestCases.java
index e9d47e2..3fd6ace 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/DetachTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/containment/DetachTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
rootDataObject.set("name", "mySampleRootName");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathEngineSimpleTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathEngineSimpleTestCases.java
index 283fdfc..267f627 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathEngineSimpleTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathEngineSimpleTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -37,6 +37,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathExpressionTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathExpressionTestCases.java
index aed9677..63deaa0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathExpressionTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathExpressionTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -38,6 +38,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathHelperTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathHelperTestCases.java
index 0afd261..9963d2d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathHelperTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathengine/XPathHelperTestCases.java
@@ -37,6 +37,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
try {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBooleanByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBooleanByPositionalPathTest.java
index 7859ec5..f3c92d2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBooleanByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBooleanByPositionalPathTest.java
@@ -18,6 +18,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -49,7 +51,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBoolean(property3, true);
- this.assertEquals(bb.booleanValue(), dataObject_a.getBoolean(property3));
+ assertEquals(bb.booleanValue(), dataObject_a.getBoolean(property3));
}
@@ -69,7 +71,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBoolean(property + ".0", true);
- this.assertEquals(true, dataObject_a.getBoolean(property + ".0"));
+ assertEquals(true, dataObject_a.getBoolean(property + ".0"));
}
@@ -85,7 +87,7 @@
dataObject_a.setBoolean(property1, true);// c dataobject's a property has value boolean 'true'
- this.assertEquals(true, dataObject_a.getBoolean(property1));
+ assertEquals(true, dataObject_a.getBoolean(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -154,7 +156,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setChar(property + ".0", bb.charValue());
- this.assertEquals(true, dataObject_a.getBoolean(property + ".0"));
+ assertEquals(true, dataObject_a.getBoolean(property + ".0"));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -184,7 +186,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDouble(property + ".0", bb.doubleValue());
- this.assertEquals(true, dataObject_a.getBoolean(property + ".0"));
+ assertEquals(true, dataObject_a.getBoolean(property + ".0"));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -214,7 +216,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setFloat(property + ".0", bb.floatValue());
- this.assertEquals(true, dataObject_a.getBoolean(property + ".0"));
+ assertEquals(true, dataObject_a.getBoolean(property + ".0"));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -245,7 +247,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setInt(property + ".0", bb.intValue());
- this.assertEquals(true, dataObject_a.getBoolean(property + ".0"));
+ assertEquals(true, dataObject_a.getBoolean(property + ".0"));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -276,7 +278,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setLong(property + ".0", bb.longValue());
- this.assertEquals(true, dataObject_a.getBoolean(property + ".0"));
+ assertEquals(true, dataObject_a.getBoolean(property + ".0"));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -307,7 +309,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setShort(property + ".0", bb.shortValue());
- this.assertEquals(true, dataObject_a.getBoolean(property + ".0"));
+ assertEquals(true, dataObject_a.getBoolean(property + ".0"));
/*property_c = new SDOProperty(aHelperContext);
property_c.setName(PROPERTY_NAME_C);
@@ -334,7 +336,7 @@
Boolean B_STR = Boolean.valueOf(str);
dataObject_c.setString(property_c, str);// add it to instance list
- this.assertEquals(B_STR.booleanValue(), dataObject_a.getBoolean(property));
+ assertEquals(B_STR.booleanValue(), dataObject_a.getBoolean(property));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -355,7 +357,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.set(property3, bb);
- this.assertEquals(bb.booleanValue(), dataObject_a.getBoolean(property3));
+ assertEquals(bb.booleanValue(), dataObject_a.getBoolean(property3));
}
@@ -376,7 +378,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.set(property + ".0", bb);
- this.assertEquals(true, dataObject_a.getBoolean(property + ".0"));
+ assertEquals(true, dataObject_a.getBoolean(property + ".0"));
}
@@ -393,7 +395,7 @@
dataObject_a.set(property1, b);// c dataobject's a property has value boolean 'true'
- this.assertEquals(true, dataObject_a.getBoolean(property1));
+ assertEquals(true, dataObject_a.getBoolean(property1));
}
/* public void testGetBooleanConversionWithPathFromDefinedStringPropertyEqualSignBracketInPathDotSet() {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByPositionalPathTest.java
index 7a24e0c..27c6a51 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import commonj.sdo.Type;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -47,13 +49,13 @@
dataObject_c.set(property_c, "test");
- this.assertEquals("test", dataObject_a.get(property));
+ assertEquals("test", dataObject_a.get(property));
}
// normal test: a/b.0/c as path
public void testGetByPositionalPathStringObj() {
- this.assertEquals(dataObject_c, dataObject_a.get("PName-a/PName-b.0"));
+ assertEquals(dataObject_c, dataObject_a.get("PName-a/PName-b.0"));
}
@@ -67,7 +69,7 @@
dataObject_a.set(property4, "test");
- this.assertEquals("test", dataObject_a.get(property4));
+ assertEquals("test", dataObject_a.get(property4));
}
@@ -97,7 +99,7 @@
type_c.addDeclaredProperty(property_c);
dataObject_c._setType(type_c);
- this.assertNull(dataObject_a.get("PName-a/PName-f.0/PName-c"));
+ assertNull(dataObject_a.get("PName-a/PName-f.0/PName-c"));
/*try
{
@@ -162,7 +164,7 @@
dataObject_c.set(property_c, "test");
- this.assertTrue(dataObject_a == dataObject_b.get(".."));
+ assertTrue(dataObject_a == dataObject_b.get(".."));
}
@@ -176,19 +178,19 @@
dataObject_c.set(property_c, "test");
- this.assertTrue(dataObject_a == dataObject_c.get("/"));
+ assertTrue(dataObject_a == dataObject_c.get("/"));
}
// purpose: test path as "/"
public void testGetByPositionalPathStringWithShortDotPath() {
- this.assertEquals(dataObject_c, dataObject_b.get("PName-b.0"));
+ assertEquals(dataObject_c, dataObject_b.get("PName-b.0"));
}
// purpose: test path as "/"
public void testGetByPositionalPathStringWithShortBracketPath() {
- this.assertEquals(dataObject_c, dataObject_b.get("PName-b[1]"));
+ assertEquals(dataObject_c, dataObject_b.get("PName-b[1]"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByPositionalPathTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByPositionalPathTestCases.java
index 4141f8c..8e23beb 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByPositionalPathTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByPositionalPathTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -65,6 +65,7 @@
protected SDOProperty property_c_bNotSDODataOject;
protected SDOProperty property_a_pathLength_1;
+ @Override
public void setUp() {// set up as a/b/c
super.setUp();
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByteByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByteByPositionalPathTest.java
index 5b671db..510ad5e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByteByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetByteByPositionalPathTest.java
@@ -20,6 +20,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -62,7 +64,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals(by, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getByte(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -82,7 +84,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setByte(property3, by);
- this.assertEquals(by, dataObject_a.getByte(property3));
+ assertEquals(by, dataObject_a.getByte(property3));
}
@@ -102,7 +104,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setByte(property + ".0", by);
- this.assertEquals(by, dataObject_a.getByte(property + ".0"));
+ assertEquals(by, dataObject_a.getByte(property + ".0"));
}
@@ -118,7 +120,7 @@
dataObject_a.setByte(property1, by);// c dataobject's a property has value boolean 'true'
- this.assertEquals(by, dataObject_a.getByte(property1));
+ assertEquals(by, dataObject_a.getByte(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -179,7 +181,7 @@
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((byte)db, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)db, dataObject_a.getByte(propertyPath_a_b_c));
}
//6. purpose: getByte with Undefined Double Property
@@ -207,7 +209,7 @@
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((byte)fl, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)fl, dataObject_a.getByte(propertyPath_a_b_c));
}
//8. purpose: getByte with Undefined float Property
@@ -236,7 +238,7 @@
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((byte)in, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)in, dataObject_a.getByte(propertyPath_a_b_c));
}
//10. purpose: getByte with Undefined int Property
@@ -265,7 +267,7 @@
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((byte)lg, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)lg, dataObject_a.getByte(propertyPath_a_b_c));
}
//12. purpose: getByte with Undefined long Property
@@ -294,7 +296,7 @@
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((byte)shr, dataObject_a.getByte(propertyPath_a_b_c));
+ assertEquals((byte)shr, dataObject_a.getByte(propertyPath_a_b_c));
}
//14. purpose: getByte with Undefined short Property
@@ -324,7 +326,7 @@
Byte s_d = Byte.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.byteValue(), dataObject_a.getByte(property));
+ assertEquals(s_d.byteValue(), dataObject_a.getByte(property));
}
//16. purpose: getDouble with Undefined string Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBytesByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBytesByPositionalPathTest.java
index ba365fb..81d3164 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBytesByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetBytesByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,8 @@
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -200,7 +202,7 @@
dataObject_a.setBytes(propertyPath_a_b_c, b);// add it to instance list
- this.assertTrue(Arrays.equals(b, dataObject_a.getBytes(propertyPath_a_b_c)));
+ assertTrue(Arrays.equals(b, dataObject_a.getBytes(propertyPath_a_b_c)));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -220,7 +222,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBytes(property3, bb);
- this.assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property3)));
+ assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property3)));
}
@@ -240,7 +242,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBytes(property + ".0", bb);
- this.assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property + ".0")));
+ assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property + ".0")));
}
@@ -256,7 +258,7 @@
dataObject_a.setBytes(property1, bb);// c dataobject's a property has value boolean 'true'
- this.assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property1)));
+ assertTrue(Arrays.equals(bb, dataObject_a.getBytes(property1)));
}
/* public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetCharacterByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetCharacterByPositionalPathTest.java
index 77632d3..3a45f5c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetCharacterByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetCharacterByPositionalPathTest.java
@@ -20,6 +20,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -80,7 +82,7 @@
dataObject_a.setChar(propertyPath_a_b_c, b);// add it to instance list
- this.assertEquals(b, dataObject_a.getChar(propertyPath_a_b_c));
+ assertEquals(b, dataObject_a.getChar(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -100,7 +102,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setChar(property3, bb);
- this.assertEquals(bb, dataObject_a.getChar(property3));
+ assertEquals(bb, dataObject_a.getChar(property3));
}
@@ -120,7 +122,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setChar(property + ".0", bb);
- this.assertEquals(bb, dataObject_a.getChar(property + ".0"));
+ assertEquals(bb, dataObject_a.getChar(property + ".0"));
}
@@ -136,7 +138,7 @@
dataObject_a.setChar(property1, bb);// c dataobject's a property has value boolean 'true'
- this.assertEquals(bb, dataObject_a.getChar(property1));
+ assertEquals(bb, dataObject_a.getChar(property1));
}
/* public void testGetCharacterConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -275,7 +277,7 @@
Character B_STR = Character.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, B_STR.toString());// add it to instance list
- this.assertEquals(str, dataObject_a.getChar(property));
+ assertEquals(str, dataObject_a.getChar(property));
}
//11. purpose: getChar with Undefined boolean Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDataObjectByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDataObjectByPositionalPathTest.java
index 0a8b9d5..5a9d265 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDataObjectByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDataObjectByPositionalPathTest.java
@@ -17,6 +17,8 @@
import commonj.sdo.DataObject;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -30,8 +32,8 @@
// purpose: pass a/b, to get dataObjcet c
public void testGetDataObjectConversionFromDefinedProperty() {
- this.assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b.0"));
- this.assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b[1]"));
+ assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b.0"));
+ assertEquals(dataObject_c, dataObject_a.getDataObject("PName-a/PName-b[1]"));
}
// purpose: opencontent properties
@@ -61,7 +63,7 @@
dataObject_b.set(property, objects);// add it to instance list
dataObject_a.setDataObject("PName-a/openTest[1]", b);
- this.assertEquals(b, dataObject_a.getDataObject("PName-a/openTest[number=1]"));
+ assertEquals(b, dataObject_a.getDataObject("PName-a/openTest[number=1]"));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -83,7 +85,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDataObject(property3, bb);
- this.assertEquals(bb, dataObject_a.getDataObject(property3));
+ assertEquals(bb, dataObject_a.getDataObject(property3));
}
@@ -105,7 +107,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDataObject(property + ".0", bb);
- this.assertEquals(bb, dataObject_a.getDataObject(property + ".0"));
+ assertEquals(bb, dataObject_a.getDataObject(property + ".0"));
}
@@ -123,7 +125,7 @@
dataObject_a.setDataObject(property1, bb);// c dataobject's a property has value boolean 'true'
- this.assertEquals(bb, dataObject_a.getDataObject(property1));
+ assertEquals(bb, dataObject_a.getDataObject(property1));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -149,7 +151,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -159,6 +161,6 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDateByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDateByPositionalPathTest.java
index e3bbbea..7e3715c 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDateByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDateByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,8 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -130,7 +132,7 @@
dataObject_c.setLong(property_c, l);// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
}
//9. purpose: getDate with Undefined Boolean Property
@@ -181,7 +183,7 @@
dataObject_c.setString(property_c, "2001-01-01");// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
}
//11. purpose: getDate with Defined String Property
@@ -205,7 +207,7 @@
objects.add("2001-01-01");
dataObject_c.set(property_c, objects);// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c + ".0"));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c + ".0"));
}
//12. purpose: getDate with Undefined string Property
@@ -281,7 +283,7 @@
Date d = new Date(l);
dataObject_a.setDate(propertyPath_a_b_c, d);// add it to instance list
- this.assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
+ assertEquals(d, dataObject_a.getDate(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -302,7 +304,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDate(property3, d);
- this.assertEquals(d, dataObject_a.getDate(property3));
+ assertEquals(d, dataObject_a.getDate(property3));
}
@@ -323,7 +325,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDate(property + ".0", d);
- this.assertEquals(d, dataObject_a.getDate(property + ".0"));
+ assertEquals(d, dataObject_a.getDate(property + ".0"));
}
@@ -340,7 +342,7 @@
dataObject_a.setDate(property1, d);// c dataobject's a property has value boolean 'true'
- this.assertEquals(d, dataObject_a.getDate(property1));
+ assertEquals(d, dataObject_a.getDate(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDecimalByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDecimalByPositionalPathTest.java
index 766be5e..ca3d469 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDecimalByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDecimalByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -96,7 +98,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//6. purpose: getBigDecimal with Undefined Double Property
@@ -127,7 +129,7 @@
BigDecimal bd = new BigDecimal(fl);
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//8. purpose: getBigDecimal with Undefined float Property
@@ -158,7 +160,7 @@
BigDecimal bd = new BigDecimal(in);
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//10. purpose: getBigDecimal with Undefined int Property
@@ -189,7 +191,7 @@
BigDecimal bd = new BigDecimal(lg);
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//12. purpose: getBigDecimal with Undefined long Property
@@ -235,7 +237,7 @@
BigDecimal bd = new BigDecimal(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(property));
+ assertEquals(bd, dataObject_a.getBigDecimal(property));
}
//15. purpose: getBigDecimal with Undefined string Property
@@ -282,7 +284,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -303,7 +305,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigDecimal(property3, bd);
- this.assertEquals(bd, dataObject_a.getBigDecimal(property3));
+ assertEquals(bd, dataObject_a.getBigDecimal(property3));
}
@@ -324,7 +326,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigDecimal(property + ".0", bd);
- this.assertEquals(bd, dataObject_a.getBigDecimal(property + ".0"));
+ assertEquals(bd, dataObject_a.getBigDecimal(property + ".0"));
}
@@ -341,7 +343,7 @@
dataObject_a.setBigDecimal(property1, bd);// c dataobject's a property has value boolean 'true'
- this.assertEquals(bd, dataObject_a.getBigDecimal(property1));
+ assertEquals(bd, dataObject_a.getBigDecimal(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -391,7 +393,7 @@
BigDecimal bd = new BigDecimal(bi);
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigDecimal(propertyPath_a_b_c));
}
//21. purpose: getBigDecimal with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDoubleByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDoubleByPositionalPathTest.java
index 4c2c34b..9671cd1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDoubleByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetDoubleByPositionalPathTest.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -64,7 +66,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((double)by, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(by, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//3. purpose: getDouble with Undefined Byte Property
@@ -110,7 +112,7 @@
double delta = 0.0;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((double)db, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(db, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -131,7 +133,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDouble(property3, db);
- this.assertEquals(db, dataObject_a.getDouble(property3), delta);
+ assertEquals(db, dataObject_a.getDouble(property3), delta);
}
@@ -152,7 +154,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDouble(property + ".0", db);
- this.assertEquals(db, dataObject_a.getDouble(property + ".0"), delta);
+ assertEquals(db, dataObject_a.getDouble(property + ".0"), delta);
}
@@ -169,7 +171,7 @@
dataObject_a.setDouble(property1, db);// c dataobject's a property has value boolean 'true'
- this.assertEquals(db, dataObject_a.getDouble(property1), delta);
+ assertEquals(db, dataObject_a.getDouble(property1), delta);
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -219,7 +221,7 @@
double delta = 0.0;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((double)fl, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(fl, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//8. purpose: getDouble with Undefined float Property
@@ -250,7 +252,7 @@
double delta = 0.0;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((double)in, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(in, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//10. purpose: getDouble with Undefined int Property
@@ -281,7 +283,7 @@
double delta = 0.0;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((double)lg, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals((double)lg, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//12. purpose: getDouble with Undefined long Property
@@ -312,7 +314,7 @@
double delta = 0.0;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((double)shr, dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(shr, dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//14. purpose: getDouble with Undefined short Property
@@ -344,7 +346,7 @@
double delta = 0.0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(s_d.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//16. purpose: getDouble with Undefined string Property
@@ -392,7 +394,7 @@
double delta = 0.0;
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(bd.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//19. purpose: getDouble with Undefined decimal Property
@@ -423,7 +425,7 @@
double delta = 0.0;
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
+ assertEquals(bi.doubleValue(), dataObject_a.getDouble(propertyPath_a_b_c), delta);
}
//21. purpose: getDouble with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetFloatByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetFloatByPositionalPathTest.java
index 6bc3980..e115639 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetFloatByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetFloatByPositionalPathTest.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -62,7 +64,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((float)by, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(by, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//3. purpose: getFloat with Undefined Byte Property
@@ -108,7 +110,7 @@
float delta = 0;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((float)db, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals((float)db, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//6. purpose: getFloat with Undefined Double Property
@@ -139,7 +141,7 @@
float delta = 0;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((float)fl, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(fl, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -160,7 +162,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setFloat(property3, fl);
- this.assertEquals(fl, dataObject_a.getFloat(property3), delta);
+ assertEquals(fl, dataObject_a.getFloat(property3), delta);
}
@@ -181,7 +183,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setFloat(property + ".0", fl);
- this.assertEquals(fl, dataObject_a.getFloat(property + ".0"), delta);
+ assertEquals(fl, dataObject_a.getFloat(property + ".0"), delta);
}
@@ -198,7 +200,7 @@
dataObject_a.setFloat(property1, fl);// c dataobject's a property has value boolean 'true'
- this.assertEquals(fl, dataObject_a.getFloat(property1), delta);
+ assertEquals(fl, dataObject_a.getFloat(property1), delta);
}
/* public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -248,7 +250,7 @@
float delta = 0;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((float)in, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals((float)in, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//10. purpose: getFloat with Undefined int Property
@@ -279,7 +281,7 @@
float delta = 0;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((float)lg, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals((float)lg, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//12. purpose: getFloat with Undefined long Property
@@ -310,7 +312,7 @@
float delta = 0;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((float)shr, dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(shr, dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//14. purpose: getFloat with Undefined short Property
@@ -342,7 +344,7 @@
float delta = 0;
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.doubleValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(s_d.doubleValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//16. purpose: getFloat with Undefined string Property
@@ -390,7 +392,7 @@
float delta = 0;
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(bd.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//19. purpose: getFloat with Undefined decimal Property
@@ -421,7 +423,7 @@
float delta = 0;
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
+ assertEquals(bi.floatValue(), dataObject_a.getFloat(propertyPath_a_b_c), delta);
}
//21. purpose: getFloat with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntByPositionalPathTest.java
index 7bc89cf..1b18def 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntByPositionalPathTest.java
@@ -18,6 +18,8 @@
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -54,7 +56,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((int)by, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getInt(propertyPath_a_b_c));
}
//3. purpose: getInt with Undefined Byte Property
@@ -99,7 +101,7 @@
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((int)db, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals((int)db, dataObject_a.getInt(propertyPath_a_b_c));
}
//6. purpose: getInt with Undefined Double Property
@@ -129,7 +131,7 @@
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((int)fl, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals((int)fl, dataObject_a.getInt(propertyPath_a_b_c));
}
//8. purpose: getInt with Undefined float Property
@@ -159,7 +161,7 @@
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((int)in, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(in, dataObject_a.getInt(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -179,7 +181,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setInt(property3, in);
- this.assertEquals(in, dataObject_a.getInt(property3));
+ assertEquals(in, dataObject_a.getInt(property3));
}
@@ -199,7 +201,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setInt(property + ".0", in);
- this.assertEquals(in, dataObject_a.getInt(property + ".0"));
+ assertEquals(in, dataObject_a.getInt(property + ".0"));
}
@@ -215,7 +217,7 @@
dataObject_a.setInt(property1, in);// c dataobject's a property has value boolean 'true'
- this.assertEquals(in, dataObject_a.getInt(property1));
+ assertEquals(in, dataObject_a.getInt(property1));
}
/* public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -263,7 +265,7 @@
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((int)lg, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals((int)lg, dataObject_a.getInt(propertyPath_a_b_c));
}
//12. purpose: getInt with Undefined long Property
@@ -293,7 +295,7 @@
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((int)shr, dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(shr, dataObject_a.getInt(propertyPath_a_b_c));
}
//14. purpose: getInt with Undefined short Property
@@ -324,7 +326,7 @@
Integer s_d = Integer.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(s_d.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
}
//16. purpose: getInt with Undefined string Property
@@ -370,7 +372,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.intValue(), dataObject_a.getInt(property));
+ assertEquals(bd.intValue(), dataObject_a.getInt(property));
}
//19. purpose: getInt with Undefined decimal Property
@@ -400,7 +402,7 @@
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
+ assertEquals(bi.intValue(), dataObject_a.getInt(propertyPath_a_b_c));
}
//21. purpose: getInt with Undefined Integer Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntegerByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntegerByPositionalPathTest.java
index f407229..6c0f7ae 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntegerByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetIntegerByPositionalPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -97,7 +99,7 @@
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(property));
+ assertEquals(bd, dataObject_a.getBigInteger(property));
}
//6. purpose: getBigInteger with Undefined Double Property
@@ -129,7 +131,7 @@
BigInteger bd = new BigInteger(String.valueOf(il));
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(property));
+ assertEquals(bd, dataObject_a.getBigInteger(property));
}
//8. purpose: getBigInteger with Undefined float Property
@@ -160,7 +162,7 @@
BigInteger bd = new BigInteger(String.valueOf(in));
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//10. purpose: getBigInteger with Undefined int Property
@@ -191,7 +193,7 @@
BigInteger bd = new BigInteger(String.valueOf(lg));
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//12. purpose: getBigInteger with Undefined long Property
@@ -240,7 +242,7 @@
BigInteger bd = new BigInteger(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//15. purpose: getBigInteger with Undefined string Property
@@ -304,7 +306,7 @@
BigInteger bd_ = new BigInteger(String.valueOf(bd));
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd_, dataObject_a.getBigInteger(property));
+ assertEquals(bd_, dataObject_a.getBigInteger(property));
}
//19. purpose: getBigInteger with Undefined decimal Property
@@ -334,7 +336,7 @@
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi, dataObject_a.getBigInteger(propertyPath_a_b_c));
+ assertEquals(bi, dataObject_a.getBigInteger(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -354,7 +356,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigInteger(property3, bi);
- this.assertEquals(bi, dataObject_a.getBigInteger(property3));
+ assertEquals(bi, dataObject_a.getBigInteger(property3));
}
@@ -374,7 +376,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigInteger(property + ".0", bi);
- this.assertEquals(bi, dataObject_a.getBigInteger(property + ".0"));
+ assertEquals(bi, dataObject_a.getBigInteger(property + ".0"));
}
@@ -390,7 +392,7 @@
dataObject_a.setBigInteger(property1, bi);// c dataobject's a property has value boolean 'true'
- this.assertEquals(bi, dataObject_a.getBigInteger(property1));
+ assertEquals(bi, dataObject_a.getBigInteger(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetListByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetListByPositionalPathTest.java
index 6543abc..a25c14e 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetListByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetListByPositionalPathTest.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -41,7 +43,7 @@
dataObject_a.setList("PName-a/PName-b.0/PName-c", b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBoolean(property3, true);
- this.assertEquals(bb, dataObject_a.getList("PName-a/PName-b.0/PName-c").get(0));
+ assertEquals(bb, dataObject_a.getList("PName-a/PName-b.0/PName-c").get(0));
}
@@ -61,7 +63,7 @@
dataObject_a.setList("PName-a/PName-b[1]/PName-c", b);// c dataobject's a property has value boolean 'true'
dataObject_a.setString(property + ".0", bb);
- this.assertEquals(bb, dataObject_a.getList("PName-a/PName-b.0/PName-c").get(0));
+ assertEquals(bb, dataObject_a.getList("PName-a/PName-b.0/PName-c").get(0));
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetLongByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetLongByPositionalPathTest.java
index 448710c..9979b19 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetLongByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetLongByPositionalPathTest.java
@@ -19,6 +19,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -63,7 +65,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((long)by, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getLong(propertyPath_a_b_c));
}
//3. purpose: getLong with Undefined Byte Property
@@ -108,7 +110,7 @@
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((long)db, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals((long)db, dataObject_a.getLong(propertyPath_a_b_c));
}
//6. purpose: getLong with Undefined Double Property
@@ -138,7 +140,7 @@
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((long)fl, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals((long)fl, dataObject_a.getLong(propertyPath_a_b_c));
}
//8. purpose: getLong with Undefined float Property
@@ -168,7 +170,7 @@
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((long)in, dataObject_a.getLong(property));
+ assertEquals(in, dataObject_a.getLong(property));
}
//10. purpose: getLong with Undefined int Property
@@ -198,7 +200,7 @@
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals(lg, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(lg, dataObject_a.getLong(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -218,7 +220,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setLong(property3, lg);
- this.assertEquals(lg, dataObject_a.getLong(property3));
+ assertEquals(lg, dataObject_a.getLong(property3));
}
@@ -238,7 +240,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setLong(property + ".0", lg);
- this.assertEquals(lg, dataObject_a.getLong(property + ".0"));
+ assertEquals(lg, dataObject_a.getLong(property + ".0"));
}
@@ -254,7 +256,7 @@
dataObject_a.setLong(property1, lg);// c dataobject's a property has value boolean 'true'
- this.assertEquals(lg, dataObject_a.getLong(property1));
+ assertEquals(lg, dataObject_a.getLong(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -302,7 +304,7 @@
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals((long)shr, dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(shr, dataObject_a.getLong(propertyPath_a_b_c));
}
//14. purpose: getLong with Undefined short Property
@@ -333,7 +335,7 @@
Long s_d = Long.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(s_d.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
}
//16. purpose: getLong with Undefined string Property
@@ -381,7 +383,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(bd.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
}
//19. purpose: getLong with Undefined decimal Property
@@ -411,7 +413,7 @@
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(bi.longValue(), dataObject_a.getLong(propertyPath_a_b_c));
}
//21. purpose: getLong with Undefined Integer Property
@@ -442,7 +444,7 @@
Date bi = new Date(d);
dataObject_a.setDate(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.getTime(), dataObject_a.getLong(propertyPath_a_b_c));
+ assertEquals(bi.getTime(), dataObject_a.getLong(propertyPath_a_b_c));
}
//23. purpose: getLong with Undefined date Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetShortByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetShortByPositionalPathTest.java
index c2aac3a..fb814e0 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetShortByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetShortByPositionalPathTest.java
@@ -17,6 +17,8 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -61,7 +63,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals((short)by, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals(by, dataObject_a.getShort(propertyPath_a_b_c));
}
//3. purpose: getShort with Undefined Byte Property
@@ -106,7 +108,7 @@
double db = 12;
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals((short)db, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)db, dataObject_a.getShort(propertyPath_a_b_c));
}
//6. purpose: getShort with Undefined Double Property
@@ -136,7 +138,7 @@
float fl = 12;
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
- this.assertEquals((short)fl, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)fl, dataObject_a.getShort(propertyPath_a_b_c));
}
//8. purpose: getShort with Undefined float Property
@@ -166,7 +168,7 @@
int in = 12;
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
- this.assertEquals((short)in, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)in, dataObject_a.getShort(propertyPath_a_b_c));
}
//10. purpose: getShort with Undefined int Property
@@ -196,7 +198,7 @@
long lg = 12;
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
- this.assertEquals((short)lg, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals((short)lg, dataObject_a.getShort(propertyPath_a_b_c));
}
//12. purpose: getShort with Undefined long Property
@@ -226,7 +228,7 @@
short shr = 12;
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
- this.assertEquals(shr, dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals(shr, dataObject_a.getShort(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -246,7 +248,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setShort(property3, shr);
- this.assertEquals(shr, dataObject_a.getShort(property3));
+ assertEquals(shr, dataObject_a.getShort(property3));
}
@@ -266,7 +268,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setShort(property + ".0", shr);
- this.assertEquals(shr, dataObject_a.getShort(property + ".0"));
+ assertEquals(shr, dataObject_a.getShort(property + ".0"));
}
@@ -282,7 +284,7 @@
dataObject_a.setShort(property1, shr);// c dataobject's a property has value boolean 'true'
- this.assertEquals(shr, dataObject_a.getShort(property1));
+ assertEquals(shr, dataObject_a.getShort(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -331,7 +333,7 @@
Short s_d = Short.valueOf(str);
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(s_d.shortValue(), dataObject_a.getShort(propertyPath_a_b_c));
+ assertEquals(s_d.shortValue(), dataObject_a.getShort(propertyPath_a_b_c));
}
//16. purpose: getShort with Undefined string Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetStringByPositionalPathTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetStringByPositionalPathTest.java
index dd26440..96c6ce7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetStringByPositionalPathTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathpositional/SDODataObjectGetStringByPositionalPathTest.java
@@ -22,6 +22,7 @@
import java.util.List;
import java.util.TimeZone;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -50,7 +51,7 @@
Boolean B_STR = Boolean.valueOf(str);
dataObject_a.setBoolean(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(B_STR.toString(), dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(B_STR.toString(), dataObject_a.getString(propertyPath_a_b_c));
}
//2. purpose: getString with Undefined boolean Property
@@ -82,7 +83,7 @@
dataObject_a.setByte(propertyPath_a_b_c, by);// add it to instance list
- this.assertEquals(by_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(by_, dataObject_a.getString(propertyPath_a_b_c));
}
//3. purpose: getString with Undefined Byte Property
@@ -113,7 +114,7 @@
String str_ = String.valueOf(str);
dataObject_a.setChar(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(str_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(str_, dataObject_a.getString(propertyPath_a_b_c));
}
//5. purpose: getString with Undefined boolean Property
@@ -144,7 +145,7 @@
String db_ = "12.0";// String.valueOf(12);
dataObject_a.setDouble(propertyPath_a_b_c, db);// add it to instance list
- this.assertEquals(db_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(db_, dataObject_a.getString(propertyPath_a_b_c));
}
//7. purpose: getString with Undefined Double Property
@@ -175,7 +176,7 @@
dataObject_a.setFloat(propertyPath_a_b_c, fl);// add it to instance list
String fl_ = String.valueOf(fl);
- this.assertEquals(fl_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(fl_, dataObject_a.getString(propertyPath_a_b_c));
}
//9. purpose: getString with Undefined float Property
@@ -206,7 +207,7 @@
dataObject_a.setInt(propertyPath_a_b_c, in);// add it to instance list
String in_ = String.valueOf(in);
- this.assertEquals(in_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(in_, dataObject_a.getString(propertyPath_a_b_c));
}
//11. purpose: getString with Undefined int Property
@@ -237,7 +238,7 @@
dataObject_a.setLong(propertyPath_a_b_c, lg);// add it to instance list
String lg_ = String.valueOf(lg);
- this.assertEquals(lg_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(lg_, dataObject_a.getString(propertyPath_a_b_c));
}
//13. purpose: getString with Undefined long Property
@@ -268,7 +269,7 @@
dataObject_a.setShort(propertyPath_a_b_c, shr);// add it to instance list
String shr_ = String.valueOf(shr);
- this.assertEquals(shr_, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(shr_, dataObject_a.getString(propertyPath_a_b_c));
}
//15. purpose: getString with Undefined short Property
@@ -298,7 +299,7 @@
String str = "12";
dataObject_a.setString(propertyPath_a_b_c, str);// add it to instance list
- this.assertEquals(str, dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(str, dataObject_a.getString(propertyPath_a_b_c));
}
//1. purpose: getBoolean with Defined Boolean Property
@@ -318,7 +319,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setString(property3, str);
- this.assertEquals(str, dataObject_a.getString(property3));
+ assertEquals(str, dataObject_a.getString(property3));
}
@@ -338,7 +339,7 @@
dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setString(property + ".0", str);
- this.assertEquals(str, dataObject_a.getString(property + ".0"));
+ assertEquals(str, dataObject_a.getString(property + ".0"));
}
@@ -354,7 +355,7 @@
dataObject_a.setString(property1, str);// c dataobject's a property has value boolean 'true'
- this.assertEquals(str, dataObject_a.getString(property1));
+ assertEquals(str, dataObject_a.getString(property1));
}
/*public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
@@ -421,7 +422,7 @@
BigDecimal bd = new BigDecimal(db);
dataObject_a.setBigDecimal(propertyPath_a_b_c, bd);// add it to instance list
- this.assertEquals(bd.toString(), dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(bd.toString(), dataObject_a.getString(propertyPath_a_b_c));
}
//20. purpose: getString with Undefined decimal Property
@@ -451,7 +452,7 @@
BigInteger bi = new BigInteger("12");
dataObject_a.setBigInteger(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals(bi.toString(), dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals(bi.toString(), dataObject_a.getString(propertyPath_a_b_c));
}
//22. purpose: getString with Undefined Integer Property
@@ -492,7 +493,7 @@
//dataObject.setString(property, "2001-01-01");// add it to instance list
dataObject_a.setDate(propertyPath_a_b_c, bi);// add it to instance list
- this.assertEquals("2001-01-01T00:00:00Z", dataObject_a.getString(propertyPath_a_b_c));
+ assertEquals("2001-01-01T00:00:00Z", dataObject_a.getString(propertyPath_a_b_c));
}
//23. purpose: getString with Undefined date Property
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBooleanConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBooleanConversionByXPathQueryTest.java
index 52600dd..1fd5844 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBooleanConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBooleanConversionByXPathQueryTest.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -33,12 +35,12 @@
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_BOOLEAN);
dataObject_a.setBoolean(propertyTest + "test", true);
- this.assertEquals(true, dataObject_a.getBoolean(propertyTest + "test"));
+ assertEquals(true, dataObject_a.getBoolean(propertyTest + "test"));
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathWithColon() {
@@ -54,7 +56,7 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBoolean("schema:" + propertyTest + "test", true);
- this.assertEquals(true, dataObject_a.getBoolean(propertyTest + "test"));
+ assertEquals(true, dataObject_a.getBoolean(propertyTest + "test"));
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathWithAtSign() {
@@ -70,7 +72,7 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBoolean("PName-a0/@alias2[number='123']/test", true);
- this.assertEquals(true, dataObject_a.getBoolean(propertyTest + "test"));
+ assertEquals(true, dataObject_a.getBoolean(propertyTest + "test"));
}
// purpose: opencontent properties
@@ -92,7 +94,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb.booleanValue(), dataObject_a.getBoolean("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb.booleanValue(), dataObject_a.getBoolean("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -119,7 +121,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -129,7 +131,7 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
@@ -145,7 +147,7 @@
dataObject_a.setBoolean("PName-a0/PName-b0[number='1']/PName-c1.0", true);
- this.assertEquals(true, dataObject_a.getBoolean("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(true, dataObject_a.getBoolean("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
public void testSetGetDataObjectWithQueryPath_ShortPath() {
@@ -161,6 +163,6 @@
dataObject_c0.setBoolean("PName-c1.0", true);
- this.assertEquals(true, dataObject_c0.getBoolean("PName-c1.0"));
+ assertEquals(true, dataObject_c0.getBoolean("PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTest.java
index ac00314..6785652 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
@@ -38,7 +39,7 @@
//case:a/b.0/c[number="123"] where number is a many type property, and no objects meets requirement
public void testMultipleCaseOueryD1Colon() {
dataObject_d1.set(property_d_number, "123");
- this.assertNull(dataObject_a.get("schema:PName-a/PName-b.0/PName-c[number=\"1\"]"));
+ assertNull(dataObject_a.get("schema:PName-a/PName-b.0/PName-c[number=\"1\"]"));
}
//case:a/b.0/c[number="123"] where number is a many type property, and no objects meets requirement
@@ -47,7 +48,7 @@
aliasNames.add("alias1");
aliasNames.add("alias2");
property_d_number.setAliasNames(aliasNames);
- this.assertEquals(dataObject_d1, dataObject_a.get("schema:PName-a/PName-b.0/PName-c[alias1=\"1\"]"));
+ assertEquals(dataObject_d1, dataObject_a.get("schema:PName-a/PName-b.0/PName-c[alias1=\"1\"]"));
}
//case:a/b.0/c[number="123"] where number is a many type property, and no objects meets requirement
@@ -56,7 +57,7 @@
aliasNames.add("alias1");
aliasNames.add("alias2");
property_b.setAliasNames(aliasNames);
- this.assertEquals(dataObject_d1, dataObject_a.get("schema:PName-a/alias2.0/PName-c[number=\"1\"]"));
+ assertEquals(dataObject_d1, dataObject_a.get("schema:PName-a/alias2.0/PName-c[number=\"1\"]"));
}
public void testMiddleOpenContentPropertyAliasName() {
@@ -84,7 +85,7 @@
dataObject_b.set(property_open, d);
- this.assertEquals("test", dataObject_a.get("schema:PName-a/openProperty/P"));
+ assertEquals("test", dataObject_a.get("schema:PName-a/openProperty/P"));
}
@@ -94,7 +95,7 @@
//aliasNames.add("alias1");
//aliasNames.add("alias2");
//property_d_number.setAliasNames(aliasNames);
- this.assertEquals(dataObject_d1, dataObject_a.get("schema:PName-a/PName-b.0/PName-c[alias1=\"1\"]"));
+ assertEquals(dataObject_d1, dataObject_a.get("schema:PName-a/PName-b.0/PName-c[alias1=\"1\"]"));
}
public void testMultipleCaseOueryD1AliasNameBaseTypes() {
@@ -107,7 +108,7 @@
dataObject_d0._setType(type_d);
dataObject_d0.set("alias3", "1");
- this.assertEquals(dataObject_d0, dataObject_a.get("schema:PName-a/PName-b.0/PName-c[alias3=\"1\"]"));
+ assertEquals(dataObject_d0, dataObject_a.get("schema:PName-a/PName-b.0/PName-c[alias3=\"1\"]"));
}
public void testMultipleCaseOueryD1AliasNameBaseTypes1() {
@@ -119,7 +120,7 @@
type_c.addBaseType(baseType1);
dataObject_c._setType(type_c);
dataObject_c.set("alias3", "1");
- this.assertNull(dataObject_a.get("schema:PName-a/PName-b.0/alias10"));
+ assertNull(dataObject_a.get("schema:PName-a/PName-b.0/alias10"));
}
public void testMultipleCaseOueryD1AliasNameBaseTypes2() {
@@ -141,7 +142,7 @@
type_b.addBaseType(baseType1);
dataObject_b._setType(type_b);
dataObject_b.set("alias5", d);
- this.assertEquals("test", dataObject_a.get("schema:PName-a/alias5/P"));
+ assertEquals("test", dataObject_a.get("schema:PName-a/alias5/P"));
}
public void testMultipleCaseOueryD1AliasNameBaseTypes3() {
@@ -163,37 +164,37 @@
type_b.addBaseType(baseType1);
dataObject_b._setType(type_b);
dataObject_b.set("alias5", d);
- this.assertEquals("test", dataObject_a.get("schema:PName-a/baseProperty2/P"));
+ assertEquals("test", dataObject_a.get("schema:PName-a/baseProperty2/P"));
}
//case:a/b.0/c[number="123"] where number is a many type property, and no objects meets requirement
public void testMultipleCaseOueryD1AliasName1_() {
- this.assertEquals(dataObject_d1, dataObject_a.get("schema:PName-a/alias2.0/PName-c[number=\"1\"]"));
+ assertEquals(dataObject_d1, dataObject_a.get("schema:PName-a/alias2.0/PName-c[number=\"1\"]"));
}
// case: a/b[number=123]/c, more than one dataobject b in value list of dataobject a's property
// b meets the query requirement number=123
public void testMultipleCaseOuery() {
dataObject_d1.set(property_d_number, "123");
- this.assertEquals(dataObject_d0, dataObject_a.get(property));
+ assertEquals(dataObject_d0, dataObject_a.get(property));
}
//case:a/b.0/c[number="123"] where number is a many type property, and no objects meets requirement
public void testMultipleCaseOueryD1() {
dataObject_d1.set(property_d_number, "123");
- this.assertNull(dataObject_a.get("PName-a/PName-b.0/PName-c[number1=\"1\"]"));
+ assertNull(dataObject_a.get("PName-a/PName-b.0/PName-c[number1=\"1\"]"));
}
//case:a/b.0/c[number='123'] where number is a many type property, and there are objects that meets requirement
// and value is doule 5.55
public void testMultipleCaseOueryD() {
dataObject_d1.set(property_d_number, "123");
- this.assertEquals(dataObject_d1, dataObject_a.get(propertyD));
+ assertEquals(dataObject_d1, dataObject_a.get(propertyD));
}
// case: a/b[number=123]/c, no match for the query condition: number=123
public void testQueryNotMatch() {
- this.assertNull(dataObject_a.get("PName-a0/PName-b0[number='23']/PName-c0.0"));
+ assertNull(dataObject_a.get("PName-a0/PName-b0[number='23']/PName-c0.0"));
}
// case: a/b[number=123]/c, dataobject b in value list of dataobject a's property b does not have
@@ -201,39 +202,39 @@
public void testQueryMiddlePositionalAtLast() {
DataObject resultDO = dataObject_a.getDataObject(property1);
String result = resultDO.getString(PROPERTY_NAME_D_NUMBER);
- this.assertEquals("one", result);
+ assertEquals("one", result);
}
// case: a/b[number=123]/c[2], c is many type property, and access by bracket and second position
public void testQueryMiddlePositionalAtLast1() {
DataObject resultDO = dataObject_a.getDataObject("PName-a0/PName-b0[number=\"123\"]/PName-c0[2]");
String result = resultDO.getString(PROPERTY_NAME_D_NUMBER);
- this.assertEquals("two", result);
+ assertEquals("two", result);
}
// case: a/b[number=123]/c[2], c is many type property, and access by bracket and second position
public void testQueryMiddlePositionalAtLast1ContainingAt() {
DataObject resultDO = dataObject_a.getDataObject("@PName-a0/@PName-b0[number=\"123\"]/@PName-c0[2]");
String result = resultDO.getString(PROPERTY_NAME_D_NUMBER);
- this.assertEquals("two", result);
+ assertEquals("two", result);
}
// case: a/b[number=123]/c[name='Jane']
// case: a/b.0/c[number='123'], no match for condition: name='jane'
public void testPositionalInMiddleQueryAtLastDataObject() {
- this.assertEquals(dataObject_d0, dataObject_a.get(property));
+ assertEquals(dataObject_d0, dataObject_a.get(property));
}
// case: null input
public void testQueryBasePathWithNullValue() {
String v = null;
- this.assertNull(dataObject_a.get(v));
+ assertNull(dataObject_a.get(v));
}
// purpose: test path as "/"
public void testGetByXPathQueryWithShortBracketPath() {
- this.assertEquals(dataObject_d1, dataObject_c.get("PName-c[number1='5.55']"));
+ assertEquals(dataObject_d1, dataObject_c.get("PName-c[number1='5.55']"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTestCases.java
index a020476..28746ec 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByXPathQueryTestCases.java
@@ -81,6 +81,7 @@
protected SDOType baseType1;
protected SDOProperty baseProperty3;
+ @Override
public void setUp() {// set up as a/b/c
super.setUp();
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByteConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByteConversionByXPathQueryTest.java
index 61b901c..80d6e92 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByteConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetByteConversionByXPathQueryTest.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -27,7 +29,7 @@
}
public void testGetByteConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_BYTE);
byte bb = 12;
@@ -36,12 +38,12 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setByte(propertyTest + "test", bb);
- this.assertEquals(bb, dataObject_a.getByte(propertyTest + "test"));
+ assertEquals(bb, dataObject_a.getByte(propertyTest + "test"));
}
// purpose: opencontent properties
public void testGetByteConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_BYTE);
//type_c0.addDeclaredProperty(property_c1_object);
@@ -57,7 +59,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb.byteValue(), dataObject_a.getByte("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb.byteValue(), dataObject_a.getByte("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -84,7 +86,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -94,7 +96,7 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
@@ -111,6 +113,6 @@
dataObject_a.set("PName-a0/PName-b0[number='1']/PName-c1.0", b);
- this.assertEquals(b.byteValue(), dataObject_a.getByte("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(b.byteValue(), dataObject_a.getByte("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBytesConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBytesConversionByXPathQueryTest.java
index fa51401..d91c4ae 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBytesConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetBytesConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -27,7 +29,7 @@
}
public void testGetByteConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_BYTES);
byte[] b = { 12, 13 };
@@ -36,12 +38,12 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBytes(propertyTest + "test", b);
- this.assertEquals(b, dataObject_a.getBytes(propertyTest + "test"));
+ assertEquals(b, dataObject_a.getBytes(propertyTest + "test"));
}
// purpose: opencontent properties
public void testGetBytesConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_BYTES);
//type_c0.addDeclaredProperty(property_c1_object);
@@ -53,7 +55,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb, dataObject_a.getBytes("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb, dataObject_a.getBytes("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -80,7 +82,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -90,17 +92,17 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_BYTES);
byte[] b = { 1, 12 };
dataObject_a.set("PName-a0/PName-b0[number='1']/PName-c1.0", b);
- this.assertEquals(b, dataObject_a.getBytes("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(b, dataObject_a.getBytes("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetCharacterConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetCharacterConversionByXPathQueryTest.java
index 89830c2..a4a5ab1 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetCharacterConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetCharacterConversionByXPathQueryTest.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -27,7 +29,7 @@
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_CHARACTER);
char bb = 'a';
@@ -36,12 +38,12 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setChar(propertyTest + "test", bb);
- this.assertEquals(bb, dataObject_a.getChar(propertyTest + "test"));
+ assertEquals(bb, dataObject_a.getChar(propertyTest + "test"));
}
// purpose: opencontent properties
public void testGetBooleanConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_CHARACTER);
List objects = new ArrayList();
char c = 'c';
@@ -53,7 +55,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb.charValue(), dataObject_a.getChar("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb.charValue(), dataObject_a.getChar("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -80,7 +82,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -90,16 +92,16 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_CHARACTER);
char b = 'c';
dataObject_a.setChar("PName-a0/PName-b0[number='1']/PName-c1.0", b);
- this.assertEquals(b, dataObject_a.getChar("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(b, dataObject_a.getChar("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDataObjectConversionWithXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDataObjectConversionWithXPathQueryTest.java
index b65c16f..ee156dd 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDataObjectConversionWithXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDataObjectConversionWithXPathQueryTest.java
@@ -19,6 +19,8 @@
import commonj.sdo.Type;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -31,7 +33,7 @@
// purpose: pass a/b, to get dataObjcet c
public void testGetDataObjectConversionFromDefinedProperty() {
- this.assertEquals(dataObject_d0, dataObject_a.getDataObject("PName-a/PName-b.0/PName-c[number='123']"));
+ assertEquals(dataObject_d0, dataObject_a.getDataObject("PName-a/PName-b.0/PName-c[number='123']"));
}
// purpose: opencontent properties
@@ -48,7 +50,7 @@
public void testGetDataObjectConversionFromDefinedPropertyWithPath() {
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(dataObjectType);
//type_c0.addDeclaredProperty(property_c1_object);
@@ -60,7 +62,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
//dataObject_c1.setDataObject(property_c1_object, bb);
- this.assertEquals(bb, dataObject_a.getDataObject("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb, dataObject_a.getDataObject("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -88,7 +90,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -98,7 +100,7 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
@@ -116,6 +118,6 @@
dataObject_a.set("PName-a0/PName-b0[number='1']/PName-c1.0", b);
- this.assertEquals(b, dataObject_a.get("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(b, dataObject_a.get("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDateConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDateConversionByXPathQueryTest.java
index dade357..09d1b7b 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDateConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDateConversionByXPathQueryTest.java
@@ -17,6 +17,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -35,7 +37,7 @@
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_DATE);
//Boolean bb = Boolean.valueOf(true);
@@ -46,12 +48,12 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setDate(propertyTest + "test", d);
- this.assertEquals(d, dataObject_a.getDate(propertyTest + "test"));
+ assertEquals(d, dataObject_a.getDate(propertyTest + "test"));
}
// purpose: opencontent properties
public void testGetBooleanConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_DATE);
//type_c0.addDeclaredProperty(property_c1_object);
@@ -65,7 +67,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb, dataObject_a.getDate("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb, dataObject_a.getDate("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -92,7 +94,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -102,11 +104,11 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_DATE);
long l = 12000;
@@ -114,6 +116,6 @@
dataObject_a.setDate("PName-a0/PName-b0[number='1']/PName-c1.0", b);
- this.assertEquals(b, dataObject_a.getDate("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(b, dataObject_a.getDate("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDecimalConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDecimalConversionByXPathQueryTest.java
index 7f44450..baef5f2 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDecimalConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDecimalConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -28,7 +30,7 @@
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_DECIMAL);
BigDecimal bb = new BigDecimal(12);
@@ -37,12 +39,12 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigDecimal(propertyTest + "test", bb);
- this.assertEquals(bb, dataObject_a.getBigDecimal(propertyTest + "test"));
+ assertEquals(bb, dataObject_a.getBigDecimal(propertyTest + "test"));
}
// purpose: opencontent properties
public void testGetDecimalConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_DECIMAL);
List objects = new ArrayList();
@@ -53,7 +55,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb, dataObject_a.getBigDecimal("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb, dataObject_a.getBigDecimal("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -80,7 +82,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -90,7 +92,7 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
@@ -106,6 +108,6 @@
dataObject_a.setBigDecimal("PName-a0/PName-b0[number='1']/PName-c1.0", bb);
- this.assertEquals(bb, dataObject_a.getBigDecimal("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(bb, dataObject_a.getBigDecimal("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDoubleConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDoubleConversionByXPathQueryTest.java
index 32841e2..6813d65 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDoubleConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetDoubleConversionByXPathQueryTest.java
@@ -27,7 +27,7 @@
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_DOUBLE);
double bb = 12.0;
@@ -41,7 +41,7 @@
// purpose: opencontent properties
public void testGetBooleanConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_DOUBLE);
List objects = new ArrayList();
Double b = Double.valueOf(12);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetFloatConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetFloatConversionByXPathQueryTest.java
index 65844af..b68827d 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetFloatConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetFloatConversionByXPathQueryTest.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -27,7 +29,7 @@
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_FLOAT);
Float bb = Float.valueOf(1.2f);
@@ -41,7 +43,7 @@
// purpose: opencontent properties
public void testGetFloatConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_FLOAT);
List objects = new ArrayList();
Float b = Float.valueOf(2f);
@@ -78,7 +80,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -88,7 +90,7 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
@@ -104,6 +106,6 @@
dataObject_a.setFloat("PName-a0/PName-b0[number='1']/PName-c1.0", b.floatValue());
- this.assertEquals("testSetGetDataObjectWithQueryPath failed", b.floatValue(), dataObject_a.getFloat("PName-a0/PName-b0[number='1']/PName-c1.0"), (float)0.0);
+ assertEquals("testSetGetDataObjectWithQueryPath failed", b.floatValue(), dataObject_a.getFloat("PName-a0/PName-b0[number='1']/PName-c1.0"), (float)0.0);
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntConversionByXPathQueryTest.java
index 182398a..9481c68 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntConversionByXPathQueryTest.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -27,7 +29,7 @@
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_INT);
Integer bb = Integer.valueOf(12);
@@ -35,12 +37,12 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setInt(propertyTest + "test", bb.intValue());
- this.assertEquals(bb.intValue(), dataObject_a.getInt(propertyTest + "test"));
+ assertEquals(bb.intValue(), dataObject_a.getInt(propertyTest + "test"));
}
// purpose: opencontent properties
public void testGetIntConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_INT);
//type_c0.addDeclaredProperty(property_c1_object);
@@ -52,7 +54,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb.intValue(), dataObject_a.getInt("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb.intValue(), dataObject_a.getInt("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -79,7 +81,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -89,7 +91,7 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
@@ -105,6 +107,6 @@
dataObject_a.setInt("PName-a0/PName-b0[number='1']/PName-c1.0", b.intValue());
- this.assertEquals(b.intValue(), dataObject_a.getInt("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(b.intValue(), dataObject_a.getInt("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntegerConversionWithXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntegerConversionWithXPathQueryTest.java
index 9d80f05..9e744d3 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntegerConversionWithXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetIntegerConversionWithXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -28,7 +30,7 @@
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_INTEGER);
double db = 12;
@@ -38,12 +40,12 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setBigInteger(propertyTest + "test", bd);
- this.assertEquals(bd, dataObject_a.getBigInteger(propertyTest + "test"));
+ assertEquals(bd, dataObject_a.getBigInteger(propertyTest + "test"));
}
// purpose: opencontent properties
public void testGetIntegerConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_INTEGER);
List objects = new ArrayList();
double db = 12;
@@ -57,7 +59,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb, dataObject_a.getBigInteger("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb, dataObject_a.getBigInteger("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -84,7 +86,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -94,7 +96,7 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
@@ -112,6 +114,6 @@
dataObject_a.setBigInteger("PName-a0/PName-b0[number='1']/PName-c1.0", bd);
- this.assertEquals(bd, dataObject_a.getBigInteger("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(bd, dataObject_a.getBigInteger("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetListConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetListConversionByXPathQueryTest.java
index 997708b..2602b57 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetListConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetListConversionByXPathQueryTest.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -28,7 +30,7 @@
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_BOOLEAN);
prop.setMany(true);
@@ -41,7 +43,7 @@
List lista = dataObject_a.getList(propertyTest + "test");
prop.setMany(false);
- this.assertEquals(b, lista );
+ assertEquals(b, lista );
}
@@ -49,7 +51,7 @@
public void testGetDataObjectConversionFromUndefinedProperty() {
SDOType dataObjectType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.DATAOBJECT);
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(dataObjectType);
dataObject_c0.set("test", new SDODataObject());
@@ -64,7 +66,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -74,7 +76,7 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
/* public void testSetGetDataObjectWithQueryPath(){
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetLongConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetLongConversionByXPathQueryTest.java
index 4e14a1b..241cfd7 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetLongConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetLongConversionByXPathQueryTest.java
@@ -27,7 +27,7 @@
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_LONG);
Long bb = Long.valueOf(12);
@@ -41,7 +41,7 @@
// purpose: opencontent properties
public void testGetLongConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_LONG);
List objects = new ArrayList();
Long b = Long.valueOf(12);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetShortConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetShortConversionByXPathQueryTest.java
index 78eb901..623d0b5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetShortConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetShortConversionByXPathQueryTest.java
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
import org.eclipse.persistence.sdo.SDOProperty;
@@ -27,7 +29,7 @@
}
public void testGetBooleanConversionWithPathFromDefinedBooleanPropertyEqualSignBracketInPathDotSet() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_SHORT);
short s = 12;
@@ -37,12 +39,12 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setShort(propertyTest + "test", bb.shortValue());
- this.assertEquals(bb.shortValue(), dataObject_a.getShort(propertyTest + "test"));
+ assertEquals(bb.shortValue(), dataObject_a.getShort(propertyTest + "test"));
}
// purpose: opencontent properties
public void testGetShortConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_SHORT);
List objects = new ArrayList();
@@ -55,7 +57,7 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb.shortValue(), dataObject_a.getShort("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb.shortValue(), dataObject_a.getShort("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
@@ -82,7 +84,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -92,11 +94,11 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_SHORT);
short s = 12;
@@ -104,6 +106,6 @@
dataObject_a.setShort("PName-a0/PName-b0[number='1']/PName-c1.0", bb.shortValue());
- this.assertEquals(bb.shortValue(), dataObject_a.getShort("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(bb.shortValue(), dataObject_a.getShort("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetStringConversionByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetStringConversionByXPathQueryTest.java
index 3c276bc..731b7e5 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetStringConversionByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectGetStringConversionByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,6 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -46,12 +48,12 @@
//dataObject_c.set(property_c, b);// c dataobject's a property has value boolean 'true'
dataObject_a.setString(propertyTest + "test", bb);
- this.assertEquals(bb, dataObject_a.getString(propertyTest + "test"));
+ assertEquals(bb, dataObject_a.getString(propertyTest + "test"));
}
// purpose: opencontent properties
public void testGetStringConversionFromDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_STRING);
//type_c0.addDeclaredProperty(property_c1_object);
@@ -63,12 +65,12 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(bb, dataObject_a.getString("PName-a0/PName-b0[number='1']/PName-c1.1"));
+ assertEquals(bb, dataObject_a.getString("PName-a0/PName-b0[number='1']/PName-c1.1"));
}
// purpose: numberblah is invalid property name
public void testGetStringConversionFromUnDefinedPropertyWithPath() {
- SDOProperty property_c1_object = ((SDOProperty)dataObject_c1.getInstanceProperty("PName-c1"));
+ SDOProperty property_c1_object = dataObject_c1.getInstanceProperty("PName-c1");
property_c1_object.setType(SDOConstants.SDO_STRING);
//type_c0.addDeclaredProperty(property_c1_object);
@@ -80,12 +82,12 @@
dataObject_c1.set(property_c1_object, objects);// add it to instance list
- this.assertEquals(null, dataObject_a.getString("PName-a0/PName-b0[numberblah='1']/PName-c1.1"));
+ assertEquals(null, dataObject_a.getString("PName-a0/PName-b0[numberblah='1']/PName-c1.1"));
}
//2. purpose: getDataObject with property value is not dataobject
public void testGetDataObjectConversionFromUndefinedProperty() {
- SDOProperty prop = (SDOProperty)dataObject_c0.getType().getProperty("test");
+ SDOProperty prop = dataObject_c0.getType().getProperty("test");
prop.setType(SDOConstants.SDO_BYTES);
//dataObject_c.setType(type_c);
byte[] C = { 1, 2 };
@@ -102,7 +104,7 @@
//3. purpose: getDataObject with property set to boolean value
public void testGetDataObjectConversionFromProperty() {
//try {
- this.assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
+ assertNull(dataObject_a.getDataObject("PName-a/notExistedTest"));
//fail("IllegalArgumentException should be thrown.");
//} catch (IllegalArgumentException e) {
@@ -112,7 +114,7 @@
//purpose: getDataObject with nul value
public void testGetDataObjectConversionWithNullArgument() {
String p = null;
- this.assertNull(dataObject_a.getDataObject(p));
+ assertNull(dataObject_a.getDataObject(p));
}
public void testSetGetDataObjectWithQueryPath() {
@@ -129,6 +131,6 @@
dataObject_a.setString("PName-a0/PName-b0[number='1']/PName-c1.0", bb);
- this.assertEquals(bb, dataObject_a.getString("PName-a0/PName-b0[number='1']/PName-c1.0"));
+ assertEquals(bb, dataObject_a.getString("PName-a0/PName-b0[number='1']/PName-c1.0"));
}
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectUnsetIsSetByXPathQueryTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectUnsetIsSetByXPathQueryTest.java
index 2514916..7ecc1ae 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectUnsetIsSetByXPathQueryTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/dataobject/xpathquery/SDODataObjectUnsetIsSetByXPathQueryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,6 +17,8 @@
import commonj.sdo.Property;
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.eclipse.persistence.sdo.SDOConstants;
import org.eclipse.persistence.sdo.SDODataObject;
@@ -36,37 +38,37 @@
public void testIsSetWithNotYetSetDefinedProperty_SingleValue() {
//Property test = dataObject.getProperty(DEFINED_PROPERTY_NAME);
//a/b[number=1]/c
- this.assertFalse(dataObject_a.isSet("PName-a0/PName-b0[number='1']/" + "PName-c0"));
+ assertFalse(dataObject_a.isSet("PName-a0/PName-b0[number='1']/" + "PName-c0"));
}
//purpose: if dataObject just been new and property has not been set, iset() return false
public void testIsSetWithNotYetSetDefinedProperty_SingleValue_Path() {
//a/b.0/c
- this.assertFalse(dataObject_a.isSet("PName-a0/PName-b0.1/PName-c0"));
+ assertFalse(dataObject_a.isSet("PName-a0/PName-b0.1/PName-c0"));
}
//purpose: if dataObject just been new and property has not been set, iset() return false
public void testIsSetWithNotYetSetDefinedProperty_SingleValue_Index() {
- this.assertTrue(dataObject_a.isSet(propertyTest + "PName-c0"));
+ assertTrue(dataObject_a.isSet(propertyTest + "PName-c0"));
}
//purpose: if dataObject just been new and property has not been set, iset() return false
public void testIsSetWithNotYetSetDefinedProperty_SingleValue_Path_a_b() {
- this.assertTrue(dataObject_a.isSet("PName-a0/PName-b0.0/PName-c0"));
+ assertTrue(dataObject_a.isSet("PName-a0/PName-b0.0/PName-c0"));
}
//purpose: if property has been set and then unSet, isSet() return true first and false later
public void testIsSetWithSetThenUnSetDefinedProperty_SingleValue1() {
- this.assertTrue(dataObject_a.isSet(propertyTest + "PName-c0"));
+ assertTrue(dataObject_a.isSet(propertyTest + "PName-c0"));
dataObject_a.unset(propertyTest + "PName-c0");
- this.assertFalse(dataObject_a.isSet(propertyTest + "PName-c0"));
+ assertFalse(dataObject_a.isSet(propertyTest + "PName-c0"));
}
//purpose: if property has been set and then unSet, isSet() return true first and false later
public void testIsSetWithSetThenUnSetDefinedProperty_SingleValue() {
- this.assertTrue(dataObject_a.isSet("PName-a0/PName-b0.0/PName-c0"));
+ assertTrue(dataObject_a.isSet("PName-a0/PName-b0.0/PName-c0"));
dataObject_a.unset("PName-a0/PName-b0.0/PName-c0");
- this.assertFalse(dataObject_a.isSet("PName-a0/PName-b0.0/PName-c0"));
+ assertFalse(dataObject_a.isSet("PName-a0/PName-b0.0/PName-c0"));
}
//purpose: set a property's value, then unset it, get its value should now return defaule value.
@@ -75,7 +77,7 @@
property_c0.setDefault(deflt);
dataObject_a.unset(propertyTest + "PName-c0");
- this.assertEquals(deflt, (List)dataObject_a.get(propertyTest + "PName-c0"));
+ assertEquals(deflt, dataObject_a.get(propertyTest + "PName-c0"));
}
//purpose: set a property's value, then unset it, get its value should now return defaule value.
@@ -84,7 +86,7 @@
property_c0.setDefault(deflt);
dataObject_a.unset("PName-a0/PName-b0.0/PName-c0");
- this.assertEquals(deflt, (List)dataObject_a.get("PName-a0/PName-b0.0/PName-c0"));
+ assertEquals(deflt, dataObject_a.get("PName-a0/PName-b0.0/PName-c0"));
}
//case:a/b.0/c[number="123"] where number is a many type property, and no objects meets requirement
@@ -94,7 +96,7 @@
//aliasNames.add("alias2");
//property_d_number.setAliasNames(aliasNames);
dataObject_a.unset("schema:PName-a/PName-b.0/PName-c[alias1=\"1\"]");
- this.assertFalse(dataObject_a.isSet("schema:PName-a/PName-b.0/PName-c[alias1=\"1\"]"));
+ assertFalse(dataObject_a.isSet("schema:PName-a/PName-b.0/PName-c[alias1=\"1\"]"));
}
public void testunSetOpenContentPropertyAliasName() {
@@ -110,14 +112,14 @@
dataObject_c.set(property_open, "test");
dataObject_a.unset("schema:PName-a/PName-b.0/alias2");
- this.assertFalse(dataObject_a.isSet("schema:PName-a/PName-b.0/alias1"));
+ assertFalse(dataObject_a.isSet("schema:PName-a/PName-b.0/alias1"));
}
//case:a/b.0/c[number="123"] where number is a many type property, and no objects meets requirement
public void testMultipleCaseOueryD1AliasName1() {
dataObject_a.unset("schema:PName-a/@alias2.0/PName-c[number=\"1\"]");
- this.assertFalse(dataObject_a.isSet("schema:PName-a/@alias2.0/PName-c[number=\"1\"]"));
+ assertFalse(dataObject_a.isSet("schema:PName-a/@alias2.0/PName-c[number=\"1\"]"));
}
/*//purpose: unset undefined property should cause exception
@@ -135,7 +137,7 @@
public void testSetWithUndefinedProperty_SingleValue1() {
// Property test = dataObject.getProperty(UNDEFINED_PROPERTY_NAME);
//try {
- this.assertFalse(dataObject_a.isSet(propertyTest + "undefined"));
+ assertFalse(dataObject_a.isSet(propertyTest + "undefined"));
//fail("Should throw IllegalArgumentException.");
//} catch (IllegalArgumentException e) {
@@ -146,7 +148,7 @@
public void testSetWithUndefinedProperty_SingleValue() {
// Property test = dataObject.getProperty(UNDEFINED_PROPERTY_NAME);
//try {
- this.assertFalse(dataObject_a.isSet("PName-a0/PName-b0.0/undefined"));
+ assertFalse(dataObject_a.isSet("PName-a0/PName-b0.0/undefined"));
//fail("Should throw IllegalArgumentException.");
//} catch (IllegalArgumentException e) {
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceListTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceListTestCases.java
index b15db06..e363047 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceListTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceListTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
SDOType typeType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.TYPE);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTest.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTest.java
index 4d12e8b..f283f6a 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTest.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,6 +67,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
stringType = typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.STRING);
@@ -88,14 +89,17 @@
return "company";
}
+ @Override
public String getSchemaToDefine() {
return XSD_PATH;
}
+ @Override
public String getControlGeneratedFileName() {
return XSD_PATH;
}
+ @Override
protected List<Type> getTypesToGenerateFrom() {
return getControlTypes();
}
@@ -334,6 +338,7 @@
Type companyType = registerCompanyType(poType, customerType, itemType);
}
+ @Override
public List<Type> getControlTypes() {
List<Type> types = new ArrayList<Type>();
if(typeHelper.getType(URINAME, COMPANY_TYPENAME) != null) {
@@ -406,7 +411,7 @@
SDODataObject po = (SDODataObject)root.get(PO_SEQUENCE_PATH);
assertNotNull(po);
assertTrue(po.getType().isSequenced());
- SDOSequence aSequence = (SDOSequence)po.getSequence();
+ SDOSequence aSequence = po.getSequence();
assertNotNull(aSequence);
// assertEquals(4, aSequence.size());
}
@@ -436,7 +441,7 @@
SDODataObject po = (SDODataObject)root.get(PO_SEQUENCE_PATH);
assertNotNull(po);
assertTrue(po.getType().isSequenced());
- SDOSequence aSequence = (SDOSequence)po.getSequence();
+ SDOSequence aSequence = po.getSequence();
// move 2 sequenced objects
@@ -455,7 +460,7 @@
SDODataObject po = (SDODataObject)root.get(PO_SEQUENCE_PATH);
assertNotNull(po);
assertTrue(po.getType().isSequenced());
- SDOSequence aSequence = (SDOSequence)po.getSequence();
+ SDOSequence aSequence = po.getSequence();
// move 2 sequenced objects
Property beforeMoveProp0 = aSequence.getProperty(0);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestCS.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestCS.java
index 595e370..35dcfaf 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestCS.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestCS.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -76,6 +76,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
stringType = typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.STRING);
@@ -98,14 +99,17 @@
return "company";
}
+ @Override
public String getSchemaToDefine() {
return XSD_PATH;
}
+ @Override
public String getControlGeneratedFileName() {
return XSD_PATH;
}
+ @Override
protected List<Type> getTypesToGenerateFrom() {
return getControlTypes();
}
@@ -335,6 +339,7 @@
return aType;
}
+ @Override
protected DataObject addProperty(DataObject parentType, String name, Type propType) {
DataObject newProperty = parentType.createDataObject("property");
SDOProperty prop = (SDOProperty)newProperty.getType().getProperty("name");
@@ -402,6 +407,7 @@
public void registerTypes() {
registerTypes(true);
}
+ @Override
public List<Type> getControlTypes() {
List<Type> types = new ArrayList<Type>();
if(typeHelper.getType(URINAME, COMPANY_TYPENAME) != null) {
@@ -1048,6 +1054,7 @@
* @see #get(String)
* @deprecated in 2.1.0.
*/
+ @Deprecated
public void test_SequenceReturnFrom_SDODataObject_getSequence_StringFails() {
defineAndLoadRoot(false, false);
assertNotNull(root);
@@ -1082,6 +1089,7 @@
* @see #get(int)
* @deprecated in 2.1.0.
*/
+ @Deprecated
public void test_SequenceReturnFrom_SDODataObject_getSequence_index_type_complex_many() {
defineAndLoadRoot(false, false);
assertNotNull(root);
@@ -1165,6 +1173,7 @@
* @see #get(Property)
* @deprecated in 2.1.0.
*/
+ @Deprecated
public void test_SequenceReturnFrom_SDODataObject_getSequence_Property_type_single_many() {
defineAndLoadRoot(false, false);
assertNotNull(root);
@@ -1585,7 +1594,7 @@
SDOSequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
DataObject po = (DataObject)root.get(PO_SEQUENCE_PATH);
// copy po
- DataObject rootCopy = (DataObject)copyHelper.copy(root);
+ DataObject rootCopy = copyHelper.copy(root);
// check sequence was copied
SDOSequence aSequenceCopy = getSequence(rootCopy, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
assertNotNull(aSequenceCopy);
@@ -1702,7 +1711,7 @@
SDOSequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
DataObject po = (DataObject)root.get(PO_SEQUENCE_PATH);
// copy po
- DataObject rootCopy = (DataObject)copyHelper.copy(root);
+ DataObject rootCopy = copyHelper.copy(root);
// check sequence was copied
SDOSequence aSequenceCopy = getSequence(rootCopy, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
assertNotNull(aSequenceCopy);
@@ -1719,7 +1728,7 @@
SDOSequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
DataObject po = (DataObject)root.get(PO_SEQUENCE_PATH);
// copy po
- DataObject rootCopy = (DataObject)copyHelper.copy(root);
+ DataObject rootCopy = copyHelper.copy(root);
// check sequence was copied
SDOSequence aSequenceCopy = getSequence(rootCopy, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
assertNotNull(aSequenceCopy);
@@ -1754,7 +1763,7 @@
Sequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
DataObject po = (DataObject)root.get(PO_SEQUENCE_PATH);
// copy po
- DataObject rootCopy = (DataObject)copyHelper.copy(root);
+ DataObject rootCopy = copyHelper.copy(root);
// check sequence was copied
Sequence aSequenceCopy = getSequence(rootCopy, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
assertNotNull(aSequenceCopy);
@@ -3279,6 +3288,7 @@
/**
* @deprecated replaced by {@link #addText(String)} in 2.1.0
*/
+ @Deprecated
public void test_voidReturnFrom_add_String() {
// String text) {
defineAndLoadRoot(false, false);
@@ -3303,6 +3313,7 @@
/**
* @deprecated replaced by {@link #addText(int, String)} in 2.1.0
*/
+ @Deprecated
public void test_voidReturnFrom_add_int_String() {
defineAndLoadRoot(false, false);
SDOSequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
@@ -3507,7 +3518,7 @@
public void test_getValue_whereSettingIsNull() {
registerCustomerType(true, null);
- DataObject cust1 = (DataObject)dataFactory.create(typeHelper.getType(URINAME, CUSTOMER_TYPENAME));
+ DataObject cust1 = dataFactory.create(typeHelper.getType(URINAME, CUSTOMER_TYPENAME));
cust1.set("custID", 5);
List emails = new ArrayList();
emails.add("email1-DF@myCompany.com");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestXSD.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestXSD.java
index 01cf905..9e21b49 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestXSD.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SDOSequenceTestXSD.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -76,6 +76,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
stringType = typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.STRING);
@@ -98,14 +99,17 @@
return "company";
}
+ @Override
public String getSchemaToDefine() {
return XSD_PATH;
}
+ @Override
public String getControlGeneratedFileName() {
return XSD_PATH;
}
+ @Override
protected List<Type> getTypesToGenerateFrom() {
return getControlTypes();
}
@@ -375,6 +379,7 @@
public void registerTypes() {
registerTypes(true);
}
+ @Override
public List<Type> getControlTypes() {
List<Type> types = new ArrayList<Type>();
if(typeHelper.getType(URINAME, COMPANY_TYPENAME) != null) {
@@ -1258,6 +1263,7 @@
* @see #get(String)
* @deprecated in 2.1.0.
*/
+ @Deprecated
public void test_SequenceReturnFrom_SDODataObject_getSequence_StringFails() {
defineAndLoadRoot(false, false);
assertNotNull(root);
@@ -1292,6 +1298,7 @@
* @see #get(int)
* @deprecated in 2.1.0.
*/
+ @Deprecated
public void test_SequenceReturnFrom_SDODataObject_getSequence_index_type_complex_many() {
defineAndLoadRoot(false, false);
assertNotNull(root);
@@ -1375,6 +1382,7 @@
* @see #get(Property)
* @deprecated in 2.1.0.
*/
+ @Deprecated
public void test_SequenceReturnFrom_SDODataObject_getSequence_Property_type_single_many() {
defineAndLoadRoot(false, false);
assertNotNull(root);
@@ -1795,7 +1803,7 @@
SDOSequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
DataObject po = (DataObject)root.get(PO_SEQUENCE_PATH);
// copy po
- DataObject rootCopy = (DataObject)copyHelper.copy(root);
+ DataObject rootCopy = copyHelper.copy(root);
// check sequence was copied
SDOSequence aSequenceCopy = getSequence(rootCopy, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
assertNotNull(aSequenceCopy);
@@ -1908,7 +1916,7 @@
SDOSequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
DataObject po = (DataObject)root.get(PO_SEQUENCE_PATH);
// copy po
- DataObject rootCopy = (DataObject)copyHelper.copy(root);
+ DataObject rootCopy = copyHelper.copy(root);
// check sequence was copied
SDOSequence aSequenceCopy = getSequence(rootCopy, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
assertNotNull(aSequenceCopy);
@@ -1925,7 +1933,7 @@
SDOSequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
DataObject po = (DataObject)root.get(PO_SEQUENCE_PATH);
// copy po
- DataObject rootCopy = (DataObject)copyHelper.copy(root);
+ DataObject rootCopy = copyHelper.copy(root);
// check sequence was copied
SDOSequence aSequenceCopy = getSequence(rootCopy, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
assertNotNull(aSequenceCopy);
@@ -1960,7 +1968,7 @@
Sequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
DataObject po = (DataObject)root.get(PO_SEQUENCE_PATH);
// copy po
- DataObject rootCopy = (DataObject)copyHelper.copy(root);
+ DataObject rootCopy = copyHelper.copy(root);
// check sequence was copied
Sequence aSequenceCopy = getSequence(rootCopy, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
assertNotNull(aSequenceCopy);
@@ -2099,7 +2107,7 @@
// TODO: verify delete or dont delete after a sequence.remove
//assertNull(shipToObjectFromAfterRemove);
// assert dataObject is unchanged
- assertEquals(1, ((SDOChangeSummary)rootCS).getChangedDataObjects().size());
+ assertEquals(1, rootCS.getChangedDataObjects().size());
// undo
rootCS.undoChanges();
@@ -2146,9 +2154,9 @@
assertEquals(sequenceSize + 1, aSequence.size());
// assert dataObject has changed
- assertEquals(1, ((SDOChangeSummary)rootCS).getChangedDataObjects().size());
+ assertEquals(1, rootCS.getChangedDataObjects().size());
- assertEquals(sequenceSize + 1, ((SDOSequence)poDO.getSequence()).size());
+ assertEquals(sequenceSize + 1, poDO.getSequence().size());
// undo
rootCS.undoChanges();
@@ -3655,6 +3663,7 @@
/**
* @deprecated replaced by {@link #addText(String)} in 2.1.0
*/
+ @Deprecated
public void test_voidReturnFrom_add_String() {
// String text) {
defineAndLoadRoot(false, false);
@@ -3679,6 +3688,7 @@
/**
* @deprecated replaced by {@link #addText(int, String)} in 2.1.0
*/
+ @Deprecated
public void test_voidReturnFrom_add_int_String() {
defineAndLoadRoot(false, false);
SDOSequence aSequence = getSequence(root, PO_SEQUENCE_PATH, PO_SEQUENCE_SIZE);
@@ -3904,7 +3914,7 @@
public void test_getValue_whereSettingIsNull() {
registerCustomerType(true, null);
- DataObject cust1 = (DataObject)dataFactory.create(typeHelper.getType(URINAME, CUSTOMER_TYPENAME));
+ DataObject cust1 = dataFactory.create(typeHelper.getType(URINAME, CUSTOMER_TYPENAME));
cust1.set("custID", 5);
List emails = new ArrayList();
emails.add("email1-DF@myCompany.com");
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SequenceJIRA242TestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SequenceJIRA242TestCases.java
index d344790..925fa16 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SequenceJIRA242TestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/sequence/SequenceJIRA242TestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
TestRunner.main(arguments);
}
+ @Override
public void setUp() {
super.setUp();
SDOType typeType = (SDOType) typeHelper.getType(SDOConstants.SDO_URL, SDOConstants.TYPE);
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/AddBaseTypeTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/AddBaseTypeTestCases.java
index 8951514..acaed56 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/AddBaseTypeTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/AddBaseTypeTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
super(name);
}
+ @Override
public void setUp() {
super.setUp();
Type stringType = typeHelper.getType("commonj.sdo", "String");
@@ -98,16 +99,16 @@
assertEquals(3, child3SDOType.getDeclaredProperties().size());
assertEquals(12, child3SDOType.getProperties().size());
- int child2Prop2Index = ((SDOProperty)child2SDOType.getProperty("child2Prop2")).getIndexInType();
+ int child2Prop2Index = child2SDOType.getProperty("child2Prop2").getIndexInType();
assertEquals(7, child2Prop2Index);
- int child3Prop2Index = ((SDOProperty)child3SDOType.getProperty("child3Prop2")).getIndexInType();
+ int child3Prop2Index = child3SDOType.getProperty("child3Prop2").getIndexInType();
assertEquals(10, child3Prop2Index);
- int child1Prop2Index = ((SDOProperty)child1SDOType.getProperty("child1Prop2")).getIndexInType();
+ int child1Prop2Index = child1SDOType.getProperty("child1Prop2").getIndexInType();
assertEquals(4, child1Prop2Index);
- int rootProp2Index = ((SDOProperty)rootSDOType.getProperty("rootProp2")).getIndexInType();
+ int rootProp2Index = rootSDOType.getProperty("rootProp2").getIndexInType();
assertEquals(1, rootProp2Index);
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/ElementWithBuiltInTypeNameTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/ElementWithBuiltInTypeNameTestCases.java
index 3c35423..9084b90 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/ElementWithBuiltInTypeNameTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/ElementWithBuiltInTypeNameTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -128,6 +128,7 @@
this.schemas = schemas;
}
+ @Override
public Source resolveSchema(Source sourceXSD, String namespace, String schemaLocation) {
if (namespace.equals("http://tempuri.org/Imports")) {
return new DOMSource(schemas[0], SCHEMA_PATH + "schema0.xsd");
@@ -141,6 +142,7 @@
return null;
}
+ @Override
public InputSource resolveEntity(String arg0, String arg1) throws SAXException, IOException {
return null;
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/SDOTypeInstanceClassTestCases.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/SDOTypeInstanceClassTestCases.java
index f8a21cb..6c3d146 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/SDOTypeInstanceClassTestCases.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/SDOTypeInstanceClassTestCases.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -81,7 +81,7 @@
((SDOTypeHelper)typeHelper).addType(type);
- DataObject address = (DataObject)dataFactory.create(type);
+ DataObject address = dataFactory.create(type);
boolean isInstance = type.isInstance(address);
assertTrue(isInstance);
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/USAddressImpl.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/USAddressImpl.java
index 71c1553..df94293 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/USAddressImpl.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/model/type/USAddressImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,18 +19,22 @@
public class USAddressImpl extends SDODataObject implements USAddress {
+ @Override
public java.lang.String getName() {
return (java.lang.String)get("name");
}
+ @Override
public void setName(java.lang.String value) {
set("name", value);
}
+ @Override
public java.lang.String getStreet() {
return (java.lang.String)get("street");
}
+ @Override
public void setStreet(java.lang.String value) {
set("street", value);
}
diff --git a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/util/CompileUtil.java b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/util/CompileUtil.java
index 2db5c48..8659c62 100644
--- a/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/util/CompileUtil.java
+++ b/sdo/org.eclipse.persistence.sdo/src/test/java/org/eclipse/persistence/testing/sdo/util/CompileUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -109,6 +109,7 @@
return -1;
}
+ @Override
public Object clone() throws CloneNotSupportedException {
throw new CloneNotSupportedException();
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle.server/src/it/java/dbws/testing/DBWSTestSuite.java b/utils/eclipselink.dbws.builder.test.oracle.server/src/it/java/dbws/testing/DBWSTestSuite.java
index 2fa991c..81dcc6f 100644
--- a/utils/eclipselink.dbws.builder.test.oracle.server/src/it/java/dbws/testing/DBWSTestSuite.java
+++ b/utils/eclipselink.dbws.builder.test.oracle.server/src/it/java/dbws/testing/DBWSTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -314,6 +314,7 @@
messages = new ArrayList<String>();
}
+ @Override
public void log(Level level, String msg) {
// System.out.println(level.getName() + ": " + msg);
messages.add(level.getName() + ": " + msg);
@@ -360,7 +361,7 @@
try {
MessageFactory factory = MessageFactory.newInstance();
soapMessage = factory.createMessage();
- soapMessage.getSOAPPart().setContent((Source)new StreamSource(new StringReader(message)));
+ soapMessage.getSOAPPart().setContent(new StreamSource(new StringReader(message)));
soapMessage.saveChanges();
} catch (Exception e) {
e.printStackTrace();
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/DBWSTestSuite.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/DBWSTestSuite.java
index 577878d..cfbb4ed 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/DBWSTestSuite.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/DBWSTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -414,6 +414,7 @@
messages = new ArrayList<String>();
}
+ @Override
public void log(Level level, String msg) {
//System.out.println(level.getName() + ": " + msg);
messages.add(level.getName() + ": " + msg);
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/AbstractViewRow.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/AbstractViewRow.java
index 2b237fb..419421d 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/AbstractViewRow.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/AbstractViewRow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,54 +16,67 @@
public abstract class AbstractViewRow implements ViewRow {
+ @Override
public boolean equals(String key, Object value) {
return false;
}
+ @Override
public boolean isAllArguments() {
return false;
}
+ @Override
public boolean isAllCollTypes() {
return false;
}
+ @Override
public boolean isAllMethodParams() {
return false;
}
+ @Override
public boolean isAllMethodResults() {
return false;
}
+ @Override
public boolean isAllObjects() {
return false;
}
+ @Override
public boolean isAllQueueTables() {
return false;
}
+ @Override
public boolean isAllSynonyms() {
return false;
}
+ @Override
public boolean isAllTypeAttrs() {
return false;
}
+ @Override
public boolean isAllTypeMethods() {
return false;
}
+ @Override
public boolean isAllTypes() {
return false;
}
+ @Override
public boolean isSingleColumnViewRow() {
return false;
}
+ @Override
public boolean isUserArguments() {
return false;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/AttributeField.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/AttributeField.java
index 60c6128..87cd6cb 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/AttributeField.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/AttributeField.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -103,6 +103,7 @@
return m_type.toString() + " " + m_name;
}
+ @Override
public int compareTo(AttributeField o) {
return m_name.compareTo(o.getName());
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/CreateViewCacheThread.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/CreateViewCacheThread.java
index ef08936..fd2a901 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/CreateViewCacheThread.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/CreateViewCacheThread.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
m_viewCacheParameters = viewCacheParameters;
}
+ @Override
public void run() {
try {
if (m_viewCacheParameters == null || m_viewCacheParameters.isEmpty()) {
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DefaultArgsHolderType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DefaultArgsHolderType.java
index 81be4e9..2fc7ecb 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DefaultArgsHolderType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/DefaultArgsHolderType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -42,15 +42,18 @@
* Returns an array of Field objects reflecting all the accessible fields of this Type object.
* Returns an array of length 0 if this Type object has no accesible fields.
*/
+ @Override
public List<AttributeField> getDeclaredFields(boolean publishedOnly) {
return m_fields;
}
+ @Override
public List<AttributeField> getFields(boolean publishedOnly) throws SecurityException,
SQLException, PublisherException {
return m_fields;
}
+ @Override
protected List<FieldInfo> getFieldInfo() throws SQLException {
throw new SQLException("DefaultArgsHolderType#getFieldInfo not supported");
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaArrayType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaArrayType.java
index eae4c1e..7d180fb 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaArrayType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaArrayType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
m_reflector = reflector;
}
+ @Override
public String getTypeName(Typemap map) {
if (m_eleType instanceof JavaType) {
return getTypeName();
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaBaseType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaBaseType.java
index de0636e..66d5b6c 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaBaseType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaBaseType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,14 +40,17 @@
// System.out.println("[JavaBaseType] " + m_fields.length); //D+
};
+ @Override
public List<AttributeField> getFields(boolean publishedOnly) {
return m_fields;
}
+ @Override
public List<AttributeField> getDeclaredFields(boolean publishedOnly) {
return m_fields;
}
+ @Override
public List<ProcedureMethod> getDeclaredMethods() {
return m_methods;
}
@@ -56,6 +59,7 @@
return m_fields != null && m_fields.size() > 0;
}
+ @Override
public boolean hasMethods() {
return m_methods != null && m_methods.size() > 0;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaName.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaName.java
index bbfe322..ab9a641 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaName.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -143,6 +143,7 @@
/**
* Returns the package name of the decl interface
*/
+ @Override
public String getDeclItfPackage() {
return m_declItfPackage;
}
@@ -150,6 +151,7 @@
/**
* Returns the name of the decl interface
*/
+ @Override
public String getDeclItf() {
return m_declItf;
}
@@ -172,10 +174,12 @@
return currPackage.equals(m_context) ? m_useClass : packageConcat(m_context, m_name);
}
+ @Override
public String getUseClass() {
return m_useClass;
}
+ @Override
public String getUseClass(boolean full) {
if (full) {
return packageConcat(m_usePackage, m_useClass);
@@ -188,6 +192,7 @@
/**
* Returns the package name of the use class
*/
+ @Override
public String getUsePackage() {
return m_usePackage;
}
@@ -195,6 +200,7 @@
/**
* Returns the package name of the use interface
*/
+ @Override
public String getUseItfPackage() {
return m_useItfPackage;
}
@@ -202,6 +208,7 @@
/**
* if the represented type has the user subclass
*/
+ @Override
public boolean hasUseClass() {
boolean has = true;
if (m_name == null || m_context == null || m_useClass == null) {
@@ -220,6 +227,7 @@
*
* * @param currPackage the package in which the reference occurs
*/
+ @Override
public String getUseClass(String currPackage) {
if (currPackage == null) {
return m_useClass;
@@ -241,6 +249,7 @@
/**
* Returns the name of the use interface
*/
+ @Override
public String getUseItf() {
return m_useItf;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaType.java
index 0b4defb..cd294ad 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/JavaType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -41,6 +41,7 @@
return getTypeName();
}
+ @Override
public int getTypecode() {
if (m_sqlType != null) {
return m_sqlType.m_typecode;
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/LangName.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/LangName.java
index 00e1b93..4c9b1d1 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/LangName.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/LangName.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,7 @@
/**
* Returns the package name of the declared class.
*/
+ @Override
public String getDeclPackage() {
return m_context;
}
@@ -39,6 +40,7 @@
* Returns the name of the generated class within the package. This name is generated for the
* declaration of the class, as opposed to uses of the class.
*/
+ @Override
public String getDeclClass() {
return m_name;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PLSQLMap.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PLSQLMap.java
index dd3764c..0089e65 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PLSQLMap.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PLSQLMap.java
@@ -20,16 +20,19 @@
mapInit();
}
+ @Override
void mapInit() {
bfileMap = OS_BFILE;
cursorMap = JS_RESULTSET;
rowidMap = OS_ROWID;
}
+ @Override
public String writeTypeName(TypeClass type) {
return writeTypeName2(type, false);
}
+ @Override
public String writeTypeName(TypeClass type, boolean intfIfPossible) {
return writeTypeName2(type, intfIfPossible);
}
@@ -85,8 +88,9 @@
/**
* Determine the java name for a given SQL field.
*/
+ @Override
public String getMemberName(String sqlName, boolean wordBoundary, boolean onlyIfRegistered,
- Name name) {
+ Name name) {
String s = null;
if (m_field_map != null && (s = m_field_map.get(sqlName)) != null) {
@@ -100,6 +104,7 @@
}
}
+ @Override
public String getMemberNameAsSuffix(String sqlName) {
return getMemberName(sqlName, true, false);
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlCursorMethod.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlCursorMethod.java
index 78dd089..5ae285e 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlCursorMethod.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/PlsqlCursorMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -102,6 +102,7 @@
m_returnType = new JavaArrayType(m_returnEleType, m_reflector, SqlReflector.REF_CURSOR_TYPE);
}
+ @Override
public TypeClass getReturnEleType() {
return m_returnEleType;
}
@@ -111,18 +112,22 @@
return m_returnColCount;
}
+ @Override
public boolean isSingleCol() {
return m_singleColName != null;
}
+ @Override
public String singleColName() {
return m_singleColName;
}
+ @Override
public boolean returnBeans() {
return m_returnBeans;
}
+ @Override
public boolean returnResultSet() {
return !m_returnBeans;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ProcedureMethod.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ProcedureMethod.java
index f1f188a..05057ba 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ProcedureMethod.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ProcedureMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -177,6 +177,7 @@
}
return key;
}
+ @Override
public int compareTo(ProcedureMethod other) {
return getSortingKey().compareTo(other.getSortingKey());
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/QueryMethod.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/QueryMethod.java
index ee08f12..bb11f45 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/QueryMethod.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/QueryMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -43,22 +43,27 @@
return m_resultIterTypeName;
}
+ @Override
public TypeClass getReturnEleType() {
return m_returnEleType;
}
+ @Override
public boolean isSingleCol() {
return (m_singleColName != null);
}
+ @Override
public String singleColName() {
return m_singleColName;
}
+ @Override
public boolean returnBeans() {
return m_returnBeans;
}
+ @Override
public boolean returnResultSet() {
return !m_returnBeans;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SerializableType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SerializableType.java
index 8bacb69..4d50e2e 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SerializableType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SerializableType.java
@@ -40,15 +40,18 @@
/**
* Returns the fully-qualified name of the type represented by this Type object, as a String.
*/
+ @Override
public String getName() { // BLOB
// return m_name.getSimpleName();
return SqlReflector.BLOB_TYPE.getSqlName().getSimpleName();
}
+ @Override
public String getTargetTypeName() {
return getName();
}
+ @Override
public String getTypeName() {
return getName();
}
@@ -70,6 +73,7 @@
return "oracle.sql.BLOB";
}
+ @Override
public boolean isArray() {
return m_arrayDim > 0;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SingleColumnViewRow.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SingleColumnViewRow.java
index 1b37dde..3c7e4b9 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SingleColumnViewRow.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SingleColumnViewRow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,6 +33,7 @@
return m_value;
}
+ @Override
public boolean equals(String view, Object row) {
if (row instanceof SingleColumnViewRow) {
SingleColumnViewRow singlecol = (SingleColumnViewRow)row;
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlArrayType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlArrayType.java
index ce66985..379f4fb 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlArrayType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlArrayType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,6 +27,7 @@
* Determines if this Type represents an Array type.
* <p/>
*/
+ @Override
public boolean isArray() {
// INFEASIBLE
return true;
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlCollectionType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlCollectionType.java
index ce81fc0..6598c2a 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlCollectionType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlCollectionType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -52,6 +52,7 @@
/**
* Return the Type object that represents the component type of this collection type.
*/
+ @Override
public TypeClass getComponentType() throws SQLException, PublisherException {
if (m_elementType == null) {
SqlType result = null;
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlObjectType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlObjectType.java
index e4994e5..cec57e4 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlObjectType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlObjectType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -69,6 +69,7 @@
* Determines if this Type represents an object type.
* <p/>
*/
+ @Override
public boolean isObject() {
// special case BOOLEAN - not really a SqlObjectType
if ("BOOLEAN".equals(m_name.getSimpleName())) {
@@ -86,6 +87,7 @@
// Type filters and Mode filters is enabled
// protected boolean acceptMethod(Method method) { return true; }
+ @Override
public TypeClass getSupertype() throws SQLException, PublisherException {
if (m_supertypeKnown) {
return m_supertype;
@@ -117,6 +119,7 @@
* methods of java.lang.reflect.Modifier. If we ever need additional modifiers for C++, we can
* subclass this.
*/
+ @Override
public int getModifiers() throws SQLException {
if (m_modifiers == 0) {
m_modifiers = Modifier.PUBLIC;
@@ -152,6 +155,7 @@
* Returns an array of Field objects reflecting all the accessible fields of this Type object.
* Returns an array of length 0 if this Type object has no accesible fields.
*/
+ @Override
public List<AttributeField> getFields(boolean publishedOnly) throws SecurityException,
SQLException, PublisherException {
return getFields(0, publishedOnly);
@@ -180,6 +184,7 @@
return fields;
}
+ @Override
protected List<FieldInfo> getFieldInfo() throws SQLException {
SqlName sqlName = getSqlName();
String schema = sqlName.getSchemaName();
@@ -191,6 +196,7 @@
return FieldInfo.getFieldInfo(iter);
}
+ @Override
protected MethodInfo[] getMethodInfo(String schema, String name) throws SQLException {
Iterator<ViewRow> iter = null;
if (m_reflector.geqOracle9()) {
@@ -206,6 +212,7 @@
return MethodInfo.getMethodInfo(iter);
}
+ @Override
protected ResultInfo getResultInfo(String schema, String name, String method, String methodNo)
throws SQLException {
Iterator<ViewRow> iter = m_viewCache.getRows("ALL_METHOD_RESULTS", new String[0],
@@ -214,6 +221,7 @@
return ResultInfo.getResultInfo(iter);
}
+ @Override
protected ParamInfo[] getParamInfo(String schema, String name, String method, String methodNo)
throws SQLException {
Iterator<ViewRow> iter = m_viewCache.getRows(ALL_METHOD_PARAMS, new String[0],
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlOpaqueType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlOpaqueType.java
index 4d1da08..e313301 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlOpaqueType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlOpaqueType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
* Determines if this Type represents an Opaque type.
* <p/>
*/
+ @Override
public boolean isOpaque() {
// INFEASIBLE
return true;
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlPackageType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlPackageType.java
index 1966466..fa7e993 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlPackageType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlPackageType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -46,6 +46,7 @@
protected String[] m_executeNames;
protected ParamInfoValues m_paramInfoValues;
+ @Override
public boolean isPackage() {
return true;
}
@@ -63,6 +64,7 @@
//initSecurityAttributes(sqlName);
}
+ @Override
protected List<FieldInfo> getFieldInfo() {
return null;
}
@@ -103,6 +105,7 @@
}
*/
+ @Override
protected MethodInfo[] getMethodInfo(String schema, String name) throws SQLException {
/*
* POSITION of Nth argument is N SEQUENCE of Nth argument is >= N POSITION of function
@@ -132,8 +135,9 @@
return minfo;
}
+ @Override
protected ResultInfo getResultInfo(String schema, String name, String methodName,
- String methodNo) throws SQLException {
+ String methodNo) throws SQLException {
if (m_resultInfoValues == null || !m_resultInfoValues.matches(schema, name)) {
m_resultInfoValues = new ResultInfoValues(schema, name, m_methodFilter, m_viewCache);
}
@@ -180,8 +184,9 @@
}
}
+ @Override
protected ParamInfo[] getParamInfo(String schema, String name, String methodName,
- String methodNo) throws SQLException {
+ String methodNo) throws SQLException {
if (m_paramInfoValues == null || !m_paramInfoValues.matches(schema, name)) {
m_paramInfoValues = new ParamInfoValues(schema, name, m_methodFilter, m_viewCache);
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlRefType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlRefType.java
index f8adc82..b1a03df 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlRefType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlRefType.java
@@ -38,10 +38,12 @@
/**
* Returns the fully-qualified name of the type represented by this Type object, as a String.
*/
+ @Override
public String getName() {
return "REF " + m_refeeType.getName();
}
+ @Override
public String getTargetTypeName() {
if (m_refeeType instanceof SqlType) {
return "REF " + m_refeeType.getTargetTypeName();
@@ -51,6 +53,7 @@
}
}
+ @Override
public String getTypeName() {
if (m_refeeType instanceof SqlType) {
return "REF " + m_refeeType.getTypeName();
@@ -64,6 +67,7 @@
* If this Type has a component type, return the Type object that represents the component type;
* otherwise returns null.
*/
+ @Override
public TypeClass getComponentType() {
return m_refeeType;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlSqljType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlSqljType.java
index ced824a..dfc1d7d 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlSqljType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlSqljType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -23,6 +23,7 @@
m_kind = kind;
}
+ @Override
public int getSqljKind() {
return m_kind;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlStmtType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlStmtType.java
index 9f9781f..3f4e45e 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlStmtType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlStmtType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -48,6 +48,7 @@
* SqlTypeWithMethods object. Returns an array of length 0 if the SqlTypeWithMethods declares no
* methods
*/
+ @Override
public List<ProcedureMethod> getDeclaredMethods() {
List<ProcedureMethod> methods = new ArrayList<ProcedureMethod>(m_methods);
return methods;
@@ -63,6 +64,7 @@
* methods of java.lang.reflect.Modifier. If we ever need additional modifiers for C++, we can
* subclass this.
*/
+ @Override
public int getModifiers() throws SQLException {
return Modifier.PUBLIC;
}
@@ -90,6 +92,7 @@
}
}
+ @Override
public boolean hasMethods() throws SQLException, PublisherException {
/* subclasses with methods override this */
return m_methods != null && m_methods.size() > 0;
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTableType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTableType.java
index 455b373..069120a 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTableType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTableType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,6 +25,7 @@
* Determines if this Type represents a table type.
* <p/>
*/
+ @Override
public boolean isTable() {
return true;
}
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlToplevelType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlToplevelType.java
index 5bb0bce..5fb2961 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlToplevelType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlToplevelType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,10 +40,12 @@
public class SqlToplevelType extends SqlTypeWithMethods {
+ @Override
public boolean isPackage() {
return true;
}
+ @Override
public boolean isTopLevel() {
return true;
}
@@ -53,10 +55,12 @@
super(sqlName, OracleTypes.PACKAGE, true, parentType, methodFilter, reflector);
}
+ @Override
protected List<FieldInfo> getFieldInfo() {
return null;
}
+ @Override
protected MethodInfo[] getMethodInfo(String schema, String name) throws SQLException {
/*
* POSITION of Nth argument is N SEQUENCE of Nth argument is >= N POSITION of function
@@ -100,6 +104,7 @@
return minfo;
}
+ @Override
protected ResultInfo getResultInfo(String schema, String name, String method, String methodNo)
throws SQLException {
Iterator<ViewRow> iter = null;
@@ -119,6 +124,7 @@
return ResultInfo.getResultInfo(iter);
}
+ @Override
protected ParamInfo[] getParamInfo(String schema, String name, String method, String methodNo)
throws SQLException {
Iterator<ViewRow> iter = null;
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlType.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlType.java
index 34200c3..c3b50f8 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlType.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlType.java
@@ -243,6 +243,7 @@
return false;
}
+ @Override
public boolean hasConversion() {
// For SqlRefType, getSqlName()==null
if (getSqlName() == null) {
@@ -274,6 +275,7 @@
*/
//static Hashtable m_convFuns = new Hashtable();
+ @Override
public String getOutOfConversion() {
// For SqlRefType, getSqlName()==null
if (getSqlName() == null) {
@@ -287,6 +289,7 @@
* <p/>
* Returns null if this is not a PL/SQL type or if it does not have user-defined conversions.
*/
+ @Override
public String getIntoConversion() {
// For SqlRefType, getSqlName()==null
if (getSqlName() == null) {
@@ -298,6 +301,7 @@
// Return the conversion function name
// prefixed with package name,
// if the conversion function is a generated one
+ @Override
public String getOutOfConversionQualified() {
// For SqlRefType, getSqlName()==null
if (getSqlName() == null) {
@@ -309,6 +313,7 @@
// Return the conversion function name
// prefixed with package name,
// if the conversion function is a generated one
+ @Override
public String getIntoConversionQualified() {
// For SqlRefType, getSqlName()==null
if (getSqlName() == null) {
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTypeWithFields.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTypeWithFields.java
index 516c217..a8c6e34 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTypeWithFields.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTypeWithFields.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -61,6 +61,7 @@
*/
// [3190197] Add publishedOnly: false - return Fields including
// those not published as well
+ @Override
public List<AttributeField> getDeclaredFields(boolean publishedOnly) throws SQLException,
PublisherException {
if (publishedOnly) {
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTypeWithMethods.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTypeWithMethods.java
index 5c3ab75..15055de 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTypeWithMethods.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/SqlTypeWithMethods.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,7 @@
* SqlTypeWithMethods object. Returns an array of length 0 if the SqlTypeWithMethods declares no
* methods
*/
+ @Override
public List<ProcedureMethod> getDeclaredMethods() throws SQLException, PublisherException {
if (m_methods == null) {
m_methods = reflectMethods(getSqlName());
@@ -56,6 +57,7 @@
return m_methods;
}
+ @Override
public boolean hasMethods() throws SQLException, PublisherException {
List<ProcedureMethod> m = getDeclaredMethods();
return m != null && m.size() > 0;
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCache.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCache.java
index 8426b95..bceccf1 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCache.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewCache.java
@@ -451,6 +451,7 @@
return (dir == null ? "" : dir + File.separator) + VIEW_CACHE_PREFIX + user.toLowerCase();
}
+ @Override
public void readExternal(java.io.ObjectInput in) throws IOException, ClassNotFoundException {
if (m_viewCacheDebug) {
System.out.println("viewcache.read.external");
@@ -483,6 +484,7 @@
}
}
+ @Override
public void writeExternal(ObjectOutput out) throws IOException {
if (m_viewCacheDebug) {
System.out.println("viewcache.write.external");
diff --git a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewRowFactory.java b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewRowFactory.java
index d22ce7d..df737e2 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewRowFactory.java
+++ b/utils/eclipselink.dbws.builder.test.oracle/src/it/java/dbws/testing/shadowddlgeneration/oldjpub/ViewRowFactory.java
@@ -126,6 +126,7 @@
|| view.equalsIgnoreCase(ALL_ARGUMENTS);
}
+ @Override
public boolean equals(String key, Object value) {
boolean eq = false;
try {
diff --git a/utils/eclipselink.utils.rename/src/main/java/org/eclipse/persistence/utils/rename/RenameValue.java b/utils/eclipselink.utils.rename/src/main/java/org/eclipse/persistence/utils/rename/RenameValue.java
index e7bcc60..9765efe 100644
--- a/utils/eclipselink.utils.rename/src/main/java/org/eclipse/persistence/utils/rename/RenameValue.java
+++ b/utils/eclipselink.utils.rename/src/main/java/org/eclipse/persistence/utils/rename/RenameValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,6 +64,7 @@
protected static Comparator<RenameValue> renameValueComparator() {
return new Comparator<RenameValue>() {
+ @Override
public int compare(RenameValue rv1, RenameValue rv2) {
return rv2.getSourceValue().length()
- rv1.getSourceValue().length();
diff --git a/utils/eclipselink.utils.sigcompare/src/main/java/eclipselink/utils/sigcompare/SignatureImporter.java b/utils/eclipselink.utils.sigcompare/src/main/java/eclipselink/utils/sigcompare/SignatureImporter.java
index a4a7b5d..39df2e7 100644
--- a/utils/eclipselink.utils.sigcompare/src/main/java/eclipselink/utils/sigcompare/SignatureImporter.java
+++ b/utils/eclipselink.utils.sigcompare/src/main/java/eclipselink/utils/sigcompare/SignatureImporter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,12 +64,14 @@
super(Opcodes.ASM5);
}
+ @Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
if ((access & Opcodes.ACC_PUBLIC) > 0) {
this.sig = new ClassSignature(name, superName, interfaces);
} // TODO: Handle inheritance
}
+ @Override
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
if (this.sig != null && (access & Opcodes.ACC_PUBLIC) > 0) {
this.sig.addField(name, desc);
@@ -77,6 +79,7 @@
return null;
}
+ @Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
if (this.sig != null && (access & Opcodes.ACC_PUBLIC) > 0) {
this.sig.addMethod(name, desc);
@@ -84,6 +87,7 @@
return null;
}
+ @Override
public void visitEnd() {
if (this.sig != null) {
this.classes.put(this.sig.getName(), this.sig);
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/DBWSTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/DBWSTestSuite.java
index 0b8ba01..06f09fe 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/DBWSTestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/DBWSTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -433,6 +433,7 @@
messages = new ArrayList<String>();
}
+ @Override
public void log(Level level, String msg) {
//System.out.println(level.getName() + ": " + msg);
messages.add(level.getName() + ": " + msg);
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/loglevelvalidation/LogLevelValidationTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/loglevelvalidation/LogLevelValidationTestSuite.java
index ac01966..141eef1 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/loglevelvalidation/LogLevelValidationTestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/loglevelvalidation/LogLevelValidationTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -155,17 +155,21 @@
(XMLDirectMapping)sessionConfigProject.getDescriptor(SessionConfigs.class).
getMappings().firstElement();
versionMapping.setConverter(new XMLConverterAdapter() {
+ @Override
public Object convertObjectValueToDataValue(Object objectValue, Session session,
- XMLMarshaller marshaller) {
+ XMLMarshaller marshaller) {
return VERSION;
}
+ @Override
public Object convertDataValueToObjectValue(Object dataValue, Session session,
- XMLUnmarshaller unmarshaller) {
+ XMLUnmarshaller unmarshaller) {
return dataValue;
}
+ @Override
public boolean isMutable() {
return false;
}
+ @Override
public void initialize(DatabaseMapping mapping, Session session) {
}
});
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/mtom/MTOMTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/mtom/MTOMTestSuite.java
index 77258b8..81ab1a0 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/mtom/MTOMTestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/mtom/MTOMTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -349,6 +349,7 @@
}
}
+ @Override
@PreDestroy
public void destroy() {
super.destroy();
@@ -499,7 +500,7 @@
part.setContent(domSource);
SOAPMessage response = null;
response = dispatch.invoke(request);
- AttachmentPart aPart = (AttachmentPart)response.getAttachments().next();
+ AttachmentPart aPart = response.getAttachments().next();
DataHandler dh = aPart.getDataHandler();
InputStream inputStream = dh.getInputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/optlock/OptLockTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/optlock/OptLockTestSuite.java
index f97af74..393d0ba 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/optlock/OptLockTestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/optlock/OptLockTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -243,6 +243,7 @@
}
}
+ @Override
@PreDestroy
public void destroy() {
super.destroy();
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/rootcause/RootCauseTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/rootcause/RootCauseTestSuite.java
index 83a7a98..4039187 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/rootcause/RootCauseTestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/rootcause/RootCauseTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -263,6 +263,7 @@
}
}
+ @Override
@PreDestroy
public void destroy() {
super.destroy();
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/secondarysql/SecondarySQLTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/secondarysql/SecondarySQLTestSuite.java
index 2ae559e..9fcdb0b 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/secondarysql/SecondarySQLTestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/secondarysql/SecondarySQLTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -313,6 +313,7 @@
}
}
+ @Override
@PreDestroy
public void destroy() {
super.destroy();
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/soap12/SOAP12TestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/soap12/SOAP12TestSuite.java
index 84a1a68..2b5e440 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/soap12/SOAP12TestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/soap12/SOAP12TestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -354,6 +354,7 @@
}
}
+ @Override
@PreDestroy
public void destroy() {
super.destroy();
@@ -507,7 +508,7 @@
part.setContent(domSource);
SOAPMessage response = null;
response = dispatch.invoke(request);
- AttachmentPart aPart = (AttachmentPart)response.getAttachments().next();
+ AttachmentPart aPart = response.getAttachments().next();
DataHandler dh = aPart.getDataHandler();
InputStream inputStream = dh.getInputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java
index f9faae0..29fc656 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/sqlascollection/SQLAsCollectionTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -254,6 +254,7 @@
runDdl(conn, DROP_SQLCOLLECTION_TABLE, ddlDebug);
}
}
+ @Override
@PreDestroy
public void destroy() {
super.destroy();
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/updatefault/UpdateFaultTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/updatefault/UpdateFaultTestSuite.java
index 67e64d6..fcd5721 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/updatefault/UpdateFaultTestSuite.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/updatefault/UpdateFaultTestSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -262,6 +262,7 @@
}
}
+ @Override
@PreDestroy
public void destroy() {
super.destroy();
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java
index 41d9dd2..415a4d9 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java
@@ -21,7 +21,7 @@
requires jakarta.servlet; //AM
requires org.eclipse.persistence.asm;
- requires org.eclipse.persistence.core;
+ requires transitive org.eclipse.persistence.core;
requires org.eclipse.persistence.dbws;
requires org.eclipse.persistence.jpa;
requires org.eclipse.persistence.jpa.jpql;
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/BaseDBWSBuilderHelper.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/BaseDBWSBuilderHelper.java
index ebbf331..1436a49 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/BaseDBWSBuilderHelper.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/BaseDBWSBuilderHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -1352,7 +1352,7 @@
}
return null;
} else if (dType.isScalar()) {
- org.eclipse.persistence.internal.helper.DatabaseType theType = OraclePLSQLTypes.getDatabaseTypeForCode(((ScalarDatabaseType)dType).getTypeName());
+ org.eclipse.persistence.internal.helper.DatabaseType theType = OraclePLSQLTypes.getDatabaseTypeForCode(dType.getTypeName());
if (theType != null) {
return theType;
}
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java
index b03ce6d..69e4b88 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -388,7 +388,7 @@
/**
* Build the inline schema that will make up the content of the
- * <wsdl:types> section of the WSDL.
+ * {@code <wsdl:types>} section of the WSDL.
* @return
*/
@SuppressWarnings("unchecked")
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java
index 91cf3ad..9c16977 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -177,6 +177,7 @@
break;
case noArchive:
setArchiver(null);
+ break;
case ignore:
// do nothing - the default setting from the constructor is fine
break;
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/oracle/OracleHelper.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/oracle/OracleHelper.java
index 382aa20..4382386 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/oracle/OracleHelper.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/oracle/OracleHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -597,7 +597,7 @@
/**
* Build list of name patterns separated by vertical bar.
- * @param namePatterns {@see List} of name patterns.
+ * @param namePatterns {@link List} of name patterns.
* @return String containing list of name patterns separated by vertical bar.
*/
private static String buildNamePatternsList(List<String> namePatterns) {
diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java
index 928c8fd..385995b 100644
--- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java
+++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -874,7 +874,7 @@
for (FieldType fld : fields) {
DatabaseType enclosedType = fld.getEnclosedType();
if (!enclosedType.isComposite() || enclosedType.isTYPEType()) { // basic
- String typeName = enclosedType.isTYPEType() ? ((TYPEType) enclosedType).getTypeName() : fld.getTypeName();
+ String typeName = enclosedType.isTYPEType() ? enclosedType.getTypeName() : fld.getTypeName();
BasicAccessor basic = generateBasicAccessor(fld.getFieldName().toLowerCase(), fld.getFieldName(), getClassNameFromJDBCTypeName(typeName, dbPlatform));
embeddable.getAttributes().getBasics().add(basic);
} else if (enclosedType.isPLSQLType()) { // record or collection
