diff --git a/dbws/org.eclipse.persistence.dbws/pom.xml b/dbws/org.eclipse.persistence.dbws/pom.xml
index 511cecefe63..c920ed4e696 100644
--- a/dbws/org.eclipse.persistence.dbws/pom.xml
+++ b/dbws/org.eclipse.persistence.dbws/pom.xml
@@ -31,6 +31,8 @@
+
+ -Xlint:all,-rawtypes,-unchecked,-serial,-exports
${skipTests}
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 f001fd07204..20cc1621629 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 @@ public void getAllEmployees() {
for (DynamicEntity employee : resultVector) {
xrDynEntityCol.add(employee);
xrDynEntityCol.add(employee.get("address"));
- Vector phones = (Vector)employee.get("phones");
+ Vector phones = employee.get("phones");
phones.size(); // trigger IndirectList
for (DynamicEntity phone : phones) {
xrDynEntityCol.add(phone);
@@ -745,7 +745,7 @@ public void buildEmployees() {
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 phones = (ArrayList)employee1.get("phones"); // phones
+ ArrayList 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 00bb6ee6058..45ba51504c0 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 @@ public XRCustomer() {
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 6ee9293844f..cb0958ab658 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 @@ public void buildTestClass() throws ClassNotFoundException {
@SuppressWarnings("unchecked")
@Test
- public void buildTestEntity() throws InstantiationException, IllegalAccessException,
- NoSuchFieldException {
+ public void buildTestEntity() throws ReflectiveOperationException {
XRDynamicClassLoader xrdcl =
new XRDynamicClassLoader(XRDynamicEntityTestSuite.class.getClassLoader());
Class testClass =
(Class)xrdcl.createDynamicClass(TEST_CLASSNAME);
- XRDynamicEntity newInstance = testClass.newInstance();
+ XRDynamicEntity newInstance = testClass.getConstructor().newInstance();
XRDynamicPropertiesManager xrDPM = newInstance.fetchPropertiesManager();
Set propertyNames = new HashSet();
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 408fc25140c..71cbf60cab1 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 26230cd37a0..5133ae7d37e 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 @@ protected XMLDescriptor buildResultDescriptor() {
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 70c5e73004a..361c4e13b40 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 @@ public SOAPMessage generateResponse(Operation op, boolean useSOAP12, Object resu
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 f4c69b22983..ecc1f2b6244 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 @@ public void setJpqlString(String sqlString) {
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 f61354088f1..88ef70fc975 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 @@ public void setDescriptor(String descriptor) {
this.descriptor = descriptor;
}
- /**
- * {@inheritDoc}
- */
@Override
public void validate(XRServiceAdapter xrService, QueryOperation queryOperation) {
if (descriptor != null) {
@@ -90,9 +87,6 @@ public void validate(XRServiceAdapter xrService, QueryOperation queryOperation)
}
}
- /**
- * {@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 710fec1cafd..baa812eb9ae 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 @@ public static void fixOROXAccessors(Project orProject, Project oxProject) {
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 8d23cb6ff01..8b46418a51e 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 @@ public Object invoke(XRServiceAdapter xrService, Invocation invocation) {
}
// 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 @@ public Object invoke(XRServiceAdapter xrService, Invocation invocation) {
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 1a6e69a39c0..d168f450c60 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 @@ public void setSqlString(String sqlString) {
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 03f59d146a3..e66cf48baca 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 @@ public void initializeCall(XRServiceAdapter xrService, QueryOperation queryOpera
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 1d9312311f9..6e3cb4d11c0 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 @@ public DynamicRestClassLoader(ClassLoader delegate, DynamicClassWriter writer) {
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 39560a63b9e..8bea568540a 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 queryParams, List items, UriInfo uriInfo) {
return items;
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildReportQueryResponse(PersistenceContext context, Map queryParams, List results, List items, UriInfo uriInfo) {
if ((results != null) && (!results.isEmpty())) {
@@ -64,9 +58,6 @@ public Object buildReportQueryResponse(PersistenceContext context, Map queryParams, String attribute, Object result, UriInfo uriInfo) {
if (result instanceof Collection) {
@@ -81,9 +72,6 @@ public Object buildAttributeResponse(PersistenceContext context, Map queryParams, Object result, List items, UriInfo uriInfo) {
final SingleResultQueryList response = new SingleResultQueryList();
@@ -92,9 +80,6 @@ public Object buildSingleResultQueryResponse(PersistenceContext context, Map 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 26c32a363be..98410224113 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 @@ public boolean isSupported(Feature feature) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public FeatureResponseBuilder getResponseBuilder(Feature feature) {
switch (feature) {
@@ -73,9 +67,6 @@ public FeatureResponseBuilder getResponseBuilder(Feature feature) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public List getMetadataSources() {
final List metadataSources = new ArrayList();
@@ -98,17 +89,11 @@ public List getMetadataSources() {
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 be389432bc0..e10c88838e8 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 @@ public boolean isSupported(Feature feature) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public FeatureResponseBuilder getResponseBuilder(Feature feature) {
switch (feature) {
@@ -77,9 +71,6 @@ public FeatureResponseBuilder getResponseBuilder(Feature feature) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public List getMetadataSources() {
final List metadataSources = new ArrayList();
@@ -104,17 +95,11 @@ public List getMetadataSources() {
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 4a9896c7f0d..099f426e342 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 queryParams, List items, UriInfo uriInfo) {
return collectionResponse(context, items, uriInfo);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildReportQueryResponse(PersistenceContext context, Map queryParams, List results, List items, UriInfo uriInfo) {
ReportQueryResultCollection response = new ReportQueryResultCollection();
@@ -78,9 +72,6 @@ public Object buildReportQueryResponse(PersistenceContext context, Map queryParams, Object result, List items, UriInfo uriInfo) {
final SingleResultQueryResult response = new SingleResultQueryResult();
@@ -94,9 +85,6 @@ public Object buildSingleResultQueryResponse(PersistenceContext context, Map queryParams, String attribute, Object item, UriInfo uriInfo) {
if (item instanceof List) {
@@ -105,9 +93,6 @@ public Object buildAttributeResponse(PersistenceContext context, Map 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 84918d3792c..850cb2fe412 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 queryParams, List items, UriInfo uriInfo) {
ReadAllQueryResultCollection response = new ReadAllQueryResultCollection();
@@ -59,17 +56,11 @@ public Object buildReadAllQueryResponse(PersistenceContext context, Map queryParams, List results, List items, UriInfo uriInfo) {
return populatePagedReportQueryCollectionLinks(queryParams, results, items, uriInfo);
}
- /**
- * {@inheritDoc}
- */
@Override
public Object buildAttributeResponse(PersistenceContext context, Map 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 5a03059beeb..13b61cc5314 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 @@ private void addMapping(Descriptor descriptor, DatabaseMapping mapping) {
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 @@ private void addMapping(Descriptor descriptor, DatabaseMapping mapping) {
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 @@ private Query getQuery(DatabaseQuery query, PersistenceContext context) {
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 b7d4ccd5642..e0cbf60f63f 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 @@ public ConcreteSubclassFactory(Class clazz) {
* 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 140fdbecdb2..50307ad96fb 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 @@ public class InMemoryArchive extends URLArchive {
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 a246ed6ebe4..a80436afefe 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 class PreLoginMappingAdapterV2 extends SessionEventListener {
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 de2ce0e95e9..ee58e06a30f 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 @@ public class ReadAllQueryResultCollection implements PageableCollection
private Integer count = null;
private List links;
- /**
- * {@inheritDoc}
- */
@Override
public List getItems() {
return items;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setItems(List 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 getLinks() {
return this.links;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLinks(List 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 9c9c9ea5671..057cfa4ed81 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 @@ private JAXBElement createJAXBProperty(DatabaseMapping mapping, Obje
// 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 cc0c4891694..9a54fd8bcf4 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 @@ private JAXBElement createProperty(ForeignReferenceMapping mapping,
return objectFactory.createXmlElement(xmlElement);
}
- /**
- * {@inheritDoc}
- */
@Override
public XmlBindings getXmlBindings(Map 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 6f63b85042b..d2f9ec09e60 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 @@ public SingleResultQueryResultMetadataSource() {
javaTypes.getJavaType().add(javaType);
}
- /**
- * {@inheritDoc}
- */
@Override
public XmlBindings getXmlBindings(Map 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 819cd4cdb77..52db6777352 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 java.math.BigDecimal getId() {
}
public Collection getItems() {
- return (Collection)getItemsHolder().getValue();
+ return getItemsHolder().getValue();
}
public ValueHolderInterface> 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 f2b56c14ce9..2540de1e9eb 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 @@ public static void amendEmployee1WithJoinWithInsert(ClassDescriptor descriptor)
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 6bb72066188..dc2f0c68dff 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 @@ public void createTables(DatabaseSession session) {
// 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 fb40943644c..d6c72d93e71 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 @@ public void createTables(DatabaseSession session) {
// 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 b85c05f76b6..408bf301dfe 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 @@ public void setup() {
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 d756e3ce62d..65b345972ee 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 @@ public void login() {
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 c7b92f2d0ac..3fb87dd3f3d 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 @@ public void login() {
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 23616fac132..032f3c6c38d 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 @@ protected Server buildSession(String sessionName) throws Exception {
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 fc0ba0ea381..e9a04a28c8b 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 @@ public DistributedServer(Session testSssion) {
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 aa05d5d15f8..54db24d98d9 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 @@ public void startCacheSynchronization() {
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 8eef793f31e..04af57ae24e 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 @@ public static void setUp() {
// 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 e9531907f97..a564cc24da5 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 @@ public static void setUp() {
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 6f438dcd139..64d3752e98c 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 @@ public static void setUp() {
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 e2e1b5346b2..346df96de69 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 @@ public void test() {
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 8351bd6cc89..9a60ca3ccd6 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 @@ public void test() {
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 4ebbc26678c..fcb74b610af 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 @@ protected void setup() {
@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 bc87ab8f5e1..b0535dce028 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 @@ public UnitOfWorkCommitResumeTest(Object originalObject) {
*/
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 changeUnitOfWorkWorkingCopy() {
*/
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 6b6e14c7769..847182ea31d 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 @@ public UnitOfWorkTest(Object originalObject) {
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 50eefbe66e4..fa44f533b51 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 @@ public void test() {
}
@Override
public void startTest() {
- ((OraclePlatform)getSession().getPlatform()).setShouldUseRownumFiltering(false);
+ getSession().getPlatform().setShouldUseRownumFiltering(false);
}
/**
@@ -85,7 +85,7 @@ public void startTest() {
*/
@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 4e69a70f6e7..2f425071e48 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 @@ public void test() {
}
@Override
public void startTest() {
- ((OraclePlatform)getSession().getPlatform()).setShouldUseRownumFiltering(false);
+ getSession().getPlatform().setShouldUseRownumFiltering(false);
}
/**
@@ -85,7 +85,7 @@ public void startTest() {
*/
@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 5401edf5816..9bfa2008286 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 @@ public void test() {
}
@Override
public void startTest() {
- ((OraclePlatform)getSession().getPlatform()).setShouldUseRownumFiltering(false);
+ getSession().getPlatform().setShouldUseRownumFiltering(false);
}
/**
@@ -82,7 +82,7 @@ public void startTest() {
*/
@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 6f40332af0f..02ebf23d601 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 @@ public void test() {
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 45d7997b3c0..010949c73bd 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 @@ public void buildConformQuery() {
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 8f4ea55da81..9697fef24dc 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 @@ public void run() {
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 Method getCheckForCustomQueryMethod(final Class c) {
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 6cd1d0073f1..e15d5575e2e 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 @@ public void test() {
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 29671c9ac17..0df94540f87 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 setup() {
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 @@ protected void test() {
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 @@ protected void test() {
// 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 @@ protected void test() {
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 @@ protected void test() {
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 27ccca5680c..3027693466f 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 @@ protected boolean isCorrect(int i) {
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 97afde4f8c1..35b5f3bb316 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 @@ public void getChange(org.eclipse.persistence.sessions.Record row, DatabaseMappi
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 eb54917a83e..bd19f337999 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 EmployeeWithSpacesDeleteTest(Object originalObject) {
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 dc4c6c0ef07..626c3561f49 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 @@ protected void setup() {
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 a14ea4b8eaf..e1320a8d383 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 @@ protected void verify(WriteTypeObjectTest testCase) throws TestErrorException, T
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 920516c2d94..06eaa78c3d8 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 @@ protected void verify(WriteTypeObjectTest testCase) throws TestErrorException, T
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 ea5ca029af7..ec139b4467b 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 @@ public AttributeNameNotSpecifiedTest() {
@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 @@ protected void setup() {
@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 afdb4c1e33a..7534bbb61d8 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 @@ public ClassIndicatorFieldNotFoundTest() {
@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 @@ protected void setup() {
@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 edcb8280a95..9da16902bf5 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 @@ public CloseConnAfterDatabaseSessionTxnTest(){
@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 9737f56832f..ee4b0e6ad5f 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 @@ public DescriptorForInterfaceIsMissingTest() {
@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 @@ protected void setup() {
@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 752af33cd19..d2de55b299e 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 @@ public DescriptorIsMissingTest() {
@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 @@ protected void setup() {
@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 e642e5ad5c3..75e38a8f45f 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 @@ public DirectFieldNameNotSetTest() {
@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 @@ protected void setup() {
@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 b78cd221c60..197ab2158a9 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 @@ public ForeignKeysDefinedIncorrectlyTest() {
@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 @@ protected void setup() {
@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 868844ef4a1..3f2ce33c5b7 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 @@ public RelationalDescriptor descriptor() {
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 @@ public RelationalDescriptor descriptor() {
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 3b0dea7ea60..d3466373f66 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 @@ public void test() {
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 05d8a33c0c6..0807ef5b933 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 @@ protected void setup() {
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 @@ protected void setup() {
@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 @@ public void test() {
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 60686cfa038..f7a2a1d7eff 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 @@ protected void setup() {
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 @@ protected void setup() {
@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 @@ public void test() {
// ((DatabaseSession) getSession()).login();
- UnitOfWork uow = ((DatabaseSession)getSession()).acquireUnitOfWork();
+ UnitOfWork uow = getSession().acquireUnitOfWork();
uow.registerObject(person);
uow.commit();
@@ -114,7 +114,7 @@ public RelationalDescriptor descriptor() {
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 @@ public RelationalDescriptor descriptor() {
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 cd039a0275c..0248878204b 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 @@ protected void setup() {
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 @@ protected void setup() {
@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 @@ public void test() {
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 4af03359565..c07431d8946 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 @@ protected void setup() {
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 @@ protected void setup() {
@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 @@ public void test() {
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 5066ffe3658..04e67fdfe97 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 @@ protected void setup() {
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 81ff27e98b0..bb6761c8e5d 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 @@ protected void setup() {
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 287eec76e0b..a9f2691a34f 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 @@ protected void setup() {
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 610e15e6257..54e79ab756a 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 @@ protected void setup() {
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 57980d5e18e..2521e1ff408 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 @@ protected void setup() {
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 925c55e2b66..e7d4dc87ea9 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 @@ protected void setup() {
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 ec5ae1cda45..b4f09051eee 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 @@ public MappingMustBeReadOnlyWhenStoredInCacheTest() {
@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 b55d3e1031a..4429bbc3a51 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 @@ public MultipleTablePrimaryKeyMustBeFullyQualifiedTest() {
@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 @@ protected void setup() {
@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 5ec1f630908..1e7a59b3c34 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 @@ public MultipleWriteMappingsForFieldTest() {
@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 @@ protected void setup() {
@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 dfc5b0c55d2..67ca3ba7c19 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 @@ public NoAttributeTransformationMethodTest() {
@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 @@ protected void setup() {
@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 a7af6912079..300553ac8e5 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 @@ protected void setup() {
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 @@ protected void setup() {
@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 94ced8b028a..f3288fc36a1 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 @@ public NoForeighKeysAreSpecifiedTest() {
@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 @@ protected void setup() {
@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 66b268e3cc2..f1c7aea417f 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 @@ public NoMappingForPrimaryKeyTest() {
@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 @@ protected void setup() {
@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 023416cade7..dc0a0b7cf5c 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 @@ public NoReferenceKeyIsSpecifiedTest() {
@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 @@ protected void setup() {
@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 57a07b67210..6f379ce1840 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 @@ public NoRelationTableTest() {
@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 @@ protected void setup() {
@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 b440211484a..7dd4824a4be 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 @@ public NoSourceRelationKeysSpecifiedTest() {
@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 @@ protected void setup() {
@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 1127de69a96..da24987360d 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 @@ protected void setup() {
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 5824ff4bfd4..e095b382ef9 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 @@ public NoSuchMethodOnInitializingAttributeMethodTest() {
@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 @@ protected void setup() {
@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 920a16368aa..2b5200e67e2 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 @@ public NoSuchMethodWhileConvertingToMethodTest() {
@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 @@ protected void setup() {
@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 4b190ded748..ca000f904ea 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 @@ public NoSuchMethodWhileInitializingAttributesInMethodAccessorTest() {
@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 @@ protected void setup() {
@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 edb6a19a0dd..d4cc4454573 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 @@ public NoSuchMethodWhileInitializingAttributesInMethodAccessor_GetTest() {
@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 @@ protected void setup() {
@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 c7ea718ea2a..c2f09fa1653 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 @@ public NoSuchMethodWhileInitializingAttributesInMethodAccessor_SetTest() {
@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 @@ protected void setup() {
@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 094509e795f..30da17a9b87 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 @@ public NoTargetForeignKeysSpecifiedTest() {
@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 @@ protected void setup() {
@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 902b48153a3..78970b1eb00 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 @@ public NoTargetRelationKeysSpecifiedTest() {
@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 @@ protected void setup() {
@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 301f8923151..78ad2fd8e1b 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 @@ public NullPointerWhileSettingValueThruInstanceVariableAccessorTest() {
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 e41f9f1803a..52405800b51 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 @@ public RelationalDescriptor descriptor() {
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 d3625e9104c..739ba3561bf 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 @@ public RelationalDescriptor descriptor() {
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 @@ public RelationalDescriptor descriptor() {
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 d83d7cf4115..c551df29f79 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 @@ public ParentClassIsSelfTest() {
@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 @@ protected void setup() {
@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 e060b93f1a3..23242df02f3 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 @@ public ParentDescriptorNotSpecifiedTest() {
@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 @@ protected void setup() {
@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 6765fac9620..bc2a239f668 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 @@ public ReferenceKeyFieldNotProperlySpecifiedTest() {
@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 @@ protected void setup() {
@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 673388eb551..4c483a12e6d 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 @@ public ReferenceTableNotSpecifiedTest() {
@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 @@ protected void setup() {
@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 5e3736fd935..35c80899022 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 @@ public RelationKeyFieldNotProperlySpecifiedTest() {
@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 @@ protected void setup() {
@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 c653fff9c2c..46b9c0341a7 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 @@ public ReturnTypeInGetAttributeAccessorTest() {
@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 @@ protected void setup() {
@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 3ba05534e9d..6ab5372bc1e 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 @@ public TableNotSpecifiedTest() {
@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 @@ protected void setup() {
@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 19f5b26aac5..4cb8a8a6760 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 @@ public void reset() {
@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 34d6a2200df..5e6c4cfa92a 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 @@ public void test() {
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 @@ public RelationalDescriptor descriptor() {
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 @@ public RelationalDescriptor descriptor() {
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 d1430dfcfc0..526fbf2e81b 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 @@ public void reset() {
@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 c0c6984f7d8..672815401c1 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 @@ public ValueNotFoundInClassIndicatorMappingTest() {
@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 @@ protected void setup() {
@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 5024fbce074..123a5dddbcb 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 @@ public VariableOneToOneMappingIsNotDefinedProperlyTest(String testMode) {
@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 @@ public void test() {
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 e90e426a049..6b7a7481bb1 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 @@ protected void setup() {
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 53a8a37fef4..9f417d1d648 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 @@ public void test() {
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 @@ protected void verify() {
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 7950eaf9e14..ff81c5e603e 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 @@ protected void setup() {
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 0abe75214b5..ce653358526 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 @@ protected void setup() {
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 41f28d09e70..e2c84d7c10e 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 @@ public void compareToForNulls() {
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 b73e763d876..900ba2d1cfc 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 @@ public RMIConnectionExceptionsTest(int mode) {
super(mode, RMIConnection.class);
}
+@Override
protected void setKnownBugs() {
super.setKnownBugs();
if(generator.getMode() == TransporterGenerator.SET_EXCEPTION_INTO_TRANSPORTER) {
@@ -43,6 +44,7 @@ protected void setKnownBugs() {
}
}
+@Override
public void setup() throws Exception {
Session session = new DatabaseSessionImpl();
session.setProperty("TransporterGenerator", generator);
@@ -53,6 +55,7 @@ public void setup() throws Exception {
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 d77adb65037..8e1d0ac82d8 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 @@ public RMIConnection createConnection() {
return rmiConnection;
}
+ @Override
public void setup() {
RemoteModel.originalSession = getSession();
RMIServerManagerController.start(buildServerSession());
@@ -74,6 +75,7 @@ public void setup() {
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 1b70f36bba5..15292e68f45 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 @@ protected Transporter handleByMode() {
*
* @param remoteCommand RemoteCommand The command to be executed on the remote session
*/
+ @Override
public Transporter processCommand(Transporter remoteTransporter) {
return handleByMode();
}
@@ -58,6 +59,7 @@ public Transporter processCommand(Transporter remoteTransporter) {
* Begin a transaction on the database.
*/
+ @Override
public Transporter beginTransaction() {
return handleByMode();
}
@@ -66,6 +68,7 @@ public Transporter beginTransaction() {
* Begin a transaction on the database.
*/
+ @Override
public Transporter beginEarlyTransaction() {
return handleByMode();
}
@@ -74,6 +77,7 @@ public Transporter beginEarlyTransaction() {
* Remote unit of work after serialization is commited locally.
*/
+ @Override
public Transporter commitRootUnitOfWork(Transporter remoteUnitOfWork) {
return handleByMode();
}
@@ -82,6 +86,7 @@ public Transporter commitRootUnitOfWork(Transporter remoteUnitOfWork) {
* Commit a transaction on the database.
*/
+ @Override
public Transporter commitTransaction() {
return handleByMode();
}
@@ -122,6 +127,7 @@ public Transporter containsObjectInIdentityMap(Transporter primaryKey, Transport
* Used for closing cursored streams across RMI.
*/
+ @Override
public Transporter cursoredStreamClose(Transporter remoteCursoredStreamID) {
return handleByMode();
}
@@ -130,6 +136,7 @@ public Transporter cursoredStreamClose(Transporter remoteCursoredStreamID) {
* 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 @@ public Transporter cursoredStreamNextPage(Transporter remoteCursoredStream, int
* Return the cursored stream size
*/
+ @Override
public Transporter cursoredStreamSize(Transporter remoteCursoredStreamOid) {
return handleByMode();
}
@@ -146,6 +154,7 @@ public Transporter cursoredStreamSize(Transporter remoteCursoredStreamOid) {
* Returns a remote cursor stub in a transporter
*/
+ @Override
public Transporter cursorSelectObjects(Transporter remoteTransporter) {
return handleByMode();
}
@@ -154,6 +163,7 @@ public Transporter cursorSelectObjects(Transporter remoteTransporter) {
* A remote query after serialization is executed locally.
*/
+ @Override
public Transporter executeNamedQuery(Transporter nameTransporter, Transporter classTransporter, Transporter argumentsTransporter) {
return handleByMode();
}
@@ -162,6 +172,7 @@ public Transporter executeNamedQuery(Transporter nameTransporter, Transporter cl
* A remote query after serialization is executed locally.
*/
+ @Override
public Transporter executeQuery(Transporter query) {
return handleByMode();
}
@@ -170,6 +181,7 @@ public Transporter executeQuery(Transporter query) {
* Extract descriptor from the session
*/
+ @Override
public Transporter getDescriptor(Transporter theClass) {
return handleByMode();
}
@@ -178,6 +190,7 @@ public Transporter getDescriptor(Transporter theClass) {
* Extract descriptor from the session
*/
+ @Override
public Transporter getDescriptorForAlias(Transporter theClass) {
return handleByMode();
}
@@ -187,6 +200,7 @@ public Transporter getDescriptorForAlias(Transporter theClass) {
*
*/
+ @Override
public Transporter getDefaultReadOnlyClasses() {
return handleByMode();
}
@@ -220,6 +234,7 @@ public Transporter getFromIdentityMap(Transporter primaryKey, Transporter theCla
* Get the associated session login.
*/
+ @Override
public Transporter getLogin() {
return handleByMode();
}
@@ -248,6 +263,7 @@ public Transporter getRemoteLog() {
* INTERNAL: Get the value returned by remote function call
*/
+ @Override
public Transporter getSequenceNumberNamed(Transporter remoteFunctionCall) {
return handleByMode();
}
@@ -273,6 +289,7 @@ public Transporter initializeIdentityMap(Transporter theClass) {
return handleByMode();
}
+ @Override
public Transporter initializeIdentityMapsOnServerSession() {
return handleByMode();
}
@@ -281,6 +298,7 @@ public Transporter initializeIdentityMapsOnServerSession() {
* The corresponding original value holder is instantiated.
*/
+ @Override
public Transporter instantiateRemoteValueHolderOnServer(Transporter remoteValueHolder) {
return handleByMode();
}
@@ -341,6 +359,7 @@ public Transporter removeFromIdentityMap(Transporter key, Transporter theClass)
* Rollback a transaction on the database.
*/
+ @Override
public Transporter rollbackTransaction() {
return handleByMode();
}
@@ -349,6 +368,7 @@ public Transporter rollbackTransaction() {
* 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 @@ public Transporter scrollableCursorAbsolute(Transporter remoteScrollableCursorOi
* 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 @@ public Transporter scrollableCursorAfterLast(Transporter remoteScrollableCursorO
* 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 @@ public Transporter scrollableCursorBeforeFirst(Transporter remoteScrollableCurso
* Used for closing scrollable cursor across RMI.
*/
+ @Override
public Transporter scrollableCursorClose(Transporter remoteScrollableCursorOid) {
return handleByMode();
}
@@ -381,6 +404,7 @@ public Transporter scrollableCursorClose(Transporter remoteScrollableCursorOid)
* Retrieves the current row index number
*/
+ @Override
public Transporter scrollableCursorCurrentIndex(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -389,6 +413,7 @@ public Transporter scrollableCursorCurrentIndex(Transporter remoteScrollableCurs
* Moves the cursor to the first row in the result set
*/
+ @Override
public Transporter scrollableCursorFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -397,6 +422,7 @@ public Transporter scrollableCursorFirst(Transporter remoteScrollableCursor) {
* 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 @@ public Transporter scrollableCursorIsAfterLast(Transporter remoteScrollableCurso
* 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 @@ public Transporter scrollableCursorIsBeforeFirst(Transporter remoteScrollableCur
* 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 @@ public Transporter scrollableCursorIsFirst(Transporter remoteScrollableCursor) {
* 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 @@ public Transporter scrollableCursorIsLast(Transporter remoteScrollableCursor) {
* Moves the cursor to the last row in the result set
*/
+ @Override
public Transporter scrollableCursorLast(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -437,6 +467,7 @@ public Transporter scrollableCursorLast(Transporter remoteScrollableCursor) {
* Retrieve next object from the scrollable cursor
*/
+ @Override
public Transporter scrollableCursorNextObject(Transporter scrollableCursorOid) {
return handleByMode();
}
@@ -445,6 +476,7 @@ public Transporter scrollableCursorNextObject(Transporter scrollableCursorOid) {
* Retrieve previous object from the scrollable cursor
*/
+ @Override
public Transporter scrollableCursorPreviousObject(Transporter scrollableCursorOid) {
return handleByMode();
}
@@ -453,6 +485,7 @@ public Transporter scrollableCursorPreviousObject(Transporter scrollableCursorOi
* 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 @@ public Transporter scrollableCursorRelative(Transporter remoteScrollableCursor,
* 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 86587390439..e87b5b523d9 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 @@ public class _RMIServerManagerController_Tie extends ObjectImpl implements Tie {
"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 @@ public OutputStream _invoke(String method, InputStream _in, ResponseHandler rep
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 d4c18e24007..23e919a87b0 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 @@ public class _RMIServerManager_Stub extends Stub implements RMIServerManager {
"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 fd85d45effd..67e0d88bbf4 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 @@ protected Transporter handleByMode() {
* @param remoteCommand RemoteCommand The command to be executed on the remote session
*/
+@Override
public Transporter processCommand(Transporter remoteTransporter)
{
return handleByMode();
@@ -61,6 +62,7 @@ public Transporter processCommand(Transporter remoteTransporter)
* Begin a transaction on the database.
*/
+@Override
public Transporter beginTransaction()
{
return handleByMode();
@@ -70,6 +72,7 @@ public Transporter beginTransaction()
* Begin a transaction on the database.
*/
+@Override
public Transporter beginEarlyTransaction()
{
return handleByMode();
@@ -78,6 +81,7 @@ public Transporter beginEarlyTransaction()
* Remote unit of work after serialization is commited locally.
*/
+@Override
public Transporter commitRootUnitOfWork(Transporter remoteUnitOfWork)
{
return handleByMode();
@@ -86,6 +90,7 @@ public Transporter commitRootUnitOfWork(Transporter remoteUnitOfWork)
* Commit a transaction on the database.
*/
+@Override
public Transporter commitTransaction()
{
return handleByMode();
@@ -132,6 +137,7 @@ public Transporter containsObjectInIdentityMap__oracle_toplink_internal_remote_T
* Used for closing cursored streams across RMI.
*/
+@Override
public Transporter cursoredStreamClose(Transporter remoteCursoredStreamID) {
return handleByMode();
}
@@ -139,6 +145,7 @@ public Transporter cursoredStreamClose(Transporter remoteCursoredStreamID) {
* 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 @@ public Transporter cursoredStreamNextPage(Transporter remoteCursoredStream, int
* Return the cursored stream size
*/
+@Override
public Transporter cursoredStreamSize(Transporter remoteCursoredStreamOid) {
return handleByMode();
}
@@ -153,6 +161,7 @@ public Transporter cursoredStreamSize(Transporter remoteCursoredStreamOid) {
* Returns a remote cursor stub in a transporter
*/
+@Override
public Transporter cursorSelectObjects(Transporter remoteTransporter)
{
return handleByMode();
@@ -161,6 +170,7 @@ public Transporter cursorSelectObjects(Transporter remoteTransporter)
* A remote query after serialization is executed locally.
*/
+@Override
public Transporter executeNamedQuery(Transporter nameTransporter, Transporter classTransporter, Transporter argumentsTransporter)
{
return handleByMode();
@@ -169,6 +179,7 @@ public Transporter executeNamedQuery(Transporter nameTransporter, Transporter cl
* A remote query after serialization is executed locally.
*/
+@Override
public Transporter executeQuery(Transporter query)
{
return handleByMode();
@@ -177,6 +188,7 @@ public Transporter executeQuery(Transporter query)
* Extract descriptor from the session
*/
+@Override
public Transporter getDescriptor(Transporter theClass)
{
return handleByMode();
@@ -185,6 +197,7 @@ public Transporter getDescriptor(Transporter theClass)
* Extract descriptor from the session
*/
+@Override
public Transporter getDescriptorForAlias(Transporter theClass)
{
return handleByMode();
@@ -194,6 +207,7 @@ public Transporter getDescriptorForAlias(Transporter theClass)
* Get the default read-only classes
**/
+@Override
public Transporter getDefaultReadOnlyClasses()
{
return handleByMode();
@@ -229,6 +243,7 @@ public Transporter getFromIdentityMap__oracle_toplink_internal_remote_Transporte
* Get the associated session login.
*/
+@Override
public Transporter getLogin()
{
return handleByMode();
@@ -262,6 +277,7 @@ public Transporter getRemoteLog()
* Get the value returned by remote function call
*/
+@Override
public Transporter getSequenceNumberNamed(Transporter remoteFunctionCall) {
return handleByMode();
}
@@ -290,6 +306,7 @@ public Transporter initializeIdentityMap(Transporter theClass)
{
return handleByMode();
}
+@Override
public Transporter initializeIdentityMapsOnServerSession()
{
return handleByMode();
@@ -298,6 +315,7 @@ public Transporter initializeIdentityMapsOnServerSession()
* The corresponding original value holder is instantiated.
*/
+@Override
public Transporter instantiateRemoteValueHolderOnServer(Transporter remoteValueHolder)
{
return handleByMode();
@@ -365,6 +383,7 @@ public Transporter removeFromIdentityMap__oracle_toplink_internal_remote_Transpo
* Rollback a transaction on the database.
*/
+@Override
public Transporter rollbackTransaction()
{
return handleByMode();
@@ -373,6 +392,7 @@ public Transporter rollbackTransaction()
* 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 @@ public Transporter scrollableCursorAbsolute(Transporter remoteScrollableCursorOi
* 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 @@ public Transporter scrollableCursorAfterLast(Transporter remoteScrollableCursorO
* 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 @@ public Transporter scrollableCursorBeforeFirst(Transporter remoteScrollableCurso
* Used for closing scrollable cursor across RMI.
*/
+@Override
public Transporter scrollableCursorClose(Transporter remoteScrollableCursorOid) {
return handleByMode();
}
@@ -401,6 +424,7 @@ public Transporter scrollableCursorClose(Transporter remoteScrollableCursorOid)
* Retrieves the current row index number
*/
+@Override
public Transporter scrollableCursorCurrentIndex(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -408,6 +432,7 @@ public Transporter scrollableCursorCurrentIndex(Transporter remoteScrollableCurs
* Moves the cursor to the first row in the result set
*/
+@Override
public Transporter scrollableCursorFirst(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -415,6 +440,7 @@ public Transporter scrollableCursorFirst(Transporter remoteScrollableCursor) {
* 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 @@ public Transporter scrollableCursorIsAfterLast(Transporter remoteScrollableCurso
* 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 @@ public Transporter scrollableCursorIsBeforeFirst(Transporter remoteScrollableCur
* 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 @@ public Transporter scrollableCursorIsFirst(Transporter remoteScrollableCursor) {
* 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 @@ public Transporter scrollableCursorIsLast(Transporter remoteScrollableCursor) {
* Moves the cursor to the last row in the result set
*/
+@Override
public Transporter scrollableCursorLast(Transporter remoteScrollableCursor) {
return handleByMode();
}
@@ -450,6 +480,7 @@ public Transporter scrollableCursorLast(Transporter remoteScrollableCursor) {
* Retrieve next object from the scrollable cursor
*/
+@Override
public Transporter scrollableCursorNextObject(Transporter scrollableCursorOid) {
return handleByMode();
}
@@ -457,6 +488,7 @@ public Transporter scrollableCursorNextObject(Transporter scrollableCursorOid) {
* Retrieve previous object from the scrollable cursor
*/
+@Override
public Transporter scrollableCursorPreviousObject(Transporter scrollableCursorOid) {
return handleByMode();
}
@@ -464,6 +496,7 @@ public Transporter scrollableCursorPreviousObject(Transporter scrollableCursorOi
* 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 @@ public Transporter scrollableCursorRelative(Transporter remoteScrollableCursor,
* 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 74c20bb76cf..a7742f8c4c9 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 @@ public CORBAServerManagerHolder (org.eclipse.persistence.testing.tests.remote.su
{
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 9d5f43380cb..904d07eb17f 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 @@ public CORBAServerRunner(Session session)
{
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 6f52446c475..faae6f3062a 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 abstract class _CORBAServerManagerImplBase extends org.omg.CORBA.portable
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 d27565e4260..3dc75106c49 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 @@ public _CORBAServerManagerStub (org.omg.CORBA.portable.Delegate delegate)
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 76ddf969889..8d019cb8fd3 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 @@ protected static String compareAttributes(Object obj1, Object obj2, DatabaseMapp
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 72898406a03..3d0e07f5852 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 @@ public static void verify(PerformanceRegressionTest test) {
// 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 4655f313ac7..fe3e49cc552 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 @@ protected static String execute(Session mainSession, UpdateAllQuery uq, boolean
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 beacb05a978..7b7a7dae425 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 @@ public String getColumnLabel(int column) throws SQLException {
*/
@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 514c982b0a7..8d3a604581a 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 @@ public String toString() {
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 7addc0ae34e..ca6e89045c4 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 @@ public void scrollToEnd() {
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 48ed7ed695c..81be234403a 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 @@ public static void generateHistoricalTableDefinitions(TableCreator creator, Sess
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 @@ public static void generateHistoricalTableDefinitions(TableCreator creator, Sess
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 ae145971158..2bea4466c7b 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 @@ public void setResultRows(Vector resultRows) {
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 c52d421dc6d..dc27d57659e 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 @@ public class JSONExceptionResource extends ListResourceBundle {
/**
* 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 28d52631e8f..40489983610 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(Object leftValue, Object rightValue) {
}
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 6b31aa5954e..ec3f7c5dde9 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 @@ public boolean conformBetween(Object left, Object right) {
} 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 @@ else if (this.selector == LessThan) {// You have got to love polymorphism in Jav
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 @@ else if (this.selector == LessThan) {// You have got to love polymorphism in Jav
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 @@ public void printCollection(List items, ExpressionSQLPrinter printer) {
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 8ff0ac1293a..3cb18c587e8 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 @@ protected Set cloneDelegate() {
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 @@ protected Set cloneDelegate() {
try {
if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()){
try {
- return (Set)AccessController.doPrivileged(new PrivilegedMethodInvoker(cloneMethod, this.getDelegate(), (Object[])null));
+ return (Set)AccessController.doPrivileged(new PrivilegedMethodInvoker(cloneMethod, this.getDelegate(), null));
} catch (PrivilegedActionException exception) {
Exception throwableException = exception.getException();
if (throwableException instanceof IllegalAccessException) {
@@ -343,7 +343,7 @@ protected Set cloneDelegate() {
}
}
} else {
- return (Set)PrivilegedAccessHelper.invokeMethod(cloneMethod, this.getDelegate(), (Object[])null);
+ return (Set)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 23cb9bf4266..a348908243e 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 @@ protected void setLogin(Login login) {
*/
@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 @@ public void reestablishConnection(AbstractSession session) throws DatabaseExcept
* 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 509bbea8921..ba290a7324c 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 @@ public void printJava(Object object) {
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 ed2e70137d4..2698221e142 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 @@ abstract class AbstractModifyAllQueryBuilder extends AbstractEclipseLinkExpressi
this.queryContext = queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -75,9 +72,6 @@ public void visit(RangeVariableDeclaration expression) {
}
}
- /**
- * {@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 7dfbb3371cb..88afcebccbd 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 @@ abstract class AbstractObjectLevelReadQueryVisitor extends AbstractEclipseLinkEx
this.queryContext = queryContext;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
@@ -118,67 +115,43 @@ public void visit(AsOfClause expression) {
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 @@ public void visit(SelectStatement expression) {
}
}
- /**
- * {@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 @@ else if (expression.isExcept()) {
query.addUnionExpression(union);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
query.setSelectionCriteria(queryContext.buildExpression(expression));
@@ -381,33 +339,21 @@ private static class CountFunctionVisitor extends EclipseLinkAnonymousExpression
*/
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 @@ private Expression addNonFetchJoinedAttribute(org.eclipse.persistence.jpa.jpql.p
return queryExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
addNonFetchJoinedAttribute(
@@ -464,17 +404,11 @@ public void visit(CollectionMemberDeclaration expression) {
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
expression.getDeclaration().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
@@ -485,9 +419,6 @@ public void visit(IdentificationVariableDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -523,9 +454,6 @@ public void visit(Join expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
baseExpression = addNonFetchJoinedAttribute(
@@ -534,9 +462,6 @@ public void visit(RangeVariableDeclaration expression) {
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
expression.getDeclaration().accept(this);
@@ -551,17 +476,11 @@ private class OneToOneSelectedVisitor extends EclipseLinkAnonymousExpressionVisi
*/
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 @@ public void visit(CollectionExpression expression) {
}
}
- /**
- * {@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 15e95ac5def..d2dd3f91af0 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 @@ void addJoin(Join join) {
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 getJoins() {
if (joins == null) {
@@ -89,9 +80,6 @@ public List getJoins() {
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 1c050ca25d2..1b711104019 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 @@ final class CollectionDeclaration extends Declaration {
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 88234a2ed9a..2f05e10e488 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 @@ private class ConstructorItemVisitor extends AbstractEclipseLinkExpressionVisito
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 @@ private DynamicClassLoader classLoader() {
return (DynamicClassLoader) queryContext.getSession().getProperty(PersistenceUnitProperties.CLASSLOADER);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
@@ -214,25 +202,16 @@ public void visit(ConstructorExpression expression) {
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 626e2fb79fe..c3cf782563b 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 class Declaration implements JPQLQueryDeclaration {
*/
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 @@ final ClassDescriptor getDescriptor() {
return descriptor;
}
- /**
- * {@inheritDoc}
- */
@Override
public List getJoins() {
return Collections.emptyList();
@@ -174,9 +165,6 @@ final org.eclipse.persistence.expressions.Expression getQueryExpression() {
return queryExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public final String getVariableName() {
if (identificationVariable == null) {
@@ -185,9 +173,6 @@ public final String getVariableName() {
return identificationVariable.getVariableName();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasJoins() {
return false;
@@ -211,9 +196,6 @@ public boolean hasJoins() {
*/
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 235568a86c9..b98a16b4e78 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 @@ private static class DeclarationVisitor extends AbstractEclipseLinkExpressionVis
*/
JPQLQueryContext queryContext;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
@@ -484,17 +481,11 @@ public void visit(AbstractSchemaName expression) {
currentDeclaration.rootPath = rootPath;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
expression.acceptChildren(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -517,9 +508,6 @@ public void visit(CollectionMemberDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
@@ -542,9 +530,6 @@ public void visit(CollectionValuedPathExpression expression) {
currentDeclaration.rootPath = rootPath;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
try {
@@ -555,25 +540,16 @@ public void visit(DeleteClause expression) {
}
}
- /**
- * {@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 @@ public void visit(IdentificationVariableDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -608,17 +581,11 @@ public void visit(Join expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
expression.getQueryStatement().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -639,33 +606,21 @@ public void visit(RangeVariableDeclaration expression) {
}
}
- /**
- * {@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 @@ public void visit(SimpleSelectStatement expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
expression.getExpression().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableVariableDeclaration expression) {
@@ -702,9 +651,6 @@ public void visit(TableVariableDeclaration expression) {
declarations.add(declaration);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateClause expression) {
try {
@@ -715,9 +661,6 @@ public void visit(UpdateClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
expression.getUpdateClause().accept(this);
@@ -742,9 +685,6 @@ private static class QualifyRangeDeclarationVisitor extends AbstractEclipseLinkE
*/
JPQLQueryContext queryContext;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
// Create the path because CollectionValuedPathExpression.toParsedText()
@@ -756,18 +696,12 @@ public void visit(CollectionValuedPathExpression expression) {
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 @@ public ResultVariableVisitor() {
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 1c0029dce9a..c2bcc9ee529 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 @@ final class DeleteQueryVisitor extends AbstractModifyAllQueryBuilder {
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 5e374c18a3a..e3a0555530a 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 @@ final class DerivedDeclaration extends AbstractRangeDeclaration {
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
@@ -88,25 +85,16 @@ Expression buildQueryExpression() {
}
}
- /**
- * {@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 ede18b8fc18..eebb6918b96 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 @@ private void addIdentificationVariable(IdentificationVariable identificationVari
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void collectAllDeclarationIdentificationVariables(Map> identificationVariables) {
@@ -108,25 +105,16 @@ private void collectLocalDeclarationIdentificationVariables(JPQLQueryContext que
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void collectLocalDeclarationIdentificationVariables(Map> identificationVariables) {
collectLocalDeclarationIdentificationVariables(queryContext, identificationVariables);
}
- /**
- * {@inheritDoc}
- */
@Override
public void disposeSubqueryContext() {
queryContext.disposeSubqueryContext();
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] entityNames() {
@@ -145,9 +133,6 @@ public String[] entityNames() {
return names.toArray(new String[names.size()]);
}
- /**
- * {@inheritDoc}
- */
@Override
public List getAllDeclarations() {
@@ -162,26 +147,17 @@ public List getAllDeclarations() {
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 @@ public ClassDescriptor getEmbeddable(Object type) {
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 @@ public String[] getEnumConstants(Object type) {
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 @@ public Object getReferenceManagedType(Object mapping) {
return ((DatabaseMapping) mapping).getReferenceDescriptor();
}
- /**
- * {@inheritDoc}
- */
@Override
public Object getMappingNamed(Object entity, String name) {
@@ -264,9 +222,6 @@ public Object getMappingNamed(Object entity, String name) {
return mapping;
}
- /**
- * {@inheritDoc}
- */
@Override
public Class> getMappingType(Object mapping) {
@@ -284,84 +239,54 @@ public Class> getMappingType(Object mapping) {
}
}
- /**
- * {@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 @@ public boolean isEmbeddableMapping(Object mapping) {
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 @@ public boolean isIdentificationVariableValidInComparison(IdentificationVariable
mapping.isAbstractCompositeDirectCollectionMapping();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isManagedTypeResolvable(Object managedType) {
return managedType != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isPropertyMapping(Object mapping) {
@@ -443,9 +356,6 @@ public boolean isPropertyMapping(Object mapping) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isRelationshipMapping(Object mapping) {
@@ -465,58 +375,37 @@ public boolean isRelationshipMapping(Object mapping) {
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 fdd20249ab6..2a83c40e892 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 @@ private Set collectOuterIdentificationVariables() {
return variableNames;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbsExpression expression) {
@@ -413,9 +410,6 @@ public void visit(AbsExpression expression) {
// 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 @@ public void visit(AbstractSchemaName expression) {
queryExpression = new ExpressionBuilder(type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AdditionExpression expression) {
@@ -449,9 +440,6 @@ public void visit(AdditionExpression expression) {
type[0] = types.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AllOrAnyExpression expression) {
@@ -475,9 +463,6 @@ else if (identifier == AllOrAnyExpression.ANY) {
// Note: The type will be calculated when traversing the ABS's expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
@@ -496,9 +481,6 @@ public void visit(AndExpression expression) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
@@ -515,17 +497,11 @@ public void visit(ArithmeticFactor expression) {
// 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 @@ public void visit(AvgFunction expression) {
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 @@ public void visit(BetweenExpression expression) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
@@ -643,9 +610,6 @@ public void visit(CaseExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
@@ -660,9 +624,6 @@ public void visit(CastExpression expression) {
type[0] = Object.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
@@ -701,25 +662,16 @@ public void visit(CoalesceExpression expression) {
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 @@ public void visit(CollectionMemberExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
visitPathExpression(expression, nullAllowed, expression.pathSize());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
@@ -823,9 +769,6 @@ else if (comparaison == ComparisonExpression.GREATER_THAN_OR_EQUAL) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
@@ -848,25 +791,16 @@ public void visit(ConcatExpression expression) {
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 @@ public void visit(CountFunction expression) {
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 @@ else if (expression.isCurrentTimestamp()) {
}
}
- /**
- * {@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 @@ public void visit(DivisionExpression expression) {
type[0] = types.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
@@ -1005,9 +921,6 @@ public void visit(EmptyCollectionComparisonExpression expression) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
ClassDescriptor descriptor = queryContext.getDescriptor(expression.getEntityTypeName());
@@ -1015,9 +928,6 @@ public void visit(EntityTypeLiteral expression) {
queryExpression = new ConstantExpression(type[0], queryContext.getBaseExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
@@ -1033,9 +943,6 @@ public void visit(EntryExpression expression) {
type[0] = Map.Entry.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExistsExpression expression) {
@@ -1073,9 +980,6 @@ public void visit(ExistsExpression expression) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ExtractExpression expression) {
@@ -1089,17 +993,11 @@ public void visit(ExtractExpression expression) {
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 @@ else if (identifier == org.eclipse.persistence.jpa.jpql.parser.Expression.OPERAT
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 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
@@ -1258,9 +1138,6 @@ public void visit(IndexExpression expression) {
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -1279,9 +1156,6 @@ public void visit(InExpression expression) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
@@ -1298,9 +1172,6 @@ public void visit(InputParameter expression) {
queryContext.addInputParameter(expression, queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
try {
@@ -1312,17 +1183,11 @@ public void visit(Join expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
// Nothing to do
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
@@ -1333,9 +1198,6 @@ public void visit(KeyExpression expression) {
queryExpression = new MapEntryExpression(queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
@@ -1359,9 +1221,6 @@ else if (keyword == KeywordExpression.TRUE) {
queryExpression = new ConstantExpression(value, queryExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
@@ -1375,9 +1234,6 @@ public void visit(LengthExpression expression) {
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
@@ -1408,9 +1264,6 @@ public void visit(LikeExpression expression) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
@@ -1438,9 +1291,6 @@ public void visit(LocateExpression expression) {
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LowerExpression expression) {
@@ -1454,9 +1304,6 @@ public void visit(LowerExpression expression) {
type[0] = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MaxFunction expression) {
@@ -1474,9 +1321,6 @@ public void visit(MaxFunction expression) {
// Note: The type will be calculated when traversing the sub-expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
@@ -1494,9 +1338,6 @@ public void visit(MinFunction expression) {
// Note: The type will be calculated when traversing the sub-expression
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ModExpression expression) {
@@ -1515,9 +1356,6 @@ public void visit(ModExpression expression) {
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MultiplicationExpression expression) {
@@ -1541,9 +1379,6 @@ public void visit(MultiplicationExpression expression) {
type[0] = types.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
@@ -1557,9 +1392,6 @@ public void visit(NotExpression expression) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -1579,18 +1411,12 @@ public void visit(NullComparisonExpression expression) {
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 @@ public void visit(NullIfExpression expression) {
type[0] = actualType;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
@@ -1633,34 +1456,22 @@ public void visit(NumericLiteral expression) {
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 @@ public void visit(OrderByItem expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderSiblingsByClause expression) {
expression.getOrderByItems().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
@@ -1709,9 +1514,6 @@ public void visit(OrExpression expression) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -1747,9 +1549,6 @@ public void visit(RangeVariableDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RegexpExpression expression) {
@@ -1768,9 +1567,6 @@ public void visit(RegexpExpression expression) {
type[0] = Boolean.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -1782,41 +1578,26 @@ public void visit(ResultVariable expression) {
// 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 @@ public void visit(SimpleSelectStatement expression) {
queryExpression = queryExpression.subQuery(subquery);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SizeExpression expression) {
@@ -1848,9 +1626,6 @@ public void visit(SizeExpression expression) {
type[0] = Integer.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SqrtExpression expression) {
@@ -1864,25 +1639,16 @@ public void visit(SqrtExpression expression) {
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 @@ public void visit(StringLiteral expression) {
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 @@ public void visit(SubstringExpression expression) {
type[0] = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubtractionExpression expression) {
@@ -1958,9 +1715,6 @@ public void visit(SubtractionExpression expression) {
type[0] = types.get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SumFunction expression) {
@@ -1979,9 +1733,6 @@ public void visit(SumFunction expression) {
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 @@ public void visit(TableExpression expression) {
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 @@ public void visit(TreatExpression expression) {
queryExpression = queryExpression.treat(entityType.getJavaClass());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
@@ -2060,9 +1802,6 @@ public void visit(TrimExpression expression) {
type[0] = String.class;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
@@ -2075,49 +1814,31 @@ public void visit(TypeExpression expression) {
// 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 @@ public void visit(UpperExpression expression) {
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 @@ private static class ChildrenExpressionVisitor extends AnonymousExpressionVisito
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 @@ public void visit(CollectionExpression expression) {
}
}
- /**
- * {@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 @@ protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expressi
*/
private class ComparisonExpressionVisitor extends EclipseLinkAnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -2259,9 +1959,6 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
expression.accept(ExpressionBuilderVisitor.this);
@@ -2274,9 +1971,6 @@ protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expressi
*/
private class InExpressionExpressionBuilder extends EclipseLinkAnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -2291,17 +1985,11 @@ public void visit(CollectionExpression expression) {
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 @@ private class InExpressionBuilder extends EclipseLinkAnonymousExpressionVisitor
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -2346,9 +2031,6 @@ public void visit(CollectionExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -2371,9 +2053,6 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
@@ -2399,9 +2078,6 @@ public void visit(InputParameter expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expression) {
@@ -2419,9 +2095,6 @@ protected void visit(org.eclipse.persistence.jpa.jpql.parser.Expression expressi
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -2439,9 +2112,7 @@ public void visit(SimpleSelectStatement expression) {
private class InItemExpressionVisitor extends AnonymousExpressionVisitor {
- /**
- * {@inheritDoc}
- */
+
@Override
public void visit(IdentificationVariable expression) {
ClassDescriptor descriptor = queryContext.getDescriptor(expression.getVariableName());
@@ -2449,9 +2120,7 @@ public void visit(IdentificationVariable expression) {
queryExpression = new ConstantExpression(descriptor.getJavaClass(), queryExpression);
}
- /**
- * {@inheritDoc}
- */
+
@Override
public void visit(CollectionExpression expression) {
@@ -2466,17 +2135,13 @@ public void visit(CollectionExpression expression) {
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 @@ private Enum> retrieveEnumConstant(Class> type, String name) {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
visitPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
@@ -2685,9 +2344,6 @@ public void visit(EntryExpression expression) {
localExpression = entryExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -2702,9 +2358,6 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
@@ -2718,17 +2371,11 @@ public void visit(KeyExpression expression) {
descriptor = queryContext.resolveDescriptor(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
visitPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TreatExpression expression) {
@@ -2739,9 +2386,6 @@ public void visit(TreatExpression expression) {
descriptor = queryContext.resolveDescriptor(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ValueExpression expression) {
@@ -2821,17 +2465,11 @@ void dispose() {
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 421469f4827..b3e7440e419 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 @@ private JPQLException buildException(JPQLQueryContext queryContext,
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 @@ private JPQLGrammar jpqlGrammar() {
return DefaultEclipseLinkJPQLGrammar.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public void populateQuery(CharSequence jpqlQuery, DatabaseQuery query, AbstractSession session) {
populateQueryImp(jpqlQuery, query, session);
@@ -303,9 +294,6 @@ private ResourceBundle resourceBundle() {
return ResourceBundle.getBundle(JPQLQueryProblemResourceBundle.class.getName());
}
- /**
- * {@inheritDoc}
- */
@Override
public void setValidationLevel(String validationLevel) {
this.validationLevel = validationLevel;
@@ -388,9 +376,6 @@ private AbstractObjectLevelReadQueryVisitor buildVisitor(ObjectLevelReadQuery qu
return new ObjectLevelReadQueryVisitor(queryContext, query);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
@@ -412,17 +397,11 @@ public void visit(DeleteStatement expression) {
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 @@ public void visit(SelectStatement expression) {
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 5683dadaf19..2ad43fac9b2 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 @@ private Class> loadTypeImp(String typeName) {
*/
@SuppressWarnings("unchecked")
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 9fdfb963751..9bac2c45e24 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 @@ private void collectDescriptors(Expression expression, DeclarationResolver resol
}
}
- /**
- * {@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 @@ public void visit(SimpleSelectStatement expression) {
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 b5d77c53538..c1bfe014843 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 @@ final class JoinDeclaration extends Declaration {
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 c4f872e2b68..77953a5ec0d 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 @@ public static Comparator> instance() {
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 e9c3aa4cd2a..d3f61d57ede 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 @@ final class ParameterTypeVisitor extends AbstractEclipseLinkParameterTypeVisitor
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 4ab85745d46..e1807fac3b2 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 @@ final class RangeDeclaration extends AbstractRangeDeclaration {
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
void addJoin(Join join) {
super.addJoin(join);
@@ -77,9 +74,6 @@ private void addJoinFetch(Join join) {
joinFetches.add(join);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
@@ -131,9 +125,6 @@ List getJoinFetches() {
return (joinFetches == null) ? Collections.emptyList() : joinFetches;
}
- /**
- * {@inheritDoc}
- */
@Override
public Type getType() {
return (type != null) ? Type.CLASS_NAME : Type.RANGE;
@@ -150,9 +141,6 @@ public boolean isFullyQualifiedClassName() {
return type != null;
}
- /**
- * {@inheritDoc}
- */
@Override
ClassDescriptor resolveDescriptor() {
@@ -163,9 +151,6 @@ ClassDescriptor resolveDescriptor() {
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 57aff21e1c6..bf9b074be37 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 @@ private void initializeReportQuery() {
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 @@ protected void visit(Expression expression) {
initializeReportQuery();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -125,27 +116,18 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@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 @@ 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(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 6a6e4ba73b1..080ba685056 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 @@ class ReadAllQueryVisitor extends AbstractObjectLevelReadQueryVisitor {
super(queryContext, query);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HierarchicalQueryClause expression) {
@@ -91,25 +88,16 @@ private class OrderSiblingsByClauseVisitor extends EclipseLinkAnonymousExpressio
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 e95d9b05390..5ff285410f7 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 @@ private ConstructorExpressionVisitor constructorExpressionVisitor() {
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 @@ public void visit(AdditionExpression expression) {
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 @@ public void visit(AvgFunction expression) {
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 @@ public void visit(CollectionExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(ConstructorExpression expression) {
query.endAddingToConstructorItem();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
@@ -286,9 +253,6 @@ public void visit(CountFunction expression) {
addAttribute(name, queryExpression, type[0]);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -302,9 +266,6 @@ public void visit(DateTime expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
@@ -317,36 +278,24 @@ public void visit(DivisionExpression expression) {
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 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@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 @@ public void visit(MaxFunction expression) {
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 @@ public void visit(MinFunction expression) {
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 @@ public void visit(MultiplicationExpression expression) {
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 @@ public void visit(ResultVariable expression) {
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 @@ public void visit(SizeExpression expression) {
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 @@ public void visit(StateFieldPathExpression expression) {
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 @@ public void visit(SubtractionExpression expression) {
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 @@ public void visit(SumFunction expression) {
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 void visitAbstractSelectClause(AbstractSelectClause expression) {
*/
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 be1636dd864..1f00b9625c3 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 @@ final class ReportQueryVisitor extends ReadAllQueryVisitor {
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 @@ void visitAbstractSelectClause(AbstractSelectClause expression) {
type = builder.type[0];
}
- /**
- * {@inheritDoc}
- */
@Override
void visitAbstractSelectStatement(AbstractSelectStatement expression) {
@@ -102,9 +90,6 @@ void visitAbstractSelectStatement(AbstractSelectStatement expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
void visitIdentificationVariable(IdentificationVariable expression) {
// ReportQuery does not require it
@@ -116,25 +101,16 @@ void visitIdentificationVariable(IdentificationVariable expression) {
*/
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 95e2da7b0ec..acbeb4cfc7e 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 @@ public SubqueryDeclaration(JPQLQueryContext queryContext) {
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
RangeVariableDeclaration declaration = (RangeVariableDeclaration) getBaseExpression();
@@ -49,26 +46,17 @@ Expression buildQueryExpression() {
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 40d871416a1..a8e5dfe7817 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 @@ final class TableDeclaration extends Declaration {
super(queryContext);
}
- /**
- * {@inheritDoc}
- */
@Override
Expression buildQueryExpression() {
TableVariableDeclaration declaration = (TableVariableDeclaration) getBaseExpression();
@@ -52,17 +49,11 @@ Expression buildQueryExpression() {
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 @@ ClassDescriptor resolveDescriptor() {
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 0d610e7f46d..9c431df9a4d 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 @@ QueryKey resolveQueryKey(org.eclipse.persistence.jpa.jpql.parser.Expression expr
}
}
- /**
- * {@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 @@ public void visit(ArithmeticFactor expression) {
}
}
- /**
- * {@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 @@ public void visit(CaseExpression expression) {
);
}
- /**
- * {@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 @@ else if (text.startsWith("{t")) {
}
}
- /**
- * {@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 @@ public void visit(EntityTypeLiteral expression) {
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 @@ else if (resolver.descriptor != null) {
}
}
- /**
- * {@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 @@ public void visit(KeyExpression expression) {
type = (Class>) mapContainerPolicy.getKeyType();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
@@ -884,41 +746,26 @@ public void visit(KeywordExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(MaxFunction expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(MinFunction expression) {
@@ -948,57 +792,36 @@ public void visit(MinFunction expression) {
}
}
- /**
- * {@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 @@ else if (ExpressionTools.DOUBLE_REGEXP.matcher(text).matches()) {
}
}
- /**
- * {@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 @@ public void visit(SelectClause expression) {
}
}
- /**
- * {@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 @@ public void visit(SimpleSelectStatement expression) {
}
}
- /**
- * {@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 @@ public void visit(SumFunction expression) {
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 @@ public void visit(ValueExpression expression) {
}
}
- /**
- * {@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 @@ public CollectionExpressionVisitor() {
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
this.expression = expression;
@@ -1476,9 +1185,6 @@ private class PathResolver extends AbstractEclipseLinkExpressionVisitor {
DatabaseMapping mapping;
QueryKey queryKey;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
descriptor = queryContext.getDescriptor(expression.getText());
@@ -1492,9 +1198,6 @@ public void visit(CollectionValuedPathExpression expression) {
visitPathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
descriptor = queryContext.getDescriptor(expression.getEntityTypeName());
@@ -1547,9 +1250,6 @@ public void visit(KeyExpression expression) {
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 031d16aec03..9b730e4084f 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 @@ final class UpdateQueryVisitor extends AbstractModifyAllQueryBuilder {
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 @@ public void visit(UpdateItem expression) {
((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 d3138fd7bd6..1129ccc6fc1 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 @@ public abstract class AggregateNode extends Node implements AliasableNode {
@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 86ea20d593b..d31856844b9 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 boolean endsWithDirectToField(GenerationContext context) {
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 32823f493fd..7508a5f24dc 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 @@ public void addOrderingToQuery(ObjectLevelReadQuery theQuery, GenerationContext
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 ec5df28a942..ea6058b92b8 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 void setDistinctState(short newDistinctState) {
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 89b02387784..357419ed7d3 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 @@ public Object resolveMapKey(Object ownerClass, String attribute) {
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 @@ private Object getType(DatabaseMapping mapping) {
// 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 @@ private Object getType(DatabaseMapping mapping) {
// 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 f28234a3658..36bdf563500 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 @@ static class UnmodifiableVector extends Vector {
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 @@ public List subList(int fromIndex, int toIndex) {
return Collections.unmodifiableList(super.subList(fromIndex, toIndex));
}
+ @Override
public ListIterator listIterator(final int index) {
return new ListIterator() {
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 @@ public void forEachRemaining(Consumer super E> action) {
};
}
+ @Override
public ListIterator 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 09138dd3956..d38565340f8 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 @@ public boolean marshalSingleValue(XPathFragment xPathFragment, MarshalRecord mar
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 44ef2fe8065..ac0ff575bcc 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 @@ protected String convertObjectToString(Object sourceObject) throws ConversionExc
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 @@ protected String convertObjectToString(Object sourceObject) throws ConversionExc
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 @@ protected String convertObjectToString(Object sourceObject, QName schemaTypeQNam
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 @@ protected String convertObjectToString(Object sourceObject, QName schemaTypeQNam
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 c0b9046527d..147d0bef794 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 @@ protected void handleChildNodes(NodeList children) throws SAXException {
}
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 8a07d73a3b3..1c0fefd98c9 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 @@ public void writeToEventWriter(Node dom, String uri, String name, XMLEventWriter
}
}
} 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 @@ private void writeElement(Element elem, String newNamespace, String newName, XML
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 409e7ca279d..47d131b4ae2 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 @@ public void writeToStream(Node dom, String newUri, String newName, XMLStreamWrit
}
}
} 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 @@ private void writeElement(Element elem, String newNamespace, String newName, XML
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 2ba8167ebe7..231c3c43667 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 @@ private boolean isUnmarshalRecordWithinAdapter() {
.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 776b6a263e8..d4489544e43 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 @@ protected void collectObjectForNewCollection(Map originalKeyValues, Map cloneKey
// 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 16675add92a..520e4d0b84a 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 @@ public Object cloneFor(Object container) {
*/
@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 5a0ec050c44..b5fb3f1bfa5 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 @@ public void log(int level, String category, String message) {
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 eb36815238e..a9c98b845cb 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 @@ public void throwing(Throwable throwable) {
*/
@Override
public void severe(String message) {
- log(SEVERE, message, (Object[])null);
+ log(SEVERE, message, null);
}
/**
@@ -994,7 +994,7 @@ public void severe(String message) {
*/
@Override
public void warning(String message) {
- log(WARNING, message, (Object[])null);
+ log(WARNING, message, null);
}
/**
@@ -1007,7 +1007,7 @@ public void warning(String message) {
*/
@Override
public void info(String message) {
- log(INFO, message, (Object[])null);
+ log(INFO, message, null);
}
/**
@@ -1020,7 +1020,7 @@ public void info(String message) {
*/
@Override
public void config(String message) {
- log(CONFIG, message, (Object[])null);
+ log(CONFIG, message, null);
}
/**
@@ -1033,7 +1033,7 @@ public void config(String message) {
*/
@Override
public void fine(String message) {
- log(FINE, message, (Object[])null);
+ log(FINE, message, null);
}
/**
@@ -1046,7 +1046,7 @@ public void fine(String message) {
*/
@Override
public void finer(String message) {
- log(FINER, message, (Object[])null);
+ log(FINER, message, null);
}
/**
@@ -1059,7 +1059,7 @@ public void finer(String message) {
*/
@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 efcf3ad78ed..75637db68f8 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 @@ protected void postUpdateWithChangeSetListOrder(WriteObjectQuery writeQuery) thr
}
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 ffa427ef059..8fad0ff206b 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 @@ public void mergeChangesIntoObject(Object target, ChangeRecord changeRecord, Obj
// 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 8fd96111fba..4dac300d715 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 @@ public boolean equals(Object object) {
*
* @param nestedArray flag.
*/
+ @Override
public void setNestedArray(boolean nestedArray) {
this.nestedArray = nestedArray;
}
@@ -969,6 +970,7 @@ public void setNestedArray(boolean nestedArray) {
*
* @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 2d5670d4965..1f41c52d27b 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 Object buildObjectNoReferenceDescriptor(DOMRecord record, XMLConverter
*/
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 7192c675f27..f1800555708 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 @@ public void writeFromObjectIntoRow(Object object, AbstractRecord row, AbstractSe
}
}
}
- ((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 06b04310a2c..54b4b33e609 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 @@ public Object buildObjectFromNestedRow(AbstractRecord nestedRow, JoinedAttribute
//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 @@ private Object convertToSimpleTypeIfPresent(Object objectToAdd, AbstractRecord n
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 22ee6b4ff04..26ce16a8ebf 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 @@ public Object valueFromRow(Object fieldValue, XMLRecord nestedRow, JoinedAttribu
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= 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 b4caa4d3046..60b81b3761d 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 @@ public class ProxyAuthenticationTestSuite extends JUnitTestCase {
// 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 @@ public ProxyAuthenticationTestSuite(String name) {
super(name);
}
+ @Override
public String getPersistenceUnitName() {
return PU_NAME;
}
@@ -127,6 +129,7 @@ public static Test suite() {
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 @@ public void setUp() {
}
}
+ @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 30d60a59acc..7226bb81d22 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 @@ public class Image implements Cloneable {
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 86ad3b80645..5a58b3cdf52 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 @@ public LOBDeleteTest(Object originalObject) {
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 c52f1582bf3..dc6ba1d38b4 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 @@ public LOBImageModelProject() {
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 169715ed7f8..93a7a110906 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 @@ public LOBImageModelSystem() {
project = new LOBImageModelProject();
}
+ @Override
public void addDescriptors(DatabaseSession session) {
if (project == null) {
project = new LOBImageModelProject();
@@ -37,6 +38,7 @@ public void addDescriptors(DatabaseSession session) {
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 9b3109a0c18..13bd510b80b 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 @@ public LOBInsertTest(Object originalObject, boolean usesUnitOfWork) {
}
}
+ @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 cefb0fef63b..eb741a66d7d 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 @@ public LOBSessionBrokerTestModel() {
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 @@ public void addRequiredSystems() {
addRequiredSystem(new LOBImageModelSystem());
}
+ @Override
public void addTests() {
addTest(getLOBInsertTestSuite());
addTest(getLOBUpdateTestSuite());
@@ -56,6 +58,7 @@ protected TestSuite getLOBUpdateTestSuite() {
return suite;
}
+ @Override
public void setup() {
if (!((AbstractSession)getSession()).isBroker()) {
SessionBroker broker = new SessionBroker();
@@ -67,6 +70,7 @@ public void setup() {
}
}
+ @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 63bd067b78f..2ad412f1bb9 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 @@ public LOBTestModel() {
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 @@ public void addRequiredSystems() {
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 59fc3f3e324..47aee9395c0 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 @@ public LOBTestWrapper(AutoVerifyTestCase test, boolean shouldUseLocatorForLOBWri
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 @@ protected void setup() throws Throwable {
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 b3bfd23047e..4191d3cbd41 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 @@ public LOBUpdateTest(Object originalObjectNotInDB, int size, boolean usesUnitOfW
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 @@ protected void changeObject() {
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 @@ public String getName() {
return str;
}
+ @Override
protected void setup() {
// Create originalObject and insert it into db - it will be deleted in reset()
try {
@@ -82,6 +85,7 @@ protected void setup() {
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 92c5aa39d8a..ddc252319f6 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 @@ protected Oracle9Platform getOracle9Platform() throws ClassCastException {
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 @@ protected void setup() {
}
}
+ @Override
protected void verify() {
if (object == null) {
throw new TestException("object is missing");
@@ -166,6 +168,7 @@ protected void verify() {
}
}
+ @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 872791b5ed2..4e2840c7290 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 @@ public CharNcharProject() {
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 1be07555be9..45368358292 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 @@ public InsertNcharTest() {
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 1e73423a50d..c583ef22ac7 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 @@ public InsertNullNcharTest() {
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 4cfb99992af..0b316a8ea9f 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 @@ public NcharTestModel() {
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 @@ public void addRequiredSystems() {
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 1946f3b82ab..db193453a6b 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 @@ public NcharTestSystem() {
project = new CharNcharProject();
}
+ @Override
public void addDescriptors(DatabaseSession session) {
if (project == null) {
project = new CharNcharProject();
@@ -38,6 +39,7 @@ public void addDescriptors(DatabaseSession session) {
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 06a9085eef8..2f4749a8291 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 @@ public ReadNcharTest() {
setDescription("Tests reading NCHAR, NVARCHAR2, NCLOB from Oracle database.");
}
+ @Override
@SuppressWarnings("deprecation")
protected void setup() {
super.setup();
@@ -155,6 +156,7 @@ protected void setup() {
((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 b1f9c5d3afd..d3c3d8d5148 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 @@ public UpdateNcharTest() {
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 355e2039abc..27c3a8f0b3a 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 @@ public UpdateNullNcharTest() {
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 f282f9185f2..29ed8097417 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 @@ public void writeToXml() {
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 43d3fc3e959..f08d257ee7f 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 @@ public void writeToXml() {
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 d4bbf3a0622..9c29c06ad0b 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 @@ public void writeToXml() {
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 3298928e00a..24ff4e46d79 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 @@ public void writeToXml() {
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 a896e998799..2577acf5926 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 @@ public void writeToXml() {
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 d8efb130b67..247374cb4c0 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 @@ public void writeToXml() {
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 fd65068412d..4d0ccf71c79 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 @@ public void writeToXml() {
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 cb5c7dc9709..1c3fce96947 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 @@ public void writeToXml() {
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 e4710a31139..801fb32b9c4 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 @@ public void writeToXml() {
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 d5e154dff57..b6bede51dd1 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 @@ public void writeToXml() {
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 2f8aad04f6f..03f4196c98f 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 @@ public void writeToXml() {
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 a427ea8ec34..90d11573fe8 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 @@ public void writeToXml() {
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 371fed97dad..c01be4e5604 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 @@ public void writeToXml() {
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 fff114789ff..1b09a5efba8 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 @@ public void writeToXml() {
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 60b32d2830d..35aab06cb4d 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 @@ public void writeToXml() {
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 1555c15760b..05e573f625a 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 @@ public void writeToXml() {
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 e05096fd20b..16cf9421d54 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 @@ public void writeToXml() {
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 06086a36a4b..be27a9d8550 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 @@ public void writeToXml() {
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 4576d1372c0..1efedbcfba4 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 @@ public void writeToXml() {
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 88930803b67..8b81e8af29a 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 @@ public void writeToXml() {
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 106a4c1da4d..4cd7d7584b7 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 @@ public void writeToXml() {
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 36a9b36ac4e..cc7fec0ae09 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 @@ public void writeToXml() {
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 4d816ecaa6c..e417dfdab9e 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 @@ public void writeToXml() {
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 7141b83a1df..85aa4652103 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 @@ public void writeToXml() {
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 dbd752db283..67431413613 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 @@ public void writeToXml() {
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 06bd957f9d6..9f9d4ffb36e 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 @@ public void writeToXml() {
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 39eef8f264e..7cb497d5cba 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 @@ public void writeToXml() {
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 0d54f00fe78..d562bcc8697 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 @@ public void writeToXml() {
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 0db4d09a200..937a763d228 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 @@ public void writeToXml() {
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 89e0a2b075a..b4f74e9c9c0 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 @@ public void writeToXml() {
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 449cae98754..5a5fa6a7002 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 @@ public class OutputRowSessionEventAdapter extends SessionEventAdapter {
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 04d4e75e1ee..8905e6fe227 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 @@ public void writeToXml() {
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 8ae745d0909..a634a5c3b12 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 @@ public void writeToXml() {
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 d9006de32f7..a64375314f1 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 @@ public void writeToXml() {
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 048656dad28..aabe12d1ce9 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 @@ public void writeToXml() {
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 @@ public void runQuery() {
};
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 584863a3e9f..fd94cce3b89 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 @@ public void writeToXml() {
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 @@ public void runQuery() {
};
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 317c21216ea..41d1148ae9c 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 @@ public void writeToXml() {
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 ddcf96f6122..4e3647d310c 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 @@ public ExternalConnectionPoolTestCase(Properties proxyProperties, boolean useEve
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 @@ protected void proxyConnectionPoolSetup(ConnectionPolicy policy, ServerSession s
}
}
+ @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 7b38e4a298d..9337fc2e426 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 @@ public MainLoginTestCase(Properties proxyProperties) {
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 @@ public void preLogin(SessionEvent event) {
getServerSession().getEventManager().getListeners().remove(listener);
}
+ @Override
public void reset() {
super.reset();
// restore the original properties
@@ -66,6 +69,7 @@ public void reset() {
// 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 41df7ea318d..c407e11606a 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 @@ public NonPooledConnectionTestCase(Properties proxyProperties, boolean useEvent)
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 36a24e3ae06..fe5378f2b5c 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 @@ public OCIProxyTestHelper() {
// 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 2b5f6d042ae..eb5f1503ec0 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 @@ public class PooledConnectionTestCase extends ProxyAuthenticationConnectionTestC
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 @@ public void postAcquireConnection(SessionEvent event) {
}
}
+ @Override
public void preReleaseClientSession(SessionEvent event) {
clientSessions.remove(event.getSession());
}
@@ -66,6 +69,7 @@ public PooledConnectionTestCase(Properties proxyProperties) {
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 3b2b085ffdc..e7848497ae4 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 @@ public ProxyAuthenticationConnectionTestCase(Properties proxyProperties) {
protected void proxySetup() {
}
+ @Override
public void setup() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("Supports Oracle platform only");
@@ -60,6 +61,7 @@ public void setup() {
}
}
+ @Override
public void test() {
ClientSession cs;
if (connectionPolicy == null) {
@@ -85,6 +87,7 @@ public void test() {
cs.release();
}
+ @Override
public void verify() {
String readConnectionSchemaExpected = readConnectionSchemaExpected();
if (!readConnectionSchema.equals(readConnectionSchemaExpected)) {
@@ -105,6 +108,7 @@ protected String readConnectionSchemaExpected() {
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 997c1ec60e1..b520826f2ad 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 @@ public ProxyAuthenticationOCITestModel() {
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 @@ public void addTests() {
addTest(new MainLoginTestCase(prop));
}
+ @Override
public void addRequiredSystems() {
setupUser();
@@ -131,6 +133,7 @@ protected void setupUser() {
}
}
+ @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 91d0cca1952..ff2e9f5cd90 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 @@ public class ProxyAuthenticationConnectionCustomizerTestCase extends TestCase {
private String writeUser;
class Listener extends SessionEventAdapter {
+ @Override
public void outputParametersDetected(SessionEvent event) {
writeUser = (String)((Map)event.getResult()).get("OUT");
}
@@ -153,6 +154,7 @@ static String getExpectedUserName(Map proxyProperties) {
}
}
+ @Override
public void setup() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("Supports Oracle platform only");
@@ -180,6 +182,7 @@ String getWriteUser(Session session) {
return user;
}
+ @Override
public void test() {
if(this.shouldUseDatabaseSession) {
testDatabaseSession();
@@ -260,12 +263,14 @@ void verifyUser(String msg, String user, String expectedUser) {
}
}
+ @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 be3517dee73..0d22341691b 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 @@ static String getProperty(String property, String defaultValue) {
}
}
+ @Override
public void setup() {
if (!getSession().getPlatform().isOracle()) {
throw new TestWarningException("Supports Oracle platform only");
@@ -52,6 +53,7 @@ public void setup() {
}
}
+ @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 406e7383e19..65a75731778 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 @@ public static Vector testInstancesWithNoBindingAndNativeSql() {
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 @@ public void setup() {
sqlTracker = new QuerySQLTracker(getSession());
}
+ @Override
public void test() {
// write myself out to the database
UnitOfWork uow = getSession().acquireUnitOfWork();
@@ -203,6 +205,7 @@ public void test() {
result = (CalendarDaylightSavingsTest)getSession().executeQuery(query);
}
+ @Override
public void verify() {
final String TZR = "TZR";
final String TZR_TZD = "TZR TZD";
@@ -232,6 +235,7 @@ public void verify() {
}
}
+ @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 f71c9f8ce72..0b2763f48aa 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 @@ public static Vector testInstancesWithBindingAndNoCalendarPrinting() {
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 @@ public void setup() {
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 @@ public void test() {
}
}
+ @Override
public void verify() throws Exception {
String expectedResult = getOriginalCalendarString();
if (this.result == null) {
@@ -179,6 +182,7 @@ public void verify() throws Exception {
}
}
+ @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 9b91636bbd0..9f33a1d41f5 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 @@ static public Vector testInstances ()
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 982efff75c7..9abb19ac344 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 @@ public OracleTIMESTAMPTypeTestModel(boolean usingAccessors) {
}
}
+ @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 @@ public static TestSuite getCalendarDaylightSavingsTestSuite() {
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 0e416973b1c..fa827ea39f8 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 92632ea0633..ec8f3639a38 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 class SerializationOfValueHolderWithTIMESTAMPTZTest extends TestCase {
public SerializationOfValueHolderWithTIMESTAMPTZTest() {
}
+ @Override
public void setup() {
UnitOfWork uow = getSession().acquireUnitOfWork();
uow.registerObject(TIMESTAMPTZOwner.example1());
@@ -44,6 +45,7 @@ public void setup() {
getAbstractSession().beginTransaction();
}
+ @Override
public void reset() {
if (getAbstractSession().isInTransaction()) {
getAbstractSession().rollbackTransaction();
@@ -51,6 +53,7 @@ public void reset() {
}
}
+ @Override
public void test() {
getSession().getIdentityMapAccessor().initializeIdentityMaps();
try {
@@ -77,6 +80,7 @@ public void test() {
}
}
+ @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 8bbf55cfde6..d45959982fb 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 @@ public void setSessionTimezone(String timeZone) {
this.sessionTimeZone = timeZone;
}
+ @Override
protected void setup(Session session) {
super.setup(session);
}
@@ -363,6 +364,7 @@ boolean doesTimestampLTZWork() {
return TimeZone.getDefault().getID().equals(this.sessionTimeZone) || !isLtzTimestampInGmt;
}
+ @Override
protected void test(WriteTypeObjectTest testCase) {
try {
if(this.sessionTimeZone != null) {
@@ -374,6 +376,7 @@ protected void test(WriteTypeObjectTest testCase) {
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 68d0126578e..7e6c4f572c4 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 @@ static public Vector testInstances2 ()
// 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 cf912350c29..af470a19f04 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 @@ public TestServerPlatform(DatabaseSession newDatabaseSession) {
this.disableJTA();
}
+ @Override
public String getServerNameAndVersion() {
return null;
}
+ @Override
public Class getExternalTransactionControllerClass() {
return null;
}
@@ -42,10 +44,12 @@ public Class getExternalTransactionControllerClass() {
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 4d0d0f607de..4d8d3c4a9da 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 @@ public class UnwrapConnectionBaseTestModel extends TestModel{
protected ServerPlatform originalServerPlatform;
protected boolean originalShouldUseExternalConnectionPooling;
+ @Override
public void reset(){
DatabaseSession session = (DatabaseSession)getSession();
session.logout();
@@ -44,6 +45,7 @@ public void reset(){
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 cb54454f8ed..f23963dc365 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 @@ public UnwrapConnectionCustomSQLTestModel() {
/**
* Revert the descriptors back to their old state.
*/
+ @Override
public void reset() {
DatabaseSession session = (DatabaseSession)getSession();
session.logout();
@@ -52,6 +53,7 @@ public void reset() {
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 a7553adbecd..a311acfe08d 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 @@ public UnwrapConnectionInsuranceObjectRelationalTestModel() {
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 2659ac16bed..a583b7b1a1b 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 @@ public UnwrapConnectionLOBTestModel() {
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 77e645b3b1b..e2ff1d41f53 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 @@ public UnwrapConnectionNativeBatchWritingTestModel() {
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 d042bb390a8..c6c1928b73e 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 @@ public UnwrapConnectionNchartTestModel() {
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 8106fde1263..2c0e9bcd833 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 @@ public UnwrapConnectionTypeTestModel() {
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 13694e2a6d5..8f3b5e769d1 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 @@ public UnwrapConnectionTypeWithoutAccessorsTestModel() {
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 4f5dac82f18..16dbf968173 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 @@ public UnwrapConnectionXDBTestModel() {
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 cbbc1fa0ff9..cb6e2ad8160 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 @@ public ExistsNodeWithJoinTest() {
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 0de50a71d75..26b5f5bd512 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 @@ public ExtractValueTest() {
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 71cabe464ed..8d3a18df641 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 @@ public GetNumberValTest() {
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 d01d8a733c6..ab1d7bed418 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 @@ public InsertWithNullTest() {
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 @@ public void test() {
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 1adc11d46fc..c94585e655d 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 class RemoteSessionTest extends TestCase {
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 @@ public void setup() {
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 1cdde981193..1d43a4ed1dc 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 @@ public ReportQueryTest() {
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 @@ public void test() {
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 0a5e9175e2d..cb0c2c541c3 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 @@ public SessionBrokerTestCase() {
setDescription("Tests reading an writing XML through a SessionBroker");
}
+ @Override
public void setup() {
Session session = getSession();
@@ -33,9 +34,11 @@ public void setup() {
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 298f168da8f..92475145d6f 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 @@ public void test() throws Exception {
// 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 c7efd58a3b7..735f89b6287 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 @@ public UpdateDocumentTest() {
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 @@ public void test() {
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 9535aac7852..32c38739a67 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 @@ public XDBTestModelMWIntegration() {
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 @@ public static TestSuite getXDBTestSuite() {
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 089bd86008c..a1846ad4706 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 @@ public XMLTypeEmployeeSystem() {
project = new Employee_XMLProject();
}
+ @Override
public void addDescriptors(DatabaseSession session) {
if (project == null) {
project = new Employee_XMLProject();
@@ -31,6 +32,7 @@ public void addDescriptors(DatabaseSession session) {
session.addDescriptors(project);
}
+ @Override
public void createTables(DatabaseSession session) {
SchemaManager schemaManager = new SchemaManager(session);
@@ -49,6 +51,7 @@ public void createTables(DatabaseSession session) {
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 c11528d90e0..d234b47f347 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 @@ public class SpringPlatform implements ServerPlatform {
* 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 @@ public void initialize() {
/**
* Return if the Spring transaction is active.
*/
+ @Override
public boolean isTransactionActive() {
return (this.status != null);
}
@@ -56,6 +58,7 @@ public boolean isTransactionActive() {
/**
* Return if the Spring transaction is roll back only.
*/
+ @Override
public boolean getRollbackOnly() {
return (this.status != null) && (this.status.isRollbackOnly());
}
@@ -63,6 +66,7 @@ public boolean getRollbackOnly() {
/**
* Start a new Spring transaction.
*/
+ @Override
public void beginTransaction() {
if (this.status != null) {
rollbackTransaction();
@@ -74,6 +78,7 @@ public void beginTransaction() {
/**
* Commit the existing Spring transaction.
*/
+ @Override
public void commitTransaction() {
try {
getTransactionManager().commit(this.status);
@@ -85,6 +90,7 @@ public void commitTransaction() {
/**
* Roll back the existing Spring transaction.
*/
+ @Override
public void rollbackTransaction() {
try {
getTransactionManager().rollback(this.status);
@@ -100,6 +106,7 @@ public PlatformTransactionManager getTransactionManager() {
/**
* Mark the existing Spring transaction for rollback.
*/
+ @Override
public void setTransactionForRollback() {
if (this.status != null) {
this.status.setRollbackOnly();
@@ -109,6 +116,7 @@ public void setTransactionForRollback() {
/**
* Is the platform Oracle?
*/
+ @Override
public boolean isOc4j() {
return false;
}
@@ -116,6 +124,7 @@ public boolean isOc4j() {
/**
* Is the platform Weblogic?
*/
+ @Override
public boolean isWeblogic() {
return false;
}
@@ -123,6 +132,7 @@ public boolean isWeblogic() {
/**
* Is the platform JBoss?
*/
+ @Override
public boolean isJBoss() {
return false;
}
@@ -130,6 +140,7 @@ public boolean isJBoss() {
/**
* Is the platform clustered?
*/
+ @Override
public boolean isClustered() {
return false;
}
@@ -137,6 +148,7 @@ public boolean isClustered() {
/**
* Is the platform Spring?
*/
+ @Override
public boolean isSpring() {
return true;
}
@@ -144,12 +156,14 @@ public boolean isSpring() {
/**
* 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 @@ public EntityManager getEntityManager(String persistenceUnit) {
/**
* 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 @@ public ClassPathXmlApplicationContext getContext(String persistenceUnit) {
/**
* 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 f5180fc019f..74fc9e3ddbb 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 @@ public EntityManagerTransactionWrapper(EntityManagerFactory emf){
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 @@ public void flush() {
}
+ @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 399c29bc862..81017804a01 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 @@ public void setEntityManager(EntityManager entityManager) {
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 9a6a717e063..0baa23cbfab 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 @@ public void testCascadePersistwithRemove(){
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 b30ed07cbea..e66ece2c151 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 @@ public class TestContainerEMF extends SpringJunitTestCase {
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 @@ public void setUp() {
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 55049807ad2..36a10840dee 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 @@ public class TestContainerEMFtransactional extends SpringJunitTestCase {
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 2dc67f81bd1..281d968e589 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 @@ public class TestLocalEMF extends SpringJunitTestCase {
private EntityManagerWrapper em;
+ @Override
public void setUp() {
context = new ClassPathXmlApplicationContext("appContext_LocalEMF.xml");
emf = (EntityManagerFactory)context.getBean("entityManagerFactory");
@@ -38,10 +39,12 @@ public void setUp() {
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 992a8778fcb..b5a5e3b5ba1 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 @@ public class TestLocalEMFtransactional extends SpringJunitTestCase {
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 a60d73d7e1f..bb31b5a32f5 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 @@ public void testCascadePersistwithRemove(){
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 a1a7fc8434f..debf0a96a3d 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 @@ public String getExceptionString() {
/*
* The following methods implement Connection interface
*/
+ @Override
public Statement createStatement() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -122,6 +123,7 @@ public Statement createStatement() throws SQLException {
return conn.createStatement();
}
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -129,6 +131,7 @@ public PreparedStatement prepareStatement(String sql) throws SQLException {
return conn.prepareStatement(sql);
}
+ @Override
public CallableStatement prepareCall(String sql) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -136,6 +139,7 @@ public CallableStatement prepareCall(String sql) throws SQLException {
return conn.prepareCall(sql);
}
+ @Override
public String nativeSQL(String sql) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -143,6 +147,7 @@ public String nativeSQL(String sql) throws SQLException {
return conn.nativeSQL(sql);
}
+ @Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -150,6 +155,7 @@ public void setAutoCommit(boolean autoCommit) throws SQLException {
conn.setAutoCommit(autoCommit);
}
+ @Override
public boolean getAutoCommit() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -157,6 +163,7 @@ public boolean getAutoCommit() throws SQLException {
return conn.getAutoCommit();
}
+ @Override
public void commit() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -164,6 +171,7 @@ public void commit() throws SQLException {
conn.commit();
}
+ @Override
public void rollback() throws SQLException {
conn.rollback();
if(broken) {
@@ -171,6 +179,7 @@ public void rollback() throws SQLException {
}
}
+ @Override
public void close() throws SQLException {
conn.close();
if(broken) {
@@ -178,6 +187,7 @@ public void close() throws SQLException {
}
}
+ @Override
public boolean isClosed() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -185,10 +195,12 @@ public boolean isClosed() throws SQLException {
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 @@ public void setReadOnly(boolean readOnly) throws SQLException {
conn.setReadOnly(readOnly);
}
+ @Override
public boolean isReadOnly() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -203,6 +216,7 @@ public boolean isReadOnly() throws SQLException {
return conn.isReadOnly();
}
+ @Override
public void setCatalog(String catalog) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -210,6 +224,7 @@ public void setCatalog(String catalog) throws SQLException {
conn.setCatalog(catalog);
}
+ @Override
public String getCatalog() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -217,6 +232,7 @@ public String getCatalog() throws SQLException {
return conn.getCatalog();
}
+ @Override
public void setTransactionIsolation(int level) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -224,6 +240,7 @@ public void setTransactionIsolation(int level) throws SQLException {
conn.setTransactionIsolation(level);
}
+ @Override
public int getTransactionIsolation() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -231,6 +248,7 @@ public int getTransactionIsolation() throws SQLException {
return conn.getTransactionIsolation();
}
+ @Override
public SQLWarning getWarnings() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -238,6 +256,7 @@ public SQLWarning getWarnings() throws SQLException {
return conn.getWarnings();
}
+ @Override
public void clearWarnings() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -245,6 +264,7 @@ public void clearWarnings() throws SQLException {
conn.clearWarnings();
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -252,8 +272,9 @@ public Statement createStatement(int resultSetType, int resultSetConcurrency) th
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 @@ public PreparedStatement prepareStatement(String sql, int resultSetType,
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> getTypeMap() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -276,6 +299,7 @@ public java.util.Map> getTypeMap() throws SQLException {
return conn.getTypeMap();
}
+ @Override
public void setTypeMap(java.util.Map> map) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -283,6 +307,7 @@ public void setTypeMap(java.util.Map> map) throws SQLException {
conn.setTypeMap(map);
}
+ @Override
public void setHoldability(int holdability) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -290,6 +315,7 @@ public void setHoldability(int holdability) throws SQLException {
conn.setHoldability(holdability);
}
+ @Override
public int getHoldability() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -297,6 +323,7 @@ public int getHoldability() throws SQLException {
return conn.getHoldability();
}
+ @Override
public Savepoint setSavepoint() throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -304,6 +331,7 @@ public Savepoint setSavepoint() throws SQLException {
return conn.setSavepoint();
}
+ @Override
public Savepoint setSavepoint(String name) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -311,6 +339,7 @@ public Savepoint setSavepoint(String name) throws SQLException {
return conn.setSavepoint(name);
}
+ @Override
public void rollback(Savepoint savepoint) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -318,6 +347,7 @@ public void rollback(Savepoint savepoint) throws SQLException {
conn.rollback();
}
+ @Override
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
if(broken) {
throw new SQLException(getExceptionString());
@@ -325,16 +355,18 @@ public void releaseSavepoint(Savepoint savepoint) throws SQLException {
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 @@ public PreparedStatement prepareStatement(String sql, int resultSetType,
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 @@ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) thr
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 @@ public PreparedStatement prepareStatement(String sql, int columnIndexes[]) throw
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 @@ public PreparedStatement prepareStatement(String sql, String columnNames[]) thro
// 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 unwrap(Class 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 8a13d84c4ad..8975ba619b1 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 @@ public static String getNewConnectionsBrokenExceptionString() {
/*
* 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 @@ public Connection connect(String url, java.util.Properties info) throws SQLExcep
}
}
+ @Override
public boolean acceptsURL(String url) throws SQLException {
if(driverName != null) {
if(driverBroken) {
@@ -256,6 +258,7 @@ public boolean acceptsURL(String url) throws SQLException {
}
}
+ @Override
public DriverPropertyInfo[] getPropertyInfo(String url, java.util.Properties info) throws SQLException {
if(driverBroken) {
throw new SQLException(getDriverBrokenExceptionString());
@@ -263,17 +266,21 @@ public DriverPropertyInfo[] getPropertyInfo(String url, java.util.Properties inf
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 857c7270481..e690b7c3baf 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 @@ public void persistTestLongWrapper() {
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 adcef207b8d..9f9242d2169 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 @@ public BogusDataSource(String text){
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 unwrap(Class 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 f89797886d8..29afd7d0e90 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 @@ public MainThread(SeContainer container, EntityManagerFactory emf, EntityManager
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 28e14a38ef7..a148ea2475d 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 @@ private class OracleLobSessionEventAdapter extends SessionEventAdapter {
* 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 ce6f4dcca29..83c91566412 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 @@ public void testStartSequenceAtNextval() {
//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 7f1d418b238..52423b293d7 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 @@ public static EntityManagerFactory getEntityManagerFactory(String persistenceUni
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() {
}
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 b5ce9505161..63fa97664af 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 @@ public class JEEPlatform implements ServerPlatform {
/**
* Return if the JTA transaction is active.
*/
+ @Override
public boolean isTransactionActive() {
try {
return getUserTransaction().getStatus() != Status.STATUS_NO_TRANSACTION;
@@ -48,6 +49,7 @@ public boolean isTransactionActive() {
/**
* Return if the JTA transaction is roll back only.
*/
+ @Override
public boolean getRollbackOnly() {
try {
return getUserTransaction().getStatus() != Status.STATUS_ACTIVE;
@@ -59,6 +61,7 @@ public boolean getRollbackOnly() {
/**
* Start a new JTA transaction.
*/
+ @Override
public void beginTransaction() {
try {
getUserTransaction().begin();
@@ -70,6 +73,7 @@ public void beginTransaction() {
/**
* Commit the existing JTA transaction.
*/
+ @Override
public void commitTransaction() {
try {
getUserTransaction().commit();
@@ -81,6 +85,7 @@ public void commitTransaction() {
/**
* Roll back the existing JTA transaction.
*/
+ @Override
public void rollbackTransaction() {
try {
getUserTransaction().rollback();
@@ -100,6 +105,7 @@ public UserTransaction getUserTransaction() {
/**
* Mark the existing JTA transaction for rollback.
*/
+ @Override
public void setTransactionForRollback() {
try {
getUserTransaction().setRollbackOnly();
@@ -111,6 +117,7 @@ public void setTransactionForRollback() {
/**
* Is the platform Oracle?
*/
+ @Override
public boolean isOc4j() {
return false;
}
@@ -118,6 +125,7 @@ public boolean isOc4j() {
/**
* Is the platform Weblogic?
*/
+ @Override
public boolean isWeblogic() {
return false;
}
@@ -125,6 +133,7 @@ public boolean isWeblogic() {
/**
* Is the platform JBoss?
*/
+ @Override
public boolean isJBoss() {
return false;
}
@@ -132,6 +141,7 @@ public boolean isJBoss() {
/**
* Is the platform clustered?
*/
+ @Override
public boolean isClustered() {
return false;
}
@@ -139,6 +149,7 @@ public boolean isClustered() {
/**
* Return the managed EntityManager for the persistence unit.
*/
+ @Override
public EntityManager getEntityManager(String persistenceUnit) {
if (entityManager != null) {
return entityManager;
@@ -154,6 +165,7 @@ public EntityManager getEntityManager(String persistenceUnit) {
/**
* 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 9fc3f29c106..558251de42d 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 @@ public static EntityManagerFactory getEntityManagerFactory(String persistenceUni
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() {
}
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 bad9c2d322f..a77dfaedebf 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 @@ class PooledDataSource implements DataSource {
other = ds;
}
+ @Override
public Connection getConnection() throws SQLException {
final Connection conn;
if (connections.isEmpty()) {
@@ -60,32 +61,40 @@ public Connection getConnection() throws SQLException {
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 unwrap(Class iface) throws SQLException {
return other.unwrap(iface);
}
@@ -94,246 +103,295 @@ private class PooledConnection implements Connection {
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> 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> map) throws SQLException {
assertOpen();
other.setTypeMap(map);
}
+ @Override
public T unwrap(Class iface) throws SQLException {
assertOpen();
return other.unwrap(iface);
@@ -350,14 +408,19 @@ private void assertOpen() throws SQLException {
}
}
+ @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 dbd7c642fec..b7fb30272bb 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 @@ public SkipBugzillaTestRunner(Class> klass) throws Throwable {
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 @@ public SkipBugzillaTestRunner(Class> klass) throws Throwable {
}
}
- 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 @@ public SkipBugzillaTestRunner(Class> klass) throws Throwable {
}
}
- 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 90f9962cf4d..b3f898d0417 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 @@ public JPA1Base() {
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 71a460f1e4d..81e91127041 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 @@ private final void verifyConsistency(EmbeddedFieldAccess field) {
+ ") in embedded field");
}
+ @Override
public void mutate(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -155,12 +156,14 @@ public void mutate(EmbeddingFieldAccess obj) {
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 @@ public void setNull(EmbeddingFieldAccess obj) {
obj.getFieldAccess().changeTime(0L);
}
+ @Override
public void set(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -175,6 +179,7 @@ public void set(EmbeddingFieldAccess obj) {
obj.getFieldAccess().changeTime(-UNCHANGED);
}
+ @Override
public void change(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -182,6 +187,7 @@ public void change(EmbeddingFieldAccess obj) {
obj.getFieldAccess().changeTime(-CHANGED);
}
+ @Override
public boolean isChanged(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -218,6 +224,7 @@ private final void verifyConsistency(EmbeddedPropertyAccess field) {
+ ") in embedded field");
}
+ @Override
public void mutate(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.propertyAccess);
@@ -225,12 +232,14 @@ public void mutate(EmbeddingFieldAccess obj) {
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 @@ public void setNull(EmbeddingFieldAccess obj) {
obj.propertyAccess.setTime(0L);
}
+ @Override
public void set(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.propertyAccess);
@@ -245,6 +255,7 @@ public void set(EmbeddingFieldAccess obj) {
obj.propertyAccess.setTime(-UNCHANGED);
}
+ @Override
public void change(EmbeddingFieldAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.propertyAccess);
@@ -252,6 +263,7 @@ public void change(EmbeddingFieldAccess obj) {
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 a496104f460..88e5d39ee00 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 @@ private final void verifyConsistency(EmbeddedFieldAccess field) {
+ ") in embedded field");
}
+ @Override
public void mutate(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -158,12 +159,14 @@ public void mutate(EmbeddingPropertyAccess obj) {
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 @@ public void setNull(EmbeddingPropertyAccess obj) {
obj.getFieldAccess().changeTime(0L);
}
+ @Override
public void set(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -178,6 +182,7 @@ public void set(EmbeddingPropertyAccess obj) {
obj.getFieldAccess().changeTime(-UNCHANGED);
}
+ @Override
public void change(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -185,6 +190,7 @@ public void change(EmbeddingPropertyAccess obj) {
obj.getFieldAccess().changeTime(-CHANGED);
}
+ @Override
public boolean isChanged(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getFieldAccess());
@@ -218,6 +224,7 @@ private final void verifyConsistency(EmbeddedPropertyAccess field) {
+ ") in embedded field");
}
+ @Override
public void mutate(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getPropertyAccess());
@@ -225,12 +232,14 @@ public void mutate(EmbeddingPropertyAccess obj) {
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 @@ public void setNull(EmbeddingPropertyAccess obj) {
obj.getPropertyAccess().setTime(0L);
}
+ @Override
public void set(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getPropertyAccess());
@@ -245,6 +255,7 @@ public void set(EmbeddingPropertyAccess obj) {
obj.getPropertyAccess().setTime(-UNCHANGED);
}
+ @Override
public void change(EmbeddingPropertyAccess obj) {
initEmbedded(obj);
verifyConsistency(obj.getPropertyAccess());
@@ -252,6 +263,7 @@ public void change(EmbeddingPropertyAccess obj) {
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 37ab9846e2d..b430a548b79 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 @@ public void testAllocSize() {
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 aaa8299ff8e..a1d420e0a2f 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 @@ public void prepare(final Object entity, final Class extends Annotation> event
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 @@ public void testPrePersist() throws SQLException {
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 @@ public void testPreRemove() throws SQLException {
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 3b44b8f43c8..0fddbdbd9e5 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 @@ private void validateMutable(final int id, Validator validator) {
@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 @@ public boolean isComparableJdbcType() {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public boolean isComparableJdbcType() {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public Query createQuery(EntityManager em, int id) {
@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 Query createQuery(EntityManager em, int id) {
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 Query createQuery(EntityManager em, int id) {
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 Query createQuery(EntityManager em, int id) {
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 Query createQuery(EntityManager em, int id) {
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 Query createQuery(EntityManager em, int id) {
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 @@ public void testWrapperByteArray2Binary() {
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 @@ public void testWrapperByteArray2Longvarbinary() {
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 @@ public void testWrapperByteArray2Blob() {
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 Query createQuery(EntityManager em, int id) {
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 Query createQuery(EntityManager em, int id) {
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 @@ public void testSerializable() {
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 @@ public Query createQuery(EntityManager em, int id) {
@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 @@ public boolean isComparableJdbcType() {
@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 c542fdf31cc..1bdf308e07d 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 @@ public void testConstructorArgumentBoxing() throws SQLException {
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 8177883bd21..0896be66f71 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 void checkSingleEmployee(Employee resultEmployee, Employee expectedEmplo
}
private static class EmployeeComparator implements Comparator {
+ @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 aea823472cf..a2c5b248c8d 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 @@ protected void setup() {
@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 @@ public void tearDown() {
@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 @@ public void testQueryCompleteOutsideTransactionSmall() {
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 @@ public void testQueryExecuteOnlyOutsideTransactionSmall() {
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 @@ public void testQueryExecuteOnlyOutsideTransactionNew() {
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 @@ public void prepare() {
query.setParameter(1, Integer.valueOf(1));
}
+ @Override
public void tearDown() {
if (getEnvironment().isTransactionActive(myEm)) {
myEm.getTransaction().rollback();
@@ -196,6 +216,7 @@ public void tearDown() {
@Test
public void testNamedQueryCompleteOutsideTransactionSmall() {
Action action = new Action() {
+ @Override
public void run() {
em.clear();
Query query = em.createNamedQuery("getDepartmentById");
@@ -203,13 +224,16 @@ public void run() {
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 @@ public void testNamedQueryExecuteOnlyOutsideTransactionSmall() {
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 @@ public void testNativeEntityExecuteOnlyOutsideTransactionSmall() {
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 @@ public void testNativeFieldsExecuteOnlyOutsideTransactionSmall() {
Action action = new Action() {
Query query;
+ @Override
public void run() {
myEm.clear();
Object object = query.getSingleResult();
@@ -288,14 +321,17 @@ public void run() {
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 @@ public void testJDBCBestSmall() throws SQLException {
try {
preparedStatement.setInt(1, 1);
Action action = new Action() {
+ @Override
public void run() {
try {
ResultSet rs = preparedStatement.executeQuery();
@@ -327,13 +364,16 @@ public void run() {
}
}
+ @Override
public void tearDown() {
}
+ @Override
public String description() {
return "JDBC excluding prepare and set (small, hit)";
}
+ @Override
public void prepare() {
}
};
@@ -354,6 +394,7 @@ public void testJDBCInclusivePreapreSmall() throws SQLException {
connection.setAutoCommit(false);
try {
Action action = new Action() {
+ @Override
public void run() {
try {
final PreparedStatement preparedStatement = connection
@@ -376,13 +417,16 @@ public void run() {
}
}
+ @Override
public void tearDown() {
}
+ @Override
public String description() {
return "JDBC incuding prepare (small, hit)";
}
+ @Override
public void prepare() {
}
};
@@ -402,18 +446,22 @@ private void printRate(String description, int i) {
@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 @@ public void prepare() {
@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 10cb6e04045..fb49e6cd03b 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 @@ private void validateMutable(final int id, MutableValidator validator, String fi
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 mutate(BasicTypesFieldAccess obj) {
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 mutate(BasicTypesFieldAccess obj) {
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 mutate(BasicTypesFieldAccess obj) {
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 mutate(BasicTypesFieldAccess obj) {
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 mutate(BasicTypesFieldAccess obj) {
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 @@ public void testWrapperByteArray2Binary() {
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 @@ public void testWrapperByteArray2Longvarbinary() {
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 @@ public void testWrapperByteArray2Blob() {
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 mutate(BasicTypesFieldAccess obj) {
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 mutate(BasicTypesFieldAccess obj) {
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 @@ public void testSerializable() {
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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public boolean isChanged(BasicTypesFieldAccess obj) {
@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 e6edfdcac3b..2d4921dea02 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 @@ private void validateMutable(final int id, MutableValidator validator, String fi
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 @@ public void mutate(BasicTypesPropertyAccess obj) {
@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 @@ public void mutate(BasicTypesPropertyAccess obj) {
@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 @@ public void mutate(BasicTypesPropertyAccess obj) {
@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 @@ public void mutate(BasicTypesPropertyAccess obj) {
@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 mutate(BasicTypesPropertyAccess obj) {
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 mutate(BasicTypesPropertyAccess obj) {
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 mutate(BasicTypesPropertyAccess obj) {
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 mutate(BasicTypesPropertyAccess obj) {
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 mutate(BasicTypesPropertyAccess obj) {
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 @@ public void testWrapperByteArray2Binary() {
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 @@ public void testWrapperByteArray2Longvarbinary() {
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 @@ public void testWrapperByteArray2Blob() {
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 mutate(BasicTypesPropertyAccess obj) {
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 mutate(BasicTypesPropertyAccess obj) {
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 @@ public void testSerializable() {
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 @@ public void mutate(BasicTypesPropertyAccess obj) {
@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 @@ public boolean isChanged(BasicTypesPropertyAccess obj) {
@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 a8c5733d88d..49e6e55bece 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 @@ private void validateMutable(final int id, MutableValidator validator, String fi
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void mutate(BasicTypesFieldAccess obj) {
@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 @@ public void testUtilDateAsDate() {
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 3436dc6493d..4a537955fbc 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 @@ public JPA2Base() {
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 7a168c2a55d..b083c39152b 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 @@ protected AbstractEclipseLinkParameterTypeVisitor() {
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 @@ else if (stringExpression.isAncestor(inputParameter)) {
}
}
- /**
- * {@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 33485562013..6a2528edbfc 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 @@ protected AbstractEclipseLinkSemanticValidator(SemanticValidatorHelper helper,
this.extension = extension;
}
- /**
- * {@inheritDoc}
- */
@Override
protected LiteralVisitor buildLiteralVisitor() {
return new EclipseLinkLiteralVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected OwningClauseVisitor buildOwningClauseVisitor() {
return new EclipseLinkOwningClauseVisitor();
@@ -128,9 +122,6 @@ protected TableExpressionVisitor buildTableExpressionVisitor() {
return new TableExpressionVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected TopLevelFirstDeclarationVisitor buildTopLevelFirstDeclarationVisitor() {
return new TopLevelFirstDeclarationVisitor(this);
@@ -186,9 +177,6 @@ protected boolean isTableExpression(Expression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected PathType selectClausePathExpressionPathType() {
return PathType.ANY_FIELD_INCLUDING_COLLECTION;
@@ -212,9 +200,6 @@ protected int subquerySelectItemCount(Expression subquery) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateFunctionExpression(FunctionExpression expression) {
super.validateFunctionExpression(expression);
@@ -269,9 +254,6 @@ protected void validateFunctionExpression(FunctionExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateInExpression(InExpression expression) {
super.validateInExpression(expression);
@@ -292,9 +274,6 @@ protected void validateInExpression(InExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateRangeVariableDeclarationRootObject(RangeVariableDeclaration expression) {
@@ -317,34 +296,22 @@ protected void validateRangeVariableDeclarationRootObject(RangeVariableDeclarati
}
}
- /**
- * {@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 @@ protected Boolean validateThirdPartyStateFieldPathExpression(StateFieldPathExpre
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 @@ public void visit(TableExpression expression) {
}
}
- /**
- * {@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 @@ public EclipseLinkOwningClauseVisitor() {
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void dispose() {
super.dispose();
@@ -576,49 +501,31 @@ protected static final class SubquerySelectItemCalculator extends AnonymousExpre
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 static final class TableExpressionVisitor extends AbstractEclipseLinkE
*/
protected boolean valid;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TableExpression expression) {
valid = (this.expression == expression);
@@ -656,9 +560,6 @@ private TopLevelFirstDeclarationVisitor(AbstractEclipseLinkSemanticValidator val
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 454ef39835f..be9416337c4 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 @@ protected AbstractSingleEncapsulatedExpressionHelper countFunctio
return helper;
}
- /**
- * {@inheritDoc}
- */
@Override
public void dispose() {
inputParameters.clear();
@@ -1162,9 +1159,6 @@ protected DateTimeVisitor getDateTimeVisitor() {
return visitor;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar getGrammar() {
return jpqlGrammar;
@@ -1191,9 +1185,6 @@ protected AbstractSingleEncapsulatedExpressionHelper indexExpre
return helper;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -2530,34 +2521,22 @@ protected AbstractSingleEncapsulatedExpressionHelper valueExpre
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 @@ public void visit(AllOrAnyExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AndExpression expression) {
validateLogicalExpression(expression, ConditionalExpressionBNF.ID, ConditionalExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
@@ -2602,17 +2575,11 @@ public void visit(ArithmeticFactor expression) {
}
}
- /**
- * {@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 @@ public void visit(BadExpression expression) {
addProblem(expression, startPosition, endPosition, BadExpression_InvalidExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
@@ -2675,9 +2639,6 @@ else if (!expression.hasUpperBoundExpression()) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
@@ -2759,9 +2720,6 @@ else if (expression.hasElseExpression() &&
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
@@ -2774,9 +2732,6 @@ public void visit(CoalesceExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
// Nothing to validate, it's done by the parent expression
@@ -2784,9 +2739,6 @@ public void visit(CollectionExpression expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -2885,9 +2837,6 @@ else if (expression.hasLeftParenthesis() &&
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
@@ -2941,17 +2890,11 @@ public void visit(CollectionMemberExpression expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
validatePathExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
@@ -2976,9 +2919,6 @@ public void visit(ComparisonExpression expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConcatExpression expression) {
@@ -3003,9 +2943,6 @@ public void visit(ConcatExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ConstructorExpression expression) {
@@ -3072,17 +3009,11 @@ else if (!expression.hasLeftParenthesis()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
validateAggregateFunctionLocation(expression, countFunctionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -3145,9 +3076,6 @@ else if (!dateTime.endsWith("}")) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
@@ -3202,26 +3130,17 @@ else if (!expression.hasRangeVariableDeclaration()) {
}
}
- /**
- * {@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 @@ public void visit(EmptyCollectionComparisonExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
@@ -3264,9 +3180,6 @@ public void visit(EntityTypeLiteral expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntryExpression expression) {
@@ -3279,25 +3192,16 @@ public void visit(EntryExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(FunctionExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
@@ -3353,9 +3254,6 @@ public void visit(GroupByClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
validateAbstractConditionalClause(
@@ -3365,9 +3263,6 @@ public void visit(HavingClause expression) {
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -3384,17 +3279,11 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
validateIdentificationVariableDeclaration(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
@@ -3407,9 +3296,6 @@ public void visit(IndexExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -3543,9 +3429,6 @@ else if (!isValid(inItems, expression.getExpressionItemQueryBNFId())) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
@@ -3599,9 +3482,6 @@ else if (expression.isNamed()) {
validateOwningClause(expression, parameter);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -3714,9 +3594,6 @@ else if (joinFetch &&
expression.getOnClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
@@ -3752,9 +3629,6 @@ else if (!expression.hasQueryStatement()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
@@ -3767,25 +3641,16 @@ public void visit(KeyExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(LikeExpression expression) {
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 @@ public void visit(NotExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -3919,17 +3760,11 @@ public void visit(NullComparisonExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
// Nothing to validate
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
@@ -3942,9 +3777,6 @@ public void visit(NullIfExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
@@ -3963,17 +3795,11 @@ public void visit(NumericLiteral expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ObjectExpression expression) {
validateAbstractSingleEncapsulatedExpression(expression, objectExpressionHelper());
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OnClause expression) {
@@ -4007,9 +3833,6 @@ public void visit(OnClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
@@ -4029,9 +3852,6 @@ public void visit(OrderByClause expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
@@ -4055,9 +3875,6 @@ public void visit(OrderByItem expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
validateLogicalExpression(
@@ -4067,9 +3884,6 @@ public void visit(OrExpression expression) {
);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -4111,9 +3925,6 @@ public void visit(RangeVariableDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -4160,9 +3971,6 @@ public void visit(ResultVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
@@ -4178,67 +3986,43 @@ public void visit(SelectClause expression) {
}
}
- /**
- * {@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 @@ public void visit(StringLiteral expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
@@ -4273,33 +4054,21 @@ public void visit(SubExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(TreatExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
@@ -4387,9 +4153,6 @@ else if (!isValid(expression.getExpression(), expression.getEncapsulatedExpressi
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
@@ -4402,17 +4165,11 @@ public void visit(TypeExpression expression) {
}
}
- /**
- * {@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 @@ else if (!expression.hasUpdateItems()) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
@@ -4506,26 +4260,17 @@ else if (expression.hasEqualSign()) {
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 @@ public void visit(ValueExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhenClause expression) {
@@ -4585,9 +4327,6 @@ public void visit(WhenClause expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
validateAbstractConditionalClause(
@@ -4700,9 +4439,6 @@ protected void validateSeparation(CollectionExpression expression) {
*/
abstract boolean validateSeparator(CollectionExpression expression, int index);
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
validateSeparation(expression);
@@ -4718,9 +4454,6 @@ protected AbstractDoubleEncapsulatedExpressionHelper(AbstractGrammarValidator va
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] arguments(T expression) {
return ExpressionTools.EMPTY_STRING_ARRAY;
@@ -4743,17 +4476,11 @@ protected boolean hasFirstExpression(T expression) {
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 @@ protected boolean hasSecondExpression(T expression) {
expression.hasSecondExpression();
}
- /**
- * {@inheritDoc}
- */
@Override
public String identifier(T expression) {
return expression.getIdentifier();
@@ -4867,9 +4591,6 @@ protected AbstractSingleEncapsulatedExpressionHelper(AbstractGrammarValidator va
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] arguments(T expression) {
return ExpressionTools.EMPTY_STRING_ARRAY;
@@ -4901,17 +4622,11 @@ protected int encapsulatedExpressionLength(T expression) {
*/
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 @@ public boolean hasRightParenthesis(T expression) {
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public final String identifier(T expression) {
return expression.getIdentifier();
@@ -4973,9 +4685,6 @@ protected AbstractTripleEncapsulatedExpressionHelper(AbstractGrammarValidator va
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
public String[] arguments(T expression) {
return ExpressionTools.EMPTY_STRING_ARRAY;
@@ -4995,17 +4704,11 @@ protected boolean hasFirstExpression(T expression) {
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 @@ protected CollectionExpressionVisitor() {
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
this.expression = expression;
@@ -5132,9 +4832,6 @@ protected CollectionSeparatedByCommaValidator(AbstractGrammarValidator validator
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
boolean validateSeparator(CollectionExpression expression, int index) {
return expression.hasComma(index);
@@ -5152,9 +4849,6 @@ protected CollectionSeparatedBySpaceValidator(AbstractGrammarValidator validator
super(validator);
}
- /**
- * {@inheritDoc}
- */
@Override
boolean validateSeparator(CollectionExpression expression, int index) {
return !expression.hasComma(index);
@@ -5169,9 +4863,6 @@ protected static final class ComparisonExpressionVisitor extends AbstractExpress
*/
ComparisonExpression expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
this.expression = expression;
@@ -5186,9 +4877,6 @@ protected static final class DateTimeVisitor extends AbstractExpressionVisitor {
*/
public boolean dateTime;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
dateTime = true;
@@ -5213,9 +4901,6 @@ protected NullExpressionVisitor() {
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 f8a263495b5..9ffec3e75be 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 @@ protected TopLevelFirstDeclarationVisitor buildTopLevelFirstDeclarationVisitor()
return new TopLevelFirstDeclarationVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
public void dispose() {
super.dispose();
@@ -292,9 +289,6 @@ protected ComparisonExpressionVisitor getComparisonExpressionVisitor() {
return comparisonExpressionVisitor;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar getGrammar() {
return helper.getGrammar();
@@ -339,9 +333,6 @@ protected BaseDeclarationIdentificationVariableFinder getVirtualIdentificationVa
return virtualIdentificationVariableFinder;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initialize() {
super.initialize();
@@ -2654,306 +2645,192 @@ protected PathType validPathExpressionTypeForStringExpression() {
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 @@ public final void visit(JPQLExpression expression) {
}
}
- /**
- * {@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 @@ public final void visit(ResultVariable expression) {
}
}
- /**
- * {@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 static final class CollectionValuedPathExpressionVisitor extends Abstr
*/
protected CollectionValuedPathExpression expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
this.expression = expression;
@@ -3365,17 +3101,11 @@ protected static final class ComparingEntityTypeLiteralVisitor extends AbstractE
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 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
// Make sure to bypass any sub expression
@@ -3429,18 +3156,12 @@ private void dispose() {
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 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
@@ -3494,51 +3212,33 @@ protected static class FirstDeclarationVisitor extends AnonymousExpressionVisito
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 @@ protected InItemsVisitor(AbstractSemanticValidator validator) {
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 static final class StateFieldPathExpressionVisitor extends AbstractExp
*/
protected StateFieldPathExpression expression;
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StateFieldPathExpression expression) {
this.expression = expression;
@@ -3624,9 +3315,6 @@ public void visit(StateFieldPathExpression expression) {
// 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 @@ public void visit(CollectionValuedPathExpression expression) {
// 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 15b70dfe7e6..bf5087bf690 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 @@ public void setProblems(Collection problems) {
this.problems = problems;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
expression.acceptChildren(this);
@@ -764,9 +761,6 @@ public BypassChildCollectionExpressionVisitor() {
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
for (Expression child : expression.children()) {
@@ -777,17 +771,11 @@ public void visit(CollectionExpression expression) {
}
}
- /**
- * {@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 @@ public BypassParentSubExpressionVisitor() {
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 @@ public ChildrenCollectorVisitor() {
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 @@ public void validate(JPQLQueryBNF queryBNF) {
}
}
- /**
- * {@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 @@ public void visit(SubExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnknownExpression expression) {
// This is not a valid expression
@@ -1031,17 +986,11 @@ protected static class NestedArrayVisitor extends AbstractExpressionVisitor {
*/
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 @@ public void dispose() {
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 @@ protected void dispose() {
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 @@ protected static class SubqueryVisitor extends AbstractExpressionVisitor {
*/
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 1e5d5612b0b..3d07d925d44 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 @@ public BaseDeclarationIdentificationVariableFinder() {
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 @@ public void visit(CollectionExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
try {
@@ -97,17 +88,11 @@ public void visit(DeleteClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
expression.getDeleteClause().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
if (traverse) {
@@ -118,9 +103,6 @@ public void visit(FromClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
if (traverse) {
@@ -128,9 +110,6 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
if (traverse) {
@@ -141,25 +120,16 @@ public void visit(IdentificationVariableDeclaration expression) {
}
}
- /**
- * {@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 @@ public void visit(RangeVariableDeclaration expression) {
}
}
- /**
- * {@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 @@ public void visit(UpdateClause expression) {
}
}
- /**
- * {@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 6f85b92bbc6..7c7a3a7f3b0 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 @@ final class DefaultJPQLQueryProblem implements JPQLQueryProblem {
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 d6acfb45819..3c40e034543 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 @@ protected InExpressionWithNestedArrayVisitor buildInExpressionWithNestedArrayVis
return new InExpressionWithNestedArrayVisitor(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected LiteralVisitor buildLiteralVisitor() {
return new EclipseLinkLiteralVisitor();
}
- /**
- * {@inheritDoc}
- */
@Override
protected OwningClauseVisitor buildOwningClauseVisitor() {
return new EclipseLinkOwningClauseVisitor();
@@ -279,9 +273,6 @@ protected InExpressionWithNestedArrayVisitor getInExpressionWithNestedArray() {
return inExpressionWithNestedArrayVisitor;
}
- /**
- * {@inheritDoc}
- */
@Override
protected EclipseLinkOwningClauseVisitor getOwningClauseVisitor() {
return (EclipseLinkOwningClauseVisitor) super.getOwningClauseVisitor();
@@ -315,26 +306,17 @@ protected boolean isInExpressionWithNestedArray(SimpleSelectClause expression) {
}
}
- /**
- * {@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 @@ protected boolean isOwnedByUnionClause(Expression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isSubqueryAllowedAnywhere() {
EclipseLinkVersion version = EclipseLinkVersion.value(getProviderVersion());
@@ -382,9 +361,6 @@ protected AbstractSingleEncapsulatedExpressionHelper tableExpre
return helper;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void validateAbstractSelectClause(AbstractSelectClause expression,
boolean multipleSelectItemsAllowed) {
@@ -404,16 +380,10 @@ protected void validateAbstractSelectClause(AbstractSelectClause expression,
super.validateAbstractSelectClause(expression, multipleSelectItemsAllowed);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AsOfClause expression) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CastExpression expression) {
@@ -449,25 +419,16 @@ public void visit(CastExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(ExtractExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(RegexpExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(TableVariableDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UnionClause expression) {
@@ -700,25 +640,16 @@ protected InExpressionWithNestedArrayVisitor(EclipseLinkGrammarValidator visitor
*/
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 df3ffa2ddab..34ddb60680c 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 @@ public EclipseLinkLiteralVisitor() {
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 @@ 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) {
if (type == LiteralType.STRING_LITERAL) {
@@ -130,16 +100,10 @@ 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/EclipseLinkVersion.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/EclipseLinkVersion.java
index b029cb49eb3..b08026c0ae2 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 @@ public EclipseLinkVersion toCurrentVersion() {
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 7b53865d740..0edddd6f826 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 @@ public JPAVersion toCurrentVersion() {
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 228b75296f1..1cb79e07c07 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 final class JPQLQueryProblemResourceBundle extends ListResourceBundle {
*/
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 d0861824140..6b52c83ecf9 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 @@ public void setType(LiteralType type) {
this.literal = ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AbstractSchemaName expression) {
if (type == LiteralType.ABSTRACT_SCHEMA_NAME) {
@@ -96,9 +93,6 @@ public void visit(AbstractSchemaName expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -113,17 +107,11 @@ else if (type == LiteralType.IDENTIFICATION_VARIABLE) {
}
}
- /**
- * {@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 @@ public void visit(EntityTypeLiteral expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
if (type == LiteralType.STRING_LITERAL) {
@@ -141,9 +126,6 @@ public void visit(FunctionExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -155,9 +137,6 @@ public void visit(IdentificationVariable expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
if (type == LiteralType.INPUT_PARAMETER) {
@@ -165,9 +144,6 @@ public void visit(InputParameter expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
if (type == LiteralType.IDENTIFICATION_VARIABLE) {
@@ -178,9 +154,6 @@ public void visit(Join expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
if (type == LiteralType.ABSTRACT_SCHEMA_NAME) {
@@ -191,9 +164,6 @@ else if (type == LiteralType.IDENTIFICATION_VARIABLE) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
if (type == LiteralType.RESULT_VARIABLE) {
@@ -201,17 +171,11 @@ public void visit(ResultVariable expression) {
}
}
- /**
- * {@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 @@ public void visit(StringLiteral expression) {
}
}
- /**
- * {@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 5844d9a4cee..573fc6e90ce 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 void dispose() {
*/
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 @@ else if (upperBound.isAncestor(inputParameter)) {
}
}
- /**
- * {@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 @@ public void visit(CollectionMemberExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(ConcatExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(EmptyCollectionComparisonExpression expression) {
}
}
- /**
- * {@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 @@ else if (visitedExpressions.add(expression)) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
if (inputParameter == null) {
@@ -465,26 +384,17 @@ public void visit(InputParameter expression) {
}
}
- /**
- * {@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 @@ public void visit(LengthExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
@@ -520,9 +427,6 @@ public void visit(LikeExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LocateExpression expression) {
@@ -541,60 +445,39 @@ public void visit(LocateExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(NullComparisonExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(SqrtExpression expression) {
}
}
- /**
- * {@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 @@ else if (expression.getSecondExpression().isAncestor(inputParameter) ||
}
}
- /**
- * {@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 @@ else if (expression.getExpression().isAncestor(inputParameter)) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TypeExpression expression) {
if (expression.getExpression() != inputParameter) {
@@ -739,34 +583,22 @@ public void visit(TypeExpression expression) {
}
}
- /**
- * {@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 869ffcdcd8d..4efbb524d05 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 @@ public String substring(int startIndex, int endIndex) {
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 dff84db0421..3f103f44bdb 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 @@ public AbsExpression(AbstractExpression parent) {
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 21535444eae..5458e1ad184 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 @@ public AbsExpressionFactory() {
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 c127acd9256..bfeadfed79a 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 @@ protected AbstractConditionalClause(AbstractExpression parent, String identifier
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getConditionalExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addChildrenTo(Collection children) {
children.add(getConditionalExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addOrderedChildrenTo(List children) {
@@ -122,9 +113,6 @@ public CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -186,18 +174,12 @@ public final boolean hasSpaceAfterIdentifier() {
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 @@ protected final void parse(WordParser wordParser, boolean tolerant) {
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 b6fb6ffee05..705ea77d864 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 @@ protected AbstractDoubleEncapsulatedExpression(AbstractExpression parent, String
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getFirstExpression().accept(visitor);
getSecondExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getFirstExpression());
children.add(getSecondExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List children) {
@@ -132,9 +123,6 @@ public final CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -183,9 +171,6 @@ public final boolean hasComma() {
return hasComma;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasFirstExpression() || hasComma || hasSecondExpression();
@@ -223,9 +208,6 @@ public final boolean hasSpaceAfterComma() {
return hasSpaceAfterComma;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
char character = wordParser.character();
@@ -256,9 +238,6 @@ protected boolean isSecondExpressionOptional() {
*/
public abstract String parameterExpressionBNF(int index);
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -296,9 +275,6 @@ else if (hasFirstExpression()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
hasComma = false;
@@ -307,9 +283,6 @@ protected void removeEncapsulatedExpression() {
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 1df49f1ef12..ca17f539aed 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 4cb5f4a85ca..b86f012746c 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 8e7e81e7303..b1753837aed 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 6ca6539899b..a6674587786 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 @@ protected AbstractEncapsulatedExpression(AbstractExpression parent, String ident
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addOrderedChildrenTo(List children) {
@@ -156,9 +153,6 @@ public boolean hasSpaceAfterIdentifier() {
return hasSpaceAfterIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -185,9 +179,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
wordParser.startsWith(EQUAL);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -278,9 +269,6 @@ protected boolean shouldParseRightParenthesis(WordParser wordParser, boolean tol
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 8aec2e4bde2..ee14a926303 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 @@ protected final int calculatePosition(Expression expression, int length) {
throw new RuntimeException("The position of the Expression could not be calculated: " + expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public final ListIterable children() {
if (children == null) {
@@ -434,9 +431,6 @@ protected final ExpressionFactory findFallBackExpressionFactory(JPQLQueryBNF que
return getExpressionRegistry().getExpressionFactory(fallBackQueryBNF.getFallbackExpressionFactoryId());
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getQueryBNF();
@@ -465,9 +459,6 @@ protected final ExpressionRegistry getExpressionRegistry() {
return getGrammar().getExpressionRegistry();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLGrammar getGrammar() {
return getRoot().getGrammar();
@@ -492,17 +483,11 @@ protected JPAVersion getJPAVersion() {
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 @@ public final int getOffset() {
return offset;
}
- /**
- * {@inheritDoc}
- */
@Override
public final AbstractExpression getParent() {
return parent;
@@ -529,9 +511,6 @@ public JPQLQueryBNF getQueryBNF(String queryBNFID) {
return getExpressionRegistry().getQueryBNF(queryBNFID);
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLExpression getRoot() {
return (parent == null) ? (JPQLExpression) this : parent.getRoot();
@@ -573,9 +552,6 @@ protected boolean handleCollection(JPQLQueryBNF queryBNF) {
return queryBNF.handleCollection();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isAncestor(Expression expression) {
@@ -668,9 +644,6 @@ protected boolean isVirtual() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public final ListIterable orderedChildren() {
if (orderedChildren == null) {
@@ -1041,9 +1014,6 @@ protected AbstractExpression parseUsingExpressionFactory(WordParser wordParser,
return factory.buildExpression(this, wordParser, word, queryBNF, null, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
public void populatePosition(QueryPosition queryPosition, int position) {
@@ -1132,9 +1102,6 @@ protected boolean shouldSkipLiteral(AbstractExpression expression) {
return (expression != null);
}
- /**
- * {@inheritDoc}
- */
@Override
public String toActualText() {
if (actualText == null) {
@@ -1145,9 +1112,6 @@ public String toActualText() {
return actualText;
}
- /**
- * {@inheritDoc}
- */
@Override
public String toParsedText() {
if (parsedText == null) {
@@ -1169,9 +1133,6 @@ public String toParsedText() {
*/
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 ea3d4023144..b4f23a2c319 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 e1f13ac7a7a..c02121c34d3 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 @@ protected AbstractFromClause(AbstractExpression parent) {
super(parent, FROM);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getDeclaration().accept(visitor);
@@ -100,9 +97,6 @@ public void acceptChildren(ExpressionVisitor visitor) {
getAsOfClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getDeclaration());
@@ -110,9 +104,6 @@ protected void addChildrenTo(Collection children) {
children.add(getAsOfClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -167,9 +158,6 @@ public final CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -300,9 +288,6 @@ public final boolean hasSpaceAfterHierarchicalQueryClause() {
return hasSpaceAfterHierarchicalQueryClause;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -314,9 +299,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -358,17 +340,11 @@ else if (hierarchicalQueryClause == null) {
}
}
- /**
- * {@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 baa8ce5a64e..0996ede1210 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 @@ public JPQLGrammar getBaseGrammar() {
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 fbc8ecf85a6..3c88b9ad8bb 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 @@ protected abstract AbstractExpression buildExpression(AbstractExpression parent,
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 5d7ad131ab9..437ef911078 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 @@ protected AbstractOrderByClause(AbstractExpression parent, String identifier) {
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getOrderByItems().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getOrderByItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -108,9 +99,6 @@ public final CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, spaces, commas, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -162,9 +150,6 @@ public final boolean hasSpaceAfterIdentifier() {
return hasSpaceAfterIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -177,9 +162,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 aaf87b9dda4..4c675633c80 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 @@ protected AbstractPathExpression(AbstractExpression parent, String paths) {
this.pathSize = -1;
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getIdentificationVariable().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
checkPaths();
children.add(identificationVariable);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addOrderedChildrenTo(List children) {
@@ -233,9 +224,6 @@ public final boolean endsWithDot() {
return endsWithDot;
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -291,9 +279,6 @@ public final boolean hasVirtualIdentificationVariable() {
return identificationVariable.isVirtual();
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void parse(WordParser wordParser, boolean tolerant) {
wordParser.moveForward(getText());
@@ -366,9 +351,6 @@ public String toParsedText(int startIndex, int stopIndex) {
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 1666a3b47e0..ecf26fc8c2a 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 @@ public AbstractSchemaName(AbstractExpression parent, String abstractSchemaName)
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 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 22f0bca9bff..db3221f0430 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 @@ public AbstractSchemaNameBNF() {
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 fe6047637f0..996863978b1 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 @@ public AbstractSchemaNameFactory() {
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 14840b293a1..70ecaf76deb 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 @@ protected AbstractSelectClause(AbstractExpression parent) {
super(parent, SELECT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getSelectExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getSelectExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -139,9 +130,6 @@ public CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -234,9 +222,6 @@ public final boolean hasSpaceAfterSelect() {
return hasSpaceAfterSelect;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -255,17 +240,11 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 fcec2e707d4..340b7756878 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 @@ protected AbstractSelectStatement(AbstractExpression parent) {
super(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getSelectClause().accept(visitor);
@@ -99,9 +96,6 @@ public void acceptChildren(ExpressionVisitor visitor) {
getHavingClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getSelectClause());
@@ -111,9 +105,6 @@ protected void addChildrenTo(Collection children) {
children.add(getHavingClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -177,9 +168,6 @@ protected void addOrderedChildrenTo(List children) {
*/
protected abstract AbstractSelectClause buildSelectClause();
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -361,9 +349,6 @@ public final boolean hasWhereClause() {
!whereClause.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -442,9 +427,6 @@ protected boolean shouldManageSpaceAfterClause() {
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 24633b4b4cd..ee446042794 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 @@ protected AbstractSingleEncapsulatedExpression(AbstractExpression parent, String
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addChildrenTo(Collection children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List children) {
if (expression != null) {
@@ -74,9 +65,6 @@ protected void addOrderedEncapsulatedExpressionTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -106,9 +94,6 @@ public final Expression getExpression() {
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasExpression();
@@ -125,9 +110,6 @@ public final boolean hasExpression() {
!expression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -136,9 +118,6 @@ protected void parseEncapsulatedExpression(WordParser wordParser,
expression = parse(wordParser, getEncapsulatedExpressionQueryBNFId(), tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
expression = null;
@@ -156,9 +135,6 @@ public final void setExpression(AbstractExpression expression) {
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 9879f43bf90..c6f4d46a267 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 778887f7997..1e99f8f9664 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 ce75b6fae1b..8eabcc789c9 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 @@ protected AbstractTripleEncapsulatedExpression(AbstractExpression parent, String
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getFirstExpression().accept(visitor);
@@ -95,9 +92,6 @@ public void acceptChildren(ExpressionVisitor visitor) {
getThirdExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getFirstExpression());
@@ -105,9 +99,6 @@ protected void addChildrenTo(Collection children) {
children.add(getThirdExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List children) {
@@ -171,9 +162,6 @@ public final CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -238,9 +226,6 @@ public final Expression getThirdExpression() {
return thirdExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasFirstExpression() || hasFirstComma ||
@@ -321,9 +306,6 @@ public final boolean hasThirdExpression() {
!thirdExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -351,9 +333,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
*/
protected abstract boolean isThirdExpressionOptional();
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -410,9 +389,6 @@ else if (parameterIndex == -1) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
hasFirstComma = false;
@@ -424,9 +400,6 @@ protected void removeEncapsulatedExpression() {
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 139fcb9ede3..620e93200c7 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 @@ public AdditionExpression(AbstractExpression parent) {
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 3b3bd0f6016..2caed4c9f85 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 @@ public AggregateExpressionBNF() {
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 4ea95fc4742..7707634549d 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 @@ protected AggregateFunction(AbstractExpression parent, String identifier) {
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List children) {
@@ -99,9 +96,6 @@ protected AbstractExpression buildEncapsulatedExpression(WordParser wordParser,
return new StateFieldPathExpression(this, word);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return InternalAggregateFunctionBNF.ID;
@@ -118,9 +112,6 @@ public String getActualDistinctIdentifier() {
return (distinctIdentifier != null) ?distinctIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(AggregateExpressionBNF.ID);
@@ -145,9 +136,6 @@ public final boolean hasSpaceAfterDistinct() {
return hasSpaceAfterDistinct;
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -163,9 +151,6 @@ protected final void parseEncapsulatedExpression(WordParser wordParser,
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 1e1ea46e0ca..ca241dd062c 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 @@ public AllOrAnyExpression(AbstractExpression parent, String identifier) {
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 dc35bd7f61c..8685dba9341 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 @@ public AllOrAnyExpressionBNF() {
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 0ab9393f343..a93ed5d93d8 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 @@ public AllOrAnyExpressionFactory() {
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 ffbb1840667..117658dbd3b 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 @@ public AndExpression(AbstractExpression parent) {
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 0668744a0f0..53df739df4e 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 @@ public AndExpressionFactory() {
super(ID, Expression.AND);
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("null")
protected AbstractExpression buildExpression(AbstractExpression parent,
@@ -105,9 +102,6 @@ private static final class OrExpressionVisitor extends AbstractExpressionVisitor
*/
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 775d22cbb9d..c3f4e63056f 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 @@ public void visit(ExistsExpression expression) {
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 eb17737bba9..1e41d37284d 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 @@ protected ArithmeticExpression(AbstractExpression parent, String identifier) {
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getParent().findQueryBNF(expression);
@@ -59,33 +56,21 @@ public final String getArithmeticSign() {
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 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
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 1467b4bffca..93bcde44f9e 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 @@ public ArithmeticExpressionBNF() {
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 6067823f2bf..c3af9035893 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 @@ private CompoundExpression buildExpression(AbstractExpression parent, char chara
return new DivisionExpression(parent);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
@@ -162,17 +159,11 @@ private static final class ArithmeticExpressionVisitor extends AbstractExpressio
*/
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 bd04c770918..ba041c638f1 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 @@ public ArithmeticFactor(AbstractExpression parent, String arithmeticFactor) {
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 children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -97,9 +85,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -122,17 +107,11 @@ public Expression getExpression() {
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ArithmeticFactorBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean handleAggregate(JPQLQueryBNF queryBNF) {
return false;
@@ -167,9 +146,6 @@ public boolean isNegative() {
return operator == '-';
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.isArithmeticSymbol(wordParser.character()) ||
@@ -185,9 +161,6 @@ public boolean isPositive() {
return operator == '+';
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -200,9 +173,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 4319b5d5a65..30abeca883c 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 @@ public ArithmeticFactorBNF() {
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 00794873fa5..1c91e5435ae 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 @@ public ArithmeticPrimaryBNF() {
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 166ffbfcfc3..bdfecd2a33a 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 @@ public ArithmeticTermBNF() {
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 42fdf6571a9..bfec2fb3292 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 @@ public final class AsOfClause extends AbstractExpression {
private AbstractExpression expression;
/**
- * Determines whether a whitespace was found after either SCN or
+ * Determines whether a whitespace was found after either SCN
or
* TIMESTAMP
.
*/
private boolean hasSpaceAfterCategory;
/**
- * Determines whether a whitespace was found after AS OF .
+ * Determines whether a whitespace was found after AS OF
.
*/
private boolean hasSpaceAfterIdentifier;
@@ -81,33 +81,21 @@ public AsOfClause(AbstractExpression parent) {
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 children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -137,9 +125,6 @@ else if (timestampIdentifier != null) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -193,9 +178,6 @@ public Expression getExpression() {
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(AsOfClauseBNF.ID);
@@ -249,9 +231,6 @@ public boolean hasTimestamp() {
return timestampIdentifier != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -274,9 +253,6 @@ else if (wordParser.startsWithIdentifier(TIMESTAMP)) {
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 745458ca601..4950cfc8bd8 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 @@ public AsOfClauseBNF() {
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 b451931d75f..b12d774a7d8 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 @@ public AsOfClauseFactory() {
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 8466bc6a5bd..5987bcc7bb7 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 @@ public AvgFunction(AbstractExpression parent) {
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 e8146c6d0f1..77b00e3c73a 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 @@ public AvgFunctionFactory() {
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 7d36dd4ecf2..2c3fc8da9ac 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 @@ public BadExpression(AbstractExpression parent, AbstractExpression expression) {
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 children) {
// Don't traverse the invalid expression
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
children.add(buildStringExpression(toParsedText()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getParent().findQueryBNF(expression);
@@ -109,17 +94,11 @@ public Expression getExpression() {
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 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
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 5675f16477a..97723cd9708 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 @@ public BadExpressionBNF() {
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 97f1109410a..4951033e5c3 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 @@ public BadExpressionFactory() {
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 de7e6c49f6a..6bc20ac65eb 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 @@ public BetweenExpression(AbstractExpression parent, AbstractExpression expressio
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getExpression().accept(visitor);
@@ -112,9 +106,6 @@ public void acceptChildren(ExpressionVisitor visitor) {
getUpperBoundExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getExpression());
@@ -122,9 +113,6 @@ protected void addChildrenTo(Collection children) {
children.add(getUpperBoundExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -172,9 +160,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -265,9 +250,6 @@ public Expression getLowerBoundExpression() {
return lowerBoundExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(BetweenExpressionBNF.ID);
@@ -373,9 +355,6 @@ public boolean hasUpperBoundExpression() {
!upperBoundExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.character() == RIGHT_PARENTHESIS ||
@@ -385,9 +364,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -418,9 +394,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 645d51c6af4..5448307b6a3 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 @@ public BetweenExpressionBNF() {
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 7ec41509f43..edefa0e21f7 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 @@ public BetweenExpressionFactory() {
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 7259cc2f137..dc8b687d871 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 @@ public BooleanExpressionBNF() {
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 ba46806ee5b..e5f8a8ed12f 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 @@ public BooleanLiteralBNF() {
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 2bae8894786..afe073e9df9 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 @@ public BooleanPrimaryBNF() {
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 178c4edb4a0..a47ba692e96 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 @@ public CaseExpression(AbstractExpression parent) {
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 @@ public void acceptChildren(ExpressionVisitor visitor) {
getElseExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getCaseOperand());
@@ -128,9 +119,6 @@ protected void addChildrenTo(Collection children) {
children.add(getElseExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -183,9 +171,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -260,9 +245,6 @@ public AbstractExpression getElseExpression() {
return elseExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(GeneralCaseExpressionBNF.ID);
@@ -381,9 +363,6 @@ public boolean hasWhenClauses() {
!whenClauses.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -407,9 +386,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -447,9 +423,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
@@ -503,7 +476,7 @@ protected void toParsedText(StringBuilder writer, boolean actual) {
}
/**
- * 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 562f818eff1..edce92dcc05 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 @@ public CaseExpressionBNF() {
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 f3f8ec6c0d7..f31e232004a 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 @@ public CaseExpressionFactory() {
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 ff5250c7816..d185e3e5ed5 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 @@ public CaseOperandBNF() {
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 6a19576328b..97ae3e8d590 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 @@ public CastExpression(AbstractExpression parent) {
shouldParseWithFactoryFirst = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List children) {
@@ -109,9 +103,6 @@ protected void addOrderedEncapsulatedExpressionTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return ScalarExpressionBNF.ID;
@@ -126,9 +117,6 @@ public Expression getDatabaseType() {
return databaseType;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(CastExpressionBNF.ID);
@@ -153,9 +141,6 @@ public boolean hasDatabaseType() {
!databaseType.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return super.hasEncapsulatedExpression() || (asIdentifier != null) || hasDatabaseType();
@@ -192,9 +177,6 @@ public boolean hasSpaceAfterExpression() {
return hasSpaceAfterExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -214,9 +196,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -246,9 +225,6 @@ protected void parseEncapsulatedExpression(WordParser wordParser,
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
super.removeEncapsulatedExpression();
@@ -258,17 +234,11 @@ protected void removeEncapsulatedExpression() {
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 89a70bd3d8d..ad8027815ce 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 @@ public CastExpressionBNF() {
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 26c2d133a2c..e4f564761ee 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 @@ public CastExpressionFactory() {
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 e663269a258..7c4cda28c4c 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 @@ public CoalesceExpression(AbstractExpression parent) {
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 9bcfab4ceea..47e8ff73115 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 @@ public CoalesceExpressionBNF() {
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 bf0b9021471..66cfb0bf8ea 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 @@ public CoalesceExpressionFactory() {
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 0e5edb2bfc2..70ce155f1b3 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 @@ public CollectionExpression(AbstractExpression parent,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
@@ -114,9 +111,6 @@ public void accept(int index, ExpressionVisitor visitor) {
getChild(index).accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
for (Expression child : children()) {
@@ -124,9 +118,6 @@ public void acceptChildren(ExpressionVisitor visitor) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
@@ -138,9 +129,6 @@ protected void addChildrenTo(Collection children) {
children.addAll(this.children);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -208,9 +196,6 @@ public boolean endsWithSpace() {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
return getParent().findQueryBNF(expression);
@@ -238,9 +223,6 @@ private AbstractExpression getChildInternal(int index) {
return child;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getParent().getQueryBNF();
@@ -285,9 +267,6 @@ public int indexOf(Expression expression) {
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 @@ public String toParsedText(int endIndex) {
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 df95f577efd..e48ccdbd015 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 @@ public CollectionMemberDeclaration(AbstractExpression parent) {
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 children) {
children.add(getCollectionValuedPathExpression());
children.add(getIdentificationVariable());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -171,9 +159,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -234,9 +219,6 @@ public Expression getIdentificationVariable() {
return identificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(CollectionMemberDeclarationBNF.ID);
@@ -342,9 +324,6 @@ public boolean isDerived() {
!hasIdentificationVariable();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.character() == RIGHT_PARENTHESIS ||
@@ -352,9 +331,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -445,9 +421,6 @@ protected void parse(WordParser wordParser, boolean 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/CollectionMemberDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberDeclarationBNF.java
index fe8c9b2a525..8edafeafeb8 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 @@ public CollectionMemberDeclarationBNF() {
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 0788fb462d2..360cbd01388 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 @@ public CollectionMemberDeclarationFactory() {
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 3b40f9df119..2bda1dfa0fc 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 @@ public CollectionMemberExpression(AbstractExpression parent, AbstractExpression
}
}
- /**
- * {@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 children) {
children.add(getEntityExpression());
children.add(getCollectionValuedPathExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -158,9 +146,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -253,9 +238,6 @@ public String getIdentifier() {
return MEMBER;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(CollectionMemberExpressionBNF.ID);
@@ -318,9 +300,6 @@ public boolean hasSpaceAfterOf() {
return hasSpaceAfterOf;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -349,9 +328,6 @@ protected void parse(WordParser wordParser, boolean 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/CollectionMemberExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/CollectionMemberExpressionBNF.java
index 8750d72fe09..66fb3e232ea 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 @@ public CollectionMemberExpressionBNF() {
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 ca91d9489d3..2243daed572 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 @@ public CollectionMemberExpressionFactory() {
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 cdab828f0ce..e9a0e092bb4 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 @@ public CollectionValuedPathExpression(AbstractExpression parent, String paths) {
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 183d31f20d3..4d47baa09bb 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 @@ public CollectionValuedPathExpressionBNF() {
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 17594a6bb27..fe0dc5fc91e 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 @@ public CollectionValuedPathExpressionFactory() {
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
@@ -52,9 +49,6 @@ protected AbstractExpression buildExpression(AbstractExpression parent,
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 b718f099ffe..d1e2daaf5a7 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 @@ public ComparisonExpression(AbstractExpression parent, String identifier) {
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
@@ -83,33 +80,21 @@ public String getComparisonOperator() {
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 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
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 6fdfb5bab9c..7cad2ad6d3a 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 @@ public ComparisonExpressionBNF() {
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 24f707b41f0..7744d1762e2 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 @@ public ComparisonExpressionFactory() {
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 cf2a8f3057d..957c25f5820 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 @@ protected CompoundExpression(AbstractExpression parent, String identifier) {
super(parent, identifier);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getLeftExpression().accept(visitor);
getRightExpression().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addChildrenTo(Collection children) {
children.add(getLeftExpression());
children.add(getRightExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void addOrderedChildrenTo(List children) {
@@ -106,9 +97,6 @@ protected final void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -214,9 +202,6 @@ public final boolean hasSpaceAfterIdentifier() {
return hasSpaceAfterIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
protected final void parse(WordParser wordParser, boolean tolerant) {
@@ -267,9 +252,6 @@ protected final void setRightExpression(AbstractExpression rightExpression) {
}
}
- /**
- * {@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 9999d6f21c8..060eb53645c 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 @@ public ConcatExpression(AbstractExpression parent) {
super(parent, CONCAT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
@@ -74,17 +71,11 @@ public CollectionExpression buildCollectionExpression() {
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 f22d63bc8fd..0a7dc70d83e 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 @@ public ConcatExpressionFactory() {
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 e2883bc179d..d0709827792 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 @@ public ConditionalExpressionBNF() {
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 dcb48625b23..9f14d7fd6f8 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 @@ public ConditionalFactorBNF() {
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 16518f68a7a..cce9d34242a 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 @@ public ConditionalPrimaryBNF() {
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 977c3c991bc..bec4ae998e0 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 @@ public ConditionalTermBNF() {
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 9c4a86b34c5..fdc40631f1b 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 @@ public ConnectByClause(AbstractExpression parent) {
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 children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -99,9 +87,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -135,9 +120,6 @@ public Expression getExpression() {
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ConnectByClauseBNF.ID);
@@ -164,9 +146,6 @@ public boolean hasSpaceAfterConnectBy() {
return hasSpaceAfterConnectBy;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -179,9 +158,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 ab4bf189a97..0c364d9ae86 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 @@ public ConnectByClauseBNF() {
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 cb2ded7df5f..e935577ae07 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 @@ public ConnectByClauseFactory() {
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 692aa13d7d5..9e03342491a 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 @@ public ConstructorExpression(AbstractExpression parent) {
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 children) {
children.add(getConstructorItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -159,9 +147,6 @@ public CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -204,9 +189,6 @@ public Expression getConstructorItems() {
return constructorItems;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ConstructorExpressionBNF.ID);
@@ -253,18 +235,12 @@ public boolean hasSpaceAfterNew() {
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 @@ protected void parse(WordParser wordParser, boolean 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/ConstructorExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ConstructorExpressionBNF.java
index 15e49cfadf3..05b2f418545 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 @@ public ConstructorExpressionBNF() {
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 31018485611..039a6b94d66 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 @@ public ConstructorExpressionFactory() {
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 0fd1fc5f94c..11eb420ce53 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 @@ public ConstructorItemBNF() {
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 345b0974b42..79c902edd02 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 @@ public CountFunction(AbstractExpression parent) {
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 @@ protected AbstractExpression buildEncapsulatedExpression(WordParser wordParser,
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 597d3405f1e..29ada19259c 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 @@ public CountFunctionFactory() {
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 658fca6ec0d..cac8553184a 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 @@ public DatabaseType(AbstractExpression parent, String databaseType) {
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 2214c83b3b7..4caa99f1727 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 @@ public DatabaseTypeFactory() {
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 97eb1b4afa3..77f55e39c80 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 @@ public DatabaseTypeQueryBNF() {
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 ac0b9cc7cdc..1d62b428155 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 @@ public DateTime(AbstractExpression parent) {
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 children) {
children.add(buildStringExpression(getText()));
@@ -87,17 +78,11 @@ public String getActualIdentifier() {
return identifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningDatetimeBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getText() {
return super.getText();
@@ -148,9 +133,6 @@ public boolean isJDBCDate() {
return getText().charAt(0) == LEFT_CURLY_BRACKET;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -204,25 +186,16 @@ private void parseJDBCEscapeFormat(WordParser wordParser) {
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 98b0ff571e1..d02cc9b9ca5 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 @@ public DateTimeFactory() {
"{");
}
- /**
- * {@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 5f584ea6a98..46d383001bc 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 @@ public DateTimePrimaryBNF() {
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 786d535b804..774ce129079 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 @@ public DateTimeTimestampLiteralBNF() {
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 84add30bf29..22b39d58288 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 @@ public DatetimeExpressionBNF() {
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 e6952df1691..17d5a904692 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 @@ public static JPQLGrammar instance() {
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 d5270eb6d37..be1464a39ff 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 @@ public static JPQLGrammar instance() {
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 3112acc4786..ee73e539b83 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 @@ public final class DefaultStringExpression extends AbstractExpression {
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 e6c29df60c2..a41d14d49c3 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 @@ public DeleteClause(AbstractExpression parent) {
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 children) {
children.add(getRangeVariableDeclaration());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -143,9 +131,6 @@ public CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -178,9 +163,6 @@ public String getActualFromIdentifier() {
return (fromIdentifier != null) ? fromIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(DeleteClauseBNF.ID);
@@ -237,9 +219,6 @@ public boolean hasSpaceAfterFrom() {
return hasSpaceAfterFrom;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -268,9 +247,6 @@ protected void parse(WordParser wordParser, boolean 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/DeleteClauseBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/DeleteClauseBNF.java
index 750dcd6aa22..ce1545c7d34 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 @@ public DeleteClauseBNF() {
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 e584637953d..ce5bc59949e 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 @@ public DeleteClauseFactory() {
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 efff4e74bea..c0c08beba65 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 @@ public DeleteClauseRangeVariableDeclarationBNF() {
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 e8e7bf3d757..5130ecfff13 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 @@ public DeleteStatement(AbstractExpression parent) {
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 children) {
children.add(getDeleteClause());
@@ -88,9 +79,6 @@ public DeleteClause addDeleteClause() {
return deleteClause = new DeleteClause(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -103,9 +91,6 @@ protected void addOrderedChildrenTo(List children) {
children.add(whereClause);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -129,9 +114,6 @@ public DeleteClause getDeleteClause() {
return deleteClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(DeleteStatementBNF.ID);
@@ -170,9 +152,6 @@ public boolean hasWhereClause() {
!whereClause.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -192,9 +171,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 c54dac10db4..e9da51457ae 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 @@ public DeleteStatementBNF() {
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 c0380129042..c51e3d8a610 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 @@ public DeleteStatementFactory() {
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 32c1bc39733..12cf570c423 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 @@ public DerivedCollectionMemberDeclarationBNF() {
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 ce2ffca4818..ce2eed345b8 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 @@ public DivisionExpression(AbstractExpression parent) {
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 4afc085ef42..d3a9399e3ec 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 566abf3a053..495767ebbef 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 @@ public static JPQLGrammar instance() {
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 f9f53103fbc..96c3123f2c4 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 @@ public EclipseLinkJPQLGrammar2_0() {
super();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getProvider() {
return DefaultEclipseLinkJPQLGrammar.PROVIDER_NAME;
@@ -97,33 +94,21 @@ public static JPQLGrammar instance() {
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 @@ protected void initializeBNFs() {
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 95babb10c25..c5665bdc765 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 @@ public static JPQLGrammar instance() {
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
@@ -145,33 +142,21 @@ protected JPQLGrammar buildBaseGrammar() {
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 @@ protected void initializeBNFs() {
addChildBNF(PatternValueBNF.ID, ArithmeticExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -221,9 +203,6 @@ protected void initializeExpressionFactories() {
registerFactory(new TreatExpressionFactory());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -239,9 +218,6 @@ protected void initializeIdentifiers() {
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 061f0d0308c..7c8ec70ebe0 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 @@ public static JPQLGrammar instance() {
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 356d5e64f61..b4d649fc345 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 @@ public static JPQLGrammar instance() {
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 0d2986ec25d..15ac6fbc062 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 @@ public static JPQLGrammar instance() {
return INSTANCE;
}
- /**
- * {@inheritDoc}
- */
@Override
protected JPQLGrammar buildBaseGrammar() {
@@ -155,33 +152,21 @@ protected JPQLGrammar buildBaseGrammar() {
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 @@ protected void initializeBNFs() {
setHandleSubExpression(RangeVariableDeclarationBNF.ID, true);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -268,9 +250,6 @@ protected void initializeExpressionFactories() {
setFallbackExpressionFactoryId(JoinAssociationPathExpressionBNF.ID, JoinCollectionValuedPathExpressionFactory.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -313,9 +292,6 @@ protected void initializeIdentifiers() {
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 bc48caf8a2e..319e65874a9 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 @@ public static JPQLGrammar instance() {
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 @@ protected void initializeBNFs() {
addChildBNF(InExpressionExpressionBNF.ID, ScalarExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -174,9 +156,6 @@ protected void initializeExpressionFactories() {
registerFactory(new StartWithClauseFactory());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -200,9 +179,6 @@ protected void initializeIdentifiers() {
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 f7a12908b5f..0e7aaa16dc0 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 @@ public static JPQLGrammar instance() {
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 07b301610f8..628051ef716 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 @@ public ElseExpressionBNF() {
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 f7c37de30ba..bcffa8bafa9 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 @@ public EmptyCollectionComparisonExpression(AbstractExpression parent, AbstractEx
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 children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -146,9 +134,6 @@ private StateFieldPathToCollectionValuedPathConverter buildConverter(AbstractExp
return new StateFieldPathToCollectionValuedPathConverter(this, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -228,9 +213,6 @@ public String getIdentifier() {
return EMPTY;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(EmptyCollectionComparisonExpressionBNF.ID);
@@ -264,9 +246,6 @@ public boolean hasSpaceAfterIs() {
return hasSpaceAfterIs;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -308,9 +287,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
@@ -381,9 +357,6 @@ private static class StateFieldPathToCollectionValuedPathConverter extends Abstr
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 b95c4134248..42e8cf01603 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 @@ public EmptyCollectionComparisonExpressionBNF() {
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 c7f7e63e380..86d4ac6ec03 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 @@ protected EncapsulatedIdentificationVariableExpression(AbstractExpression parent
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 dd51ad14a85..3c2a96d27bf 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 @@ public EntityExpressionBNF() {
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 f02107f782d..0dfb1f6dac7 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 @@ public EntityOrValueExpressionBNF() {
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 c56109956a9..2d93a9b93d0 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 @@ public EntityTypeExpressionBNF() {
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 a9ead5b7167..7973e0e77f9 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 @@ public EntityTypeLiteral(AbstractExpression parent, String entityTypeName) {
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 children) {
children.add(buildStringExpression(getText()));
@@ -69,33 +60,21 @@ public String getEntityTypeName() {
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 e10e769d2a8..97db65c05dc 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 @@ public EntityTypeLiteralBNF() {
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 3d73d2739fd..1a344b3ae12 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 @@ public EntityTypeLiteralFactory() {
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 843c1cf86b1..26c69aa8dc7 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 @@ public EntryExpression(AbstractExpression parent) {
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 eaecce0b509..c2d146fd2e1 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 @@ public EntryExpressionFactory() {
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 63a344c2bf4..c7a0b4b87b0 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 @@ public EnumExpressionBNF() {
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 01bfdd727e3..1e98439eb5d 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 @@ public EnumLiteralBNF() {
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 47f2d29d8f1..4a9a4dd4656 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 @@ public EnumPrimaryBNF() {
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 1ba9550e996..d7956cae3ad 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 @@ public ExistsExpression(AbstractExpression parent) {
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 @@ public String getActualNotIdentifier() {
return (notIdentifier != null) ? notIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ExistsExpressionBNF.ID);
@@ -88,9 +79,6 @@ public boolean hasNot() {
return (notIdentifier != null);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -104,9 +92,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 41767ef71e0..b199a2349e7 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 @@ public ExistsExpressionBNF() {
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 df979620c1c..19abd5f2854 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 @@ public ExistsExpressionFactory() {
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 8a27aaf699e..9446a56fbba 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 @@ void addIdentifier(String identifier) {
/**
* 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 @@ protected abstract AbstractExpression buildExpression(AbstractExpression parent,
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 @@ public final String getId() {
return id;
}
- /**
- * {@inheritDoc}
- */
@Override
public final int hashCode() {
return id.hashCode();
@@ -185,9 +176,6 @@ final void setExpressionRegistry(ExpressionRegistry expressionRegistry) {
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 01a2ebdb98f..ae1613cc791 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 @@ protected ExpressionVisitor getDelegate() {
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 f6fe7c08746..35e89b9c7c7 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 @@ public ExtractExpression(AbstractExpression parent) {
super(parent, EXTRACT);
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
acceptUnknownVisitor(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List children) {
@@ -103,9 +97,6 @@ protected void addOrderedEncapsulatedExpressionTo(List children) {
super.addOrderedEncapsulatedExpressionTo(children);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return ScalarExpressionBNF.ID;
@@ -132,9 +123,6 @@ public String getDatePart() {
return datePart;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ExtractExpressionBNF.ID);
@@ -149,9 +137,6 @@ public boolean hasDatePart() {
return ExpressionTools.stringIsNotEmpty(datePart);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasDatePart() || (fromIdentifier != null) || hasExpression();
@@ -185,18 +170,12 @@ public boolean hasSpaceAfterFrom() {
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 @@ protected void parseEncapsulatedExpression(WordParser wordParser,
super.parseEncapsulatedExpression(wordParser, whitespaceCount, tolerant);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
super.removeEncapsulatedExpression();
@@ -248,9 +224,6 @@ protected void removeEncapsulatedExpression() {
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 245e86b3aae..2ebfb406b1e 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 @@ public ExtractExpressionBNF() {
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 2986c53ffbb..5a163041676 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 @@ public ExtractExpressionFactory() {
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 6a87363a268..40b84b6c2dd 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 @@ public FromClause(AbstractExpression parent) {
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 12d2d360a82..99f819ca686 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 @@ public FromClauseBNF() {
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 fd7a25bf844..c0b262552d8 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 @@ public FromClauseFactory() {
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 53221969d42..360c5755a50 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 @@ private GeneralIdentificationVariableVisitor generalIdentificationVariableVisito
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 @@ public void visit(DeleteStatement expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -106,17 +88,11 @@ public void visit(IdentificationVariable expression) {
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 @@ public void visit(RangeVariableDeclaration expression) {
}
}
- /**
- * {@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 @@ public void visit(UpdateClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
@@ -205,25 +166,16 @@ private static final class GeneralIdentificationVariableVisitor extends Abstract
*/
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 fd70e4decf6..d82b61fc781 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 @@ public FunctionExpression(AbstractExpression parent,
this.parameterQueryBNFId = parameterQueryBNFId;
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List children) {
@@ -120,9 +114,6 @@ protected void addOrderedEncapsulatedExpressionTo(List children) {
super.addOrderedEncapsulatedExpressionTo(children);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return parameterQueryBNFId;
@@ -148,9 +139,6 @@ public ParameterCount getParameterCount() {
return parameterCount;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionExpressionBNF.ID);
@@ -175,9 +163,6 @@ public boolean hasComma() {
return hasComma;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasFunctionName() || hasComma || super.hasEncapsulatedExpression();
@@ -201,9 +186,6 @@ public boolean hasSpaceAfterComma() {
return hasSpaceAfterComma;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -248,9 +230,6 @@ protected void parseEncapsulatedExpression(WordParser wordParser,
}
}
- /**
- * {@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 a8b509945e9..316ad66cfb0 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 @@ public FunctionExpressionBNF() {
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 a3896567f3f..ba2323edff0 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 @@ public FunctionExpressionFactory(String id, String... identifiers) {
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 4c6f4993c15..6bbd16647be 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 @@ public FunctionItemBNF() {
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 7cec68300eb..faadf408559 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 @@ public FunctionsReturningDatetimeBNF() {
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 8263f791bfd..487c17a93ec 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 @@ public FunctionsReturningNumericsBNF() {
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 7903417d1ef..f5d11a8479c 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 @@ public FunctionsReturningStringsBNF() {
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 daf86fab857..d5c3342fc01 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 @@ public GeneralCaseExpressionBNF() {
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 b5b62a11c01..23862098683 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 @@ public GeneralIdentificationExpressionFactory(String id, String identifier) {
*/
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 a7502d45057..707d460301e 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 @@ public GeneralIdentificationVariableBNF() {
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 3e111a8728c..1fd6654195f 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 @@ public GroupByClause(AbstractExpression parent) {
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 children) {
children.add(getGroupByItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -116,9 +104,6 @@ public CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -151,9 +136,6 @@ public Expression getGroupByItems() {
return groupByItems;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(GroupByClauseBNF.ID);
@@ -178,9 +160,6 @@ public boolean hasSpaceAfterGroupBy() {
return hasSpace;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -193,9 +172,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 2c682a730fd..1d14625f937 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 @@ public GroupByClauseBNF() {
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 ba50398e222..4a92bcf4d99 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 @@ public GroupByClauseFactory() {
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 e524aa6523d..2a9f96b3c45 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 @@ public GroupByItemBNF() {
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 2dabc2a8d65..3729dcb82ae 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 @@ public GroupByItemFactory() {
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 de497b843b4..0a8ca8be6fa 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 @@ public HavingClause(AbstractExpression parent) {
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 b6f772d78f1..185f3f39add 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 @@ public HavingClauseBNF() {
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 6d24446bd10..3f4ba14de5a 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 @@ public HavingClauseFactory() {
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 5b9bcedf5f6..8abe6cdf9d0 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 @@ public HierarchicalQueryClause(AbstractExpression parent) {
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 @@ public void acceptChildren(ExpressionVisitor visitor) {
getOrderSiblingsByClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
super.addChildrenTo(children);
@@ -103,9 +94,6 @@ protected void addChildrenTo(Collection children) {
children.add(getOrderSiblingsByClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -133,9 +121,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -178,9 +163,6 @@ public Expression getOrderSiblingsByClause() {
return orderSiblingsByClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(HierarchicalQueryClauseBNF.ID);
@@ -250,9 +232,6 @@ public boolean hasStartWithClause() {
!startWithClause.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -298,9 +277,6 @@ else if (hasSpaceAfterConnectByClause &&
}
}
- /**
- * {@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 03ce18fd281..bf47749903c 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 @@ public HierarchicalQueryClauseBNF() {
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 526528ddf06..4750bb5220f 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 @@ public HierarchicalQueryClauseFactory() {
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 c39146244db..5c2a88da9c0 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 @@ public IdentificationVariable(AbstractExpression parent, String identificationVa
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 children) {
children.add(buildStringExpression(getText()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(IdentificationVariableBNF.ID);
@@ -157,9 +145,6 @@ public StateFieldPathExpression getStateFieldPathExpression() {
return stateFieldPathExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public String getText() {
return super.getText();
@@ -178,17 +163,11 @@ public String getVariableName() {
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 @@ public void setVirtualIdentificationVariable(String variableName) {
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 8ac4d4d29bf..a2af423681d 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 @@ public IdentificationVariableBNF() {
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 c2fe3b5afd1..bdc25579a17 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 @@ public IdentificationVariableDeclaration(AbstractExpression parent) {
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 children) {
children.add(getRangeVariableDeclaration());
children.add(getJoins());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -130,9 +118,6 @@ public CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -159,9 +144,6 @@ public Expression getJoins() {
return joins;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(IdentificationVariableDeclarationBNF.ID);
@@ -212,9 +194,6 @@ public boolean hasSpace() {
return hasSpace;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -235,9 +214,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -268,17 +244,11 @@ protected void parse(WordParser wordParser, boolean tolerant) {
}
}
- /**
- * {@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 b93bd399894..830a575d032 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 @@ public IdentificationVariableDeclarationBNF() {
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 35813320f64..1b6865cf58f 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 @@ public IdentificationVariableDeclarationFactory() {
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 ae09ac1ed33..2b4432ca330 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 @@ public IdentificationVariableFactory() {
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 31f54ae2fb9..b17d915d72d 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 @@ public InExpression(AbstractExpression parent, AbstractExpression expression) {
}
}
- /**
- * {@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 children) {
children.add(getExpression());
children.add(getInItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -185,9 +173,6 @@ else if (hasSpaceAfterIn) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -276,9 +261,6 @@ public Expression getInItems() {
return inItems;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(InExpressionBNF.ID);
@@ -346,9 +328,6 @@ public boolean hasSpaceAfterIn() {
return hasSpaceAfterIn;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(AND) ||
@@ -386,9 +365,6 @@ public boolean isSingleInputParameter() {
return singleInputParameter;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -437,9 +413,6 @@ protected void parse(WordParser wordParser, boolean 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/InExpressionBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/InExpressionBNF.java
index 9cee4812680..fc620205741 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 @@ public InExpressionBNF() {
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 5f1751d022c..ae29032ceb9 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 @@ public InExpressionExpressionBNF() {
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 a9fb84c2094..fd66f3b19cf 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 @@ public InExpressionFactory() {
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 0d2b28baf30..19b3a773f43 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 @@ public InExpressionItemBNF() {
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 be3713b582a..41bf8d88829 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 @@ public IndexExpression(AbstractExpression parent) {
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 83a4fd3a28e..980959a7420 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 @@ public IndexExpressionFactory() {
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 0151c8204bb..d4a08d40aa2 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 @@ public InputParameter(AbstractExpression parent, String parameter) {
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 children) {
children.add(buildStringExpression(getText()));
@@ -97,9 +88,6 @@ public String getParameterName() {
return parameterName;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(InputParameterBNF.ID);
@@ -129,33 +117,21 @@ public boolean isPositional() {
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 ff67f55f2f4..a206edc1314 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 @@ public InputParameterBNF() {
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 9c486b5c8b9..b668c4802ab 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 @@ public InternalAggregateFunctionBNF() {
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 5f38120b093..7d5c704eb8e 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 @@ public InternalBetweenExpressionBNF() {
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 8a07d1d4282..3ab1c5c472d 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 @@ public InternalCoalesceExpressionBNF() {
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 0f926e0702e..6ce96be4b8f 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 @@ public InternalColumnExpressionBNF() {
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 f01fbfd557d..76c5d04cc8d 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 @@ public InternalConcatExpressionBNF() {
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 edd3c465cb2..ae676e17b1c 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 @@ public InternalConnectByClauseBNF() {
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 fda029d2f0c..74dc35e3c80 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 @@ public InternalCountBNF() {
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 528910e1694..6f5caba83db 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 @@ public InternalEntityTypeExpressionBNF() {
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 bebb8141e80..1856e148eb9 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 @@ public InternalFromClauseBNF() {
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 507af04db3a..f855ddbe943 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 @@ public InternalJoinBNF() {
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 7f032722f18..df30b585475 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 @@ public InternalLengthExpressionBNF() {
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 828a8e5e5eb..69942bf6f21 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 @@ public InternalLocateStringExpressionBNF() {
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 9917dc72354..003141a2dfe 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 @@ public InternalLocateThirdExpressionBNF() {
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 d6aa6d0f601..1e51d08aa53 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 @@ public InternalLowerExpressionBNF() {
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 adf234a768c..457211ed896 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 @@ public InternalModExpressionBNF() {
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 9ccabb91365..9b309a2c05d 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 @@ public InternalOrderByClauseBNF() {
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 f6895f6fc9e..751788f4a8f 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 @@ public InternalOrderByItemBNF() {
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 ef1530f1c0a..7fb621465b1 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 @@ public InternalOrderByItemFactory() {
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 15b5e53594d..7eac14c8ccf 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 @@ public InternalSelectExpressionBNF() {
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 e0ab253ed83..ca6c49700a6 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 @@ public InternalSimpleFromClauseBNF() {
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 8d10175d638..eeb9aa4d410 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 @@ public InternalSimpleSelectExpressionBNF() {
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 68c3907bf24..72b91a59179 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 @@ public InternalSqrtExpressionBNF() {
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 2b8d97ad18d..e1f08dacc70 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 @@ public InternalSubstringPositionExpressionBNF() {
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 bb8cdcb02c4..a60c9ac325f 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 @@ public InternalSubstringStringExpressionBNF() {
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 97f85f5ea22..6499f6be245 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 @@ public InternalUpdateClauseBNF() {
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 8df4530f977..7d82afb2489 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 @@ public InternalUpperExpressionBNF() {
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 b04db345070..afa79a7f8b9 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 @@ public InternalWhenClauseBNF() {
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 d8711f68652..b489b797bfb 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 @@ public IsExpressionFactory() {
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 f2b3c6904f8..bbeadc05a1d 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 @@ public final class JPQLExpression extends AbstractExpression {
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 @@ private JPQLExpression(JPQLGrammar jpqlGrammar, String queryBNFId, boolean toler
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 children) {
children.add(getQueryStatement());
children.add(getUnknownEndingStatement());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -204,25 +192,16 @@ public Expression getExpression(String actualQuery, int position) {
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 @@ public boolean hasUnknownEndingStatement() {
!unknownEndingStatement.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isTolerant() {
return tolerant;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -342,9 +315,6 @@ else if (queryStatement.isUnknown()) {
}
}
- /**
- * {@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 b605ea5fba5..631a486f6f2 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 @@ public static JPQLGrammar instance() {
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 @@ protected void initializeBNFs() {
registerBNF(new WhereClauseBNF());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -506,9 +488,6 @@ protected void initializeExpressionFactories() {
registerFactory(new WhereClauseFactory());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -617,9 +596,6 @@ protected void initializeIdentifiers() {
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 e26f05fedf1..7c22a40cb9a 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 @@ public static JPQLGrammar instance() {
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 @@ protected void initializeBNFs() {
addChildBNF(StringPrimaryBNF.ID, CaseExpressionBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -486,9 +468,6 @@ protected void initializeExpressionFactories() {
setFallbackExpressionFactoryId(InExpressionItemBNF.ID, EntityTypeLiteralFactory.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -519,9 +498,6 @@ protected void initializeIdentifiers() {
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 ee573c62590..c7c23177dd9 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 @@ public static JPQLGrammar instance() {
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 @@ protected void initializeBNFs() {
addChildBNF(EnumExpressionBNF.ID, SubqueryBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeExpressionFactories() {
@@ -507,9 +489,6 @@ protected void initializeExpressionFactories() {
registerFactory(new TreatExpressionFactory());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void initializeIdentifiers() {
@@ -522,9 +501,6 @@ protected void initializeIdentifiers() {
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 34fcba1905d..34f02a5b9c0 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 @@ public abstract class JPQLQueryBNF {
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 JPQLQueryBNF
.
*/
private static final Filter nonCompoundFilter = buildNonCompoundFilter();
@@ -753,9 +753,6 @@ public void setHandleSubExpression(boolean handleSubExpression) {
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 4fc81c750ac..3ac1cbce653 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 @@ public JPQLStatementBNF() {
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 1a634be6ce9..3119f78f1ab 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 @@ public Join(AbstractExpression parent, String identifier) {
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 @@ public void acceptChildren(ExpressionVisitor visitor) {
getOnClause().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getJoinAssociationPath());
@@ -132,9 +123,6 @@ protected void addChildrenTo(Collection children) {
children.add(getOnClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -190,9 +178,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -278,9 +263,6 @@ public Expression getOnClause() {
return onClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(JoinBNF.ID);
@@ -396,9 +378,6 @@ public boolean isLeftJoin() {
identifier == LEFT_OUTER_JOIN_FETCH;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -418,9 +397,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -511,9 +487,6 @@ else if (wordParser.startsWithIdentifier(ON)) {
}
}
- /**
- * {@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 847b4219b9e..5dad365948b 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 @@ public JoinAssociationPathExpressionBNF() {
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 4e65c6aeb8d..966ca9e47dc 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 @@ public JoinBNF() {
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 56c1e12a16e..992756b4b2e 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 @@ public JoinCollectionValuedPathExpressionFactory() {
super(ID);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
@@ -52,9 +49,6 @@ protected AbstractExpression buildExpression(AbstractExpression parent,
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 e226e56ccbf..26861d2467e 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 @@ public JoinFactory() {
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 2a539418e19..b34d70190c2 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 @@ public KeyExpression(AbstractExpression parent) {
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 3f244ed225d..9bdaa37931e 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 @@ public KeyExpressionFactory() {
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 d09472ace28..88a24a1fd6a 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 @@ public KeywordExpression(AbstractExpression parent, String identifier) {
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 children) {
children.add(buildStringExpression(getText()));
@@ -77,33 +68,21 @@ public String getActualIdentifier() {
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 3d9edb8338f..f5535c9f2e8 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 @@ public KeywordExpressionFactory() {
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 0fa9dd48770..b012ac87425 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 @@ public LengthExpression(AbstractExpression parent) {
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 0044e773523..b6aa05a11ba 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 @@ public LengthExpressionFactory() {
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 2de019b5470..ab9671f5638 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 @@ public LikeExpression(AbstractExpression parent, AbstractExpression stringExpres
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accept(ExpressionVisitor visitor) {
visitor.visit(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void acceptChildren(ExpressionVisitor visitor) {
getStringExpression().accept(visitor);
@@ -118,9 +112,6 @@ public void acceptChildren(ExpressionVisitor visitor) {
getEscapeCharacter().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
children.add(getStringExpression());
@@ -128,9 +119,6 @@ protected void addChildrenTo(Collection children) {
children.add(getEscapeCharacter());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -178,9 +166,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -261,9 +246,6 @@ public Expression getPatternValue() {
return patternValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(LikeExpressionBNF.ID);
@@ -367,9 +349,6 @@ public boolean hasStringExpression() {
!stringExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -388,9 +367,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
expression != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -455,9 +431,6 @@ else if (ExpressionTools.isParameter(character)) {
}
}
- /**
- * {@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 649ca7f5769..e61e0d84900 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 @@ public LikeExpressionBNF() {
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 112f9cbb073..89dd24e9a7e 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 @@ public LikeExpressionEscapeCharacterBNF() {
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 5faee558bbb..de40f960ab8 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 @@ public LikeExpressionFactory() {
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 5c7d574970a..6d88bc96751 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 @@ public LiteralBNF() {
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 3afdc239896..af5f6a6e235 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 @@ public LiteralExpressionFactory() {
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 669c9babdf8..315c9014b2d 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 @@ public LocateExpression(AbstractExpression parent) {
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 @@ public String getParameterQueryBNFId(int index) {
}
}
- /**
- * {@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 a0c90a48f06..875d422ac77 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 @@ public LocateExpressionFactory() {
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 748d596219f..37e05470bc9 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 @@ protected LogicalExpression(AbstractExpression parent, String identifier) {
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 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
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 632a4ff1d13..04d6a043386 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 @@ public LowerExpression(AbstractExpression parent) {
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 c0dbe52dae2..cc39edf8a07 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 @@ public LowerExpressionFactory() {
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 cefdfd8c073..d67cfb18880 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 @@ public MaxFunction(AbstractExpression parent) {
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 df7d7b9793c..185ce0bc3a3 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 @@ public MaxFunctionFactory() {
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 364e6223fc4..e134fb5509d 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 @@ public MinFunction(AbstractExpression parent) {
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 0f437d62439..df2b47f4f5e 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 @@ public MinFunctionFactory() {
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 abe0e4c1fe5..fb50ba77577 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 @@ public ModExpression(AbstractExpression parent) {
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 75552c5ee21..1e17a722ef8 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 @@ public ModExpressionFactory() {
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 125497b6785..7998f21d3dc 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 @@ public MultiplicationExpression(AbstractExpression parent) {
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 24257847693..45c890edd65 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 @@ public NewValueBNF() {
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 eafa85b82ab..b271c95afee 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 @@ public NotExpression(AbstractExpression parent) {
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 children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -93,9 +81,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -128,9 +113,6 @@ public Expression getExpression() {
return expression;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ConditionalPrimaryBNF.ID);
@@ -157,9 +139,6 @@ public boolean hasSpaceAfterNot() {
return hasSpaceAfterNot;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return wordParser.startsWithIdentifier(AND) ||
@@ -167,9 +146,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
identifier = wordParser.moveForward(NOT);
@@ -177,9 +153,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 a82f705265d..1f610aabf8e 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 @@ public NotExpressionFactory() {
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 d04c42a2c3c..8cd61542d01 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 @@ public NullComparisonExpression(AbstractExpression 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 children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -110,9 +98,6 @@ protected void addOrderedChildrenTo(List children) {
children.add(buildStringExpression(getIdentifier()));
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -175,9 +160,6 @@ public String getIdentifier() {
return (notIdentifier != null) ? IS_NOT_NULL : IS_NULL;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(NullComparisonExpressionBNF.ID);
@@ -203,9 +185,6 @@ public boolean hasNot() {
return notIdentifier != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -228,9 +207,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 970e895a5d0..68c0848a35a 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 @@ public NullComparisonExpressionBNF() {
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 fd8c3b01bda..c1132fb1591 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 @@ public NullExpression(AbstractExpression parent) {
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 2946fc1563b..4a55366c484 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 @@ public NullIfExpression(AbstractExpression parent) {
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 36011ac3377..9b154887c94 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 @@ public NullIfExpressionBNF() {
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 de45683a913..20bbe705577 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 @@ public NullIfExpressionFactory() {
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 f961ee57931..5098eb60d06 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 @@ public NumericLiteral(AbstractExpression parent, String numeric) {
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 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 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 c83a68596a3..23b302b83d1 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 @@ public NumericLiteralBNF() {
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 e63d474ee4c..668bc914ccc 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 @@ public ObjectExpression(AbstractExpression parent) {
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 216f73c2e6e..1792f4d64a4 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 @@ public ObjectExpressionBNF() {
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 7eb5eebc0ae..c627c4afe36 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 @@ public ObjectExpressionFactory() {
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 002d6150b15..e9726dd2b75 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 @@ public OnClause(AbstractExpression parent) {
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 506664bdeb7..337009791e8 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 @@ public OnClauseBNF() {
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 b7e0c687701..1c298dd4c05 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 @@ public OnClauseFactory() {
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 b2814d901f3..608ecf22443 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 @@ public OrExpression(AbstractExpression parent) {
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 2a07a2318d9..0de7a1c3164 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 @@ public OrExpressionFactory() {
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 2fda3904471..332dd6bf43d 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 @@ public OrderByClause(AbstractExpression parent) {
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 24c7b430fd4..cce2be13fe0 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 @@ public OrderByClauseBNF() {
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 ec928782be4..9f594f291ca 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 @@ public OrderByClauseFactory() {
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 7d07d3ec547..4a225c23a31 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 @@ public OrderByItem(AbstractExpression parent) {
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 children) {
children.add(getExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -192,9 +180,6 @@ else if (lastIdentifier != null) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -281,9 +266,6 @@ public Ordering getOrdering() {
return ordering;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(OrderByItemBNF.ID);
@@ -397,9 +379,6 @@ public boolean isNullsLast() {
return nullOrdering == NullOrdering.NULLS_LAST;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(ASC) ||
@@ -408,9 +387,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -476,9 +452,6 @@ else if ((nullsIdentifier != null) && (lastIdentifier != null)) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void toParsedText(StringBuilder writer, boolean actual) {
@@ -562,9 +535,6 @@ public String getIdentifier() {
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 ecb2324c2e4..3ff78be26eb 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 @@ public OrderByItemBNF() {
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 d6535a79e38..f2dfc06f7ef 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 @@ public OrderByItemFactory() {
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 3afdc37f263..e6c9b36998b 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 @@ public OrderSiblingsByClause(AbstractExpression parent) {
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 2b1907728e7..dcf5a998286 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 @@ public OrderSiblingsByClauseBNF() {
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 cd8d664e156..da32653574c 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 @@ public OrderSiblingsByClauseFactory() {
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 5cba7f2d481..a885525354f 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 @@ public PatternValueBNF() {
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 286c58fe9bb..e51e1e5f266 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 @@ public QualifiedIdentificationVariableBNF() {
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 9246f6609f2..5fe81a2565a 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 @@ public void setExpression(Expression expression) {
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 b31d12a2b00..cff3145f36c 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 @@ public RangeDeclarationBNF() {
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 144725569fd..bd83fff23d3 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 @@ public RangeDeclarationFactory() {
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 a9fbc2cdf90..7778f0f3bca 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 @@ public RangeVariableDeclaration(String entityName, String variableName) {
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 children) {
children.add(getRootObject());
children.add(getIdentificationVariable());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -149,9 +137,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -189,9 +174,6 @@ public Expression getIdentificationVariable() {
return identificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(RangeVariableDeclarationBNF.ID);
@@ -269,9 +251,6 @@ public boolean hasVirtualIdentificationVariable() {
return virtualIdentificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(AS) ||
@@ -282,9 +261,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -348,17 +324,11 @@ public void setVirtualIdentificationVariable(String variableName, String path) {
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 fb5ecffd7d5..832e27093fe 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 @@ public RangeVariableDeclarationBNF() {
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 918e3fb95f1..4bde7a5ec2b 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 @@ public RangeVariableDeclarationFactory() {
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 e5550ea1acc..b24cc73b291 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 @@ public RegexpExpression(AbstractExpression parent, AbstractExpression stringExpr
}
}
- /**
- * {@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 children) {
children.add(getStringExpression());
children.add(getPatternValue());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -121,9 +109,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -160,9 +145,6 @@ public Expression getPatternValue() {
return patternValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(RegexpExpressionBNF.ID);
@@ -220,9 +202,6 @@ public boolean hasStringExpression() {
!stringExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -240,9 +219,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
expression != null;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -255,9 +231,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 57b9114ac50..95819bf9a1a 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 @@ public RegexpExpressionBNF() {
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 fecd9ec9cf9..f0335dcd2f6 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 @@ public RegexpExpressionFactory() {
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 05d3e7ea6f0..a0fa1e8fa01 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 @@ public ResultVariable(AbstractExpression parent, AbstractExpression selectExpres
}
}
- /**
- * {@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 children) {
children.add(getSelectExpression());
children.add(getResultVariable());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -120,9 +108,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -147,9 +132,6 @@ public String getActualAsIdentifier() {
return (asIdentifier != null) ? asIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(ResultVariableBNF.ID);
@@ -218,9 +200,6 @@ public boolean hasSpaceAfterAs() {
return hasSpaceAfterAs;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -240,9 +219,6 @@ protected void parse(WordParser wordParser, boolean 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/ResultVariableBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/ResultVariableBNF.java
index 54556d115d7..8da8a8ae85e 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 @@ public ResultVariableBNF() {
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 64011a53d3d..655b8377526 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 @@ public ResultVariableFactory() {
super(ID, Expression.AS);
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractExpression buildExpression(AbstractExpression parent,
WordParser wordParser,
@@ -113,25 +110,16 @@ private static class SelectClauseVisitor extends AbstractExpressionVisitor {
*/
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 640266aa50d..dc03d01a0b5 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 @@ public ScalarExpressionBNF() {
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 8e296a30460..11ead997b7e 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 @@ public SelectClause(AbstractExpression parent) {
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 25f4ef2c9d0..dee05189c2c 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 @@ public SelectClauseBNF() {
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 a3ced4e50b7..125ab339029 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 @@ public SelectClauseFactory() {
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 773851508da..5402d607e26 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 @@ public SelectExpressionBNF() {
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 447ca287d71..58c9857e6b0 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 @@ public SelectStatement(AbstractExpression parent) {
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 @@ public void acceptChildren(ExpressionVisitor visitor) {
getUnionClauses().accept(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addChildrenTo(Collection children) {
super.addChildrenTo(children);
@@ -124,9 +115,6 @@ protected void addChildrenTo(Collection children) {
children.add(getUnionClauses());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -147,25 +135,16 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@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 @@ public Expression getOrderByClause() {
return orderByClause;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(SelectStatementBNF.ID);
@@ -254,9 +230,6 @@ public boolean hasUnionClauses() {
!unionClauses.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -270,9 +243,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
return super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -293,9 +263,6 @@ protected void parse(WordParser wordParser, boolean 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/SelectStatementBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/SelectStatementBNF.java
index 12750d642cd..ba1370a98b4 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 @@ public SelectStatementBNF() {
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 ee550d1e267..804bc8e2fd3 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 @@ public SelectStatementFactory() {
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 08eb31ae1e5..05f7208f236 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 @@ public SimpleArithmeticExpressionBNF() {
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 053e067e4b5..eeecc0da4c4 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 @@ public SimpleCaseExpressionBNF() {
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 773be5ac629..6a6512c9384 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 @@ public SimpleConditionalExpressionBNF() {
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 a5977721caa..5633f2afa62 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 @@ public SimpleEntityExpressionBNF() {
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 d4bfea77541..bd971c0c61d 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 @@ public SimpleEntityOrValueExpressionBNF() {
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 fb3dcdc2d90..f91d5477051 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 @@ public SimpleFromClause(AbstractExpression parent) {
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 ac8ad1b65ef..a14e4a383d0 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 @@ public SimpleResultVariableBNF() {
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 0d6f1d5756b..b90becb619a 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 @@ public SimpleSelectClause(AbstractExpression parent) {
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 22e0058ae39..d57500420f0 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 @@ public SimpleSelectClauseBNF() {
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 f0893e15800..8fc4ff703a9 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 @@ public SimpleSelectExpressionBNF() {
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 c859aac8973..9e81f6b17cb 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 @@ public SimpleSelectStatement(AbstractExpression parent) {
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 cd0a3fd9969..79aa265c9ea 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 @@ public SimpleSelectStatementFactory() {
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 d6792290010..0a104c4b35f 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 @@ public SingleValuedObjectPathExpressionBNF() {
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 ead480494b4..e589615cac7 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 @@ public SingleValuedPathExpressionBNF() {
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 eb459af77a3..5a1b1e182d4 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 @@ public SizeExpression(AbstractExpression parent) {
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 61e69b67fb4..d9958665ff3 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 @@ public SizeExpressionFactory() {
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 1bbfd0515f6..b7f5f311be7 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 @@ public SqrtExpression(AbstractExpression parent) {
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 6d317ac8c07..4248914d4c5 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 @@ public SqrtExpressionFactory() {
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 6bffef0bb9a..902c0fc0cac 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 @@ public StartWithClause(AbstractExpression parent) {
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 7f1db8c1310..e054f7349c5 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 @@ public StartWithClauseBNF() {
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 43f3281db6a..d3786410896 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 @@ public StartWithClauseFactory() {
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 bec86161cd4..ec5eb591775 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 @@ public StateFieldPathExpression(AbstractExpression parent,
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 2685fe4fb0a..3f00b8676d5 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 @@ public StateFieldPathExpressionBNF() {
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 db9a03d7f61..7c51daa9cce 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 @@ public StateFieldPathExpressionFactory() {
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 b0c9d8af165..49f540832bd 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 @@ public StringExpressionBNF() {
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 26fe596a1c1..8a0225e26ac 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 @@ public StringLiteral(AbstractExpression parent, String literal) {
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 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 @@ public boolean hasCloseQuote() {
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 de1f8178140..89cb6a5fc51 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 @@ public StringLiteralBNF() {
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 d3fec6ffa0b..4abf4507751 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 @@ public StringLiteralFactory() {
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 d808c3efd90..0dc675ae980 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 @@ public StringPrimaryBNF() {
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 9b5c314d6ac..ba614d03c36 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 @@ public SubExpression(AbstractExpression parent, JPQLQueryBNF queryBNF) {
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 @@ public JPQLQueryBNF findQueryBNF(Expression expression) {
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 6611e425871..3bc58a8a055 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 @@ public SubSelectIdentificationVariableDeclarationBNF() {
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 c3e67c72b87..e58b1d54e9c 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 @@ public SubqueryBNF() {
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 7bb4f828a4f..7bea8a14a17 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 @@ public SubqueryFromClauseBNF() {
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 8dfcb12e0bf..226c5ea6436 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 @@ public SubstringExpression(AbstractExpression parent) {
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 @@ public String getParameterQueryBNFId(int index) {
}
}
- /**
- * {@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 6ca80168ea5..fe789cb532d 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 @@ public SubstringExpressionFactory() {
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 5cc5110a777..1fed11ad26a 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 @@ public SubtractionExpression(AbstractExpression parent) {
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 24676d55f70..3ddf8a5fe05 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 @@ public SumFunction(AbstractExpression parent) {
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 2b29ba31adf..78266b63cf2 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 @@ public SumFunctionFactory() {
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 c5004e4c449..d64c299deae 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 @@ public TableExpression(AbstractExpression parent) {
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 be25a7b8759..291ae52c439 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 @@ public TableExpressionBNF() {
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 5e21a0317c5..e7a1443c664 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 @@ public TableExpressionFactory() {
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 574f66d5db8..14c5f03d0a7 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 @@ public TableVariableDeclaration(AbstractExpression parent) {
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 children) {
children.add(getTableExpression());
children.add(getIdentificationVariable());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -121,9 +109,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -160,9 +145,6 @@ public Expression getIdentificationVariable() {
return identificationVariable;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(TableVariableDeclarationBNF.ID);
@@ -216,18 +198,12 @@ public boolean hasSpaceAfterTableExpression() {
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 @@ protected void parse(WordParser wordParser, boolean 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/TableVariableDeclarationBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/TableVariableDeclarationBNF.java
index 11cbf0a077e..425d3540ecb 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 @@ public TableVariableDeclarationBNF() {
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 7a0187c3ee6..ca539088844 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 @@ public TableVariableDeclarationFactory() {
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 d0ee89e31eb..aeedae8fe84 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 @@ public TreatExpression(AbstractExpression parent) {
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 children) {
children.add(getCollectionValuedPathExpression());
children.add(getEntityType());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedEncapsulatedExpressionTo(List children) {
@@ -131,9 +119,6 @@ protected void addOrderedEncapsulatedExpressionTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public final JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -184,9 +169,6 @@ public Expression getEntityType() {
return entityType;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(TreatExpressionBNF.ID);
@@ -212,9 +194,6 @@ public boolean hasCollectionValuedPathExpression() {
!collectionValuedPathExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasCollectionValuedPathExpression() || hasAs() || hasEntityType();
@@ -251,9 +230,6 @@ public boolean hasSpaceAfterCollectionValuedPathExpression() {
return hasSpaceAfterCollectionValuedPathExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -272,9 +248,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
return super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -314,9 +287,6 @@ protected void parseEncapsulatedExpression(WordParser wordParser,
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void removeEncapsulatedExpression() {
entityType = null;
@@ -326,9 +296,6 @@ protected void removeEncapsulatedExpression() {
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 7644fab0f8c..261218407ca 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 @@ public TreatExpressionBNF() {
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 b95be7675eb..8aff48502dd 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 @@ public TreatExpressionFactory() {
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 08a66126ac0..f41d5d5a59c 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 @@ public TrimExpression(AbstractExpression parent) {
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 children) {
@@ -147,9 +138,6 @@ protected void addOrderedEncapsulatedExpressionTo(List children) {
super.addOrderedEncapsulatedExpressionTo(children);
}
- /**
- * {@inheritDoc}
- */
@Override
public String getEncapsulatedExpressionQueryBNFId() {
return StringPrimaryBNF.ID;
@@ -177,9 +165,6 @@ public String getActualSpecificationIdentifier() {
return (specificationIdentifier != null) ? specificationIdentifier : ExpressionTools.EMPTY_STRING;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(FunctionsReturningStringsBNF.ID);
@@ -207,9 +192,6 @@ public Expression getTrimCharacter() {
return trimCharacter;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasEncapsulatedExpression() {
return hasSpecification() || hasTrimCharacter() || hasFrom || hasExpression();
@@ -274,9 +256,6 @@ public boolean hasTrimCharacter() {
!trimCharacter.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parseEncapsulatedExpression(WordParser wordParser,
int whitespaceCount,
@@ -344,9 +323,6 @@ private Specification parseTrimSpecification(WordParser wordParser) {
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 ed56ee841f4..9c1d25a8262 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 @@ public TrimExpressionFactory() {
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 5a9da14c13a..c2779a57490 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 @@ public TypeExpression(AbstractExpression parent) {
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 181b982261e..4a0ffc80a70 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 @@ public TypeExpressionBNF() {
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 3fa7440b2df..8516062cf94 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 @@ public TypeExpressionFactory() {
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 6b4db6aa397..771a82343b4 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 @@ public UnionClause(AbstractExpression parent, String identifier) {
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 children) {
children.add(getQuery());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -118,9 +106,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -172,9 +157,6 @@ public Expression getQuery() {
return query;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(UnionClauseBNF.ID);
@@ -236,9 +218,6 @@ public boolean isIntersect() {
return getText() == INTERSECT;
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(UNION) ||
@@ -256,9 +235,6 @@ public boolean isUnion() {
return getText() == UNION;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -300,9 +276,6 @@ protected String parseIdentifier() {
}
}
- /**
- * {@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 d0dc74f9282..5787da6fbc8 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 @@ public UnionClauseBNF() {
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 70b2fb29298..a1a0da30314 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 @@ public UnionClauseFactory() {
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 a2ae4cb9db6..45e784a4e33 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 @@ public UnknownExpression(AbstractExpression parent, String text) {
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 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 03656fd8268..ff691df0144 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 @@ public UnknownExpressionFactory() {
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 06780a55ed7..7265c166cfa 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 @@ public UpdateClause(AbstractExpression parent) {
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 children) {
children.add(getRangeVariableDeclaration());
children.add(getUpdateItems());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -165,9 +153,6 @@ public CollectionExpression buildCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -202,9 +187,6 @@ public String getActualUpdateIdentifier() {
return updateIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(UpdateClauseBNF.ID);
@@ -293,18 +275,12 @@ public boolean hasUpdateItems() {
!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 @@ else if (!tolerant) {
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 e4628787e38..181a1d456c9 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 @@ public UpdateClauseBNF() {
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 a63afba07a6..af720bb9933 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 @@ public UpdateClauseFactory() {
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 4beb808b963..afbc7e7e020 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 @@ public UpdateItem(AbstractExpression parent) {
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 children) {
children.add(getStateFieldPathExpression());
children.add(getNewValue());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -123,9 +111,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -152,9 +137,6 @@ public Expression getNewValue() {
return newValue;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(UpdateItemBNF.ID);
@@ -221,18 +203,12 @@ public boolean hasStateFieldPathExpression() {
!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 @@ protected void parse(WordParser wordParser, boolean 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/UpdateItemBNF.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/parser/UpdateItemBNF.java
index b4bff82e4b7..9eb783c6528 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 @@ public UpdateItemBNF() {
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 dafc99cdd03..d1664ab0759 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 @@ public UpdateItemFactory() {
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 6377ee4a81b..be720b3f1f7 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 @@ public UpdateItemStateFieldPathExpressionBNF() {
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 f6cade57b54..88132866765 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 @@ public UpdateItemStateFieldPathExpressionFactory() {
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 2caa5f19773..c4f3096a4da 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 @@ public UpdateStatement(AbstractExpression parent) {
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 children) {
children.add(getUpdateClause());
children.add(getWhereClause());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -105,9 +93,6 @@ protected void addOrderedChildrenTo(List children) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -122,9 +107,6 @@ public JPQLQueryBNF findQueryBNF(Expression expression) {
return super.findQueryBNF(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(UpdateStatementBNF.ID);
@@ -172,9 +154,6 @@ public boolean hasWhereClause() {
!whereClause.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -194,9 +173,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 b1e15838726..cfd48e150ae 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 @@ public UpdateStatementBNF() {
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 2b921fa0c98..fbe64681ffe 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 @@ public UpdateStatementFactory() {
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 f3c3a05a923..f4605d6192c 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 @@ public UpperExpression(AbstractExpression parent) {
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 7dbf719a058..7d9b42edef6 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 @@ public UpperExpressionFactory() {
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 74f915fc309..faa7e7e2359 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 @@ public ValueExpression(AbstractExpression parent) {
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 04d167eca29..17233815a4c 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 @@ public ValueExpressionFactory() {
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 d6fe26f25dc..3fbc8c53a60 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 @@ public WhenClause(AbstractExpression parent) {
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 children) {
children.add(getWhenExpression());
children.add(getThenExpression());
}
- /**
- * {@inheritDoc}
- */
@Override
protected void addOrderedChildrenTo(List children) {
@@ -162,9 +150,6 @@ public CollectionExpression buildWhenCollectionExpression() {
return new CollectionExpression(this, children, commas, spaces, true);
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF findQueryBNF(Expression expression) {
@@ -199,9 +184,6 @@ public String getActualWhenIdentifier() {
return whenIdentifier;
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF getQueryBNF() {
return getQueryBNF(WhenClauseBNF.ID);
@@ -290,9 +272,6 @@ public boolean hasWhenExpression() {
!whenExpression.isNull();
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
return word.equalsIgnoreCase(WHEN) ||
@@ -302,9 +281,6 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
super.isParsingComplete(wordParser, word, expression);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void parse(WordParser wordParser, boolean tolerant) {
@@ -326,9 +302,6 @@ protected void parse(WordParser wordParser, boolean tolerant) {
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 aa944d7a36f..6df07fc2795 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 @@ public WhenClauseBNF() {
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 698116a444c..6433ba0d7ae 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 @@ public WhenClauseFactory() {
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 369d428c1f4..c6b5c1a9470 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 @@ public WhereClause(AbstractExpression parent) {
super(parent, WHERE);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean isParsingComplete(WordParser wordParser, String word, Expression expression) {
@@ -54,17 +51,11 @@ protected boolean isParsingComplete(WordParser wordParser, String word, Expressi
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 4b3a261ceb2..3ff4e7249b2 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 @@ public WhereClauseBNF() {
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 b4f3d030fee..64694982709 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 @@ public WhereClauseFactory() {
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 65a3a0fc999..ace4ac1af84 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 @@ protected final void removeVirtualSpace() {
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 @@ public void visit(AbstractSchemaName expression) {
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 @@ else if (expression.hasSpaceAfterArithmeticOperator() || hasVirtualSpace()) {
}
}
- /**
- * {@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 @@ else if (!expression.hasAnd() &&
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
super.visit(expression);
@@ -2655,9 +2622,6 @@ else if (expression.hasSpaceAfterCase()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
super.visit(expression);
@@ -2685,9 +2649,6 @@ else if (expression.hasLeftParenthesis()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
if (!isLocked(expression)) {
@@ -2695,9 +2656,6 @@ public void visit(CollectionExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
super.visit(expression);
@@ -2757,9 +2715,6 @@ else if (expression.hasLeftParenthesis()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
super.visit(expression);
@@ -2794,9 +2749,6 @@ else if (expression.hasOf() && expression.hasSpaceAfterOf() ||
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
super.visit(expression);
@@ -2811,9 +2763,6 @@ public void visit(CollectionValuedPathExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
super.visit(expression);
@@ -2844,18 +2793,12 @@ public void visit(ComparisonExpression expression) {
}
}
- /**
- * {@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 @@ else if (expression.hasLeftParenthesis()) {
}
}
- /**
- * {@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 @@ public void visit(DateTime expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
if (!isLocked(expression)) {
@@ -2932,9 +2866,6 @@ public void visit(DeleteClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
if (!isLocked(expression)) {
@@ -2943,18 +2874,12 @@ public void visit(DeleteStatement expression) {
}
}
- /**
- * {@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 @@ public void visit(EmptyCollectionComparisonExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
@@ -2987,35 +2909,23 @@ public void visit(EntityTypeLiteral expression) {
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 @@ public void visit(FromClause expression) {
}
}
- /**
- * {@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 @@ public void visit(GroupByClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
if (!isLocked(expression)) {
@@ -3055,9 +2956,6 @@ public void visit(HavingClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -3070,9 +2968,6 @@ public void visit(IdentificationVariable expression) {
super.visit(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
super.visit(expression);
@@ -3094,18 +2989,12 @@ public void visit(IdentificationVariableDeclaration expression) {
}
}
- /**
- * {@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 @@ else if (expression.hasLeftParenthesis()) {
}
}
- /**
- * {@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 @@ else if (identifier.equals("LEFT_OUTER")) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
@@ -3277,18 +3157,12 @@ public void visit(JPQLExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(KeywordExpression expression) {
}
}
- /**
- * {@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 @@ else if (expression.hasSpaceAfterLike()) {
}
}
- /**
- * {@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 @@ public void visit(NotExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
super.visit(expression);
@@ -3442,45 +3286,30 @@ public void visit(NullComparisonExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(OnClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
if (!isLocked(expression)) {
@@ -3500,9 +3326,6 @@ public void visit(OrderByClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
super.visit(expression);
@@ -3547,18 +3370,12 @@ else if (expression.hasSpaceAfterExpression()) {
}
}
- /**
- * {@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 @@ else if (expression.hasAs() && isPositionWithin(position, length, AS)) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
super.visit(expression);
@@ -3623,9 +3437,6 @@ else if (expression.hasAs() && isPositionWithin(position, AS)) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
if (!isLocked(expression)) {
@@ -3634,9 +3445,6 @@ public void visit(SelectClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
if (!isLocked(expression)) {
@@ -3645,9 +3453,6 @@ public void visit(SelectStatement expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
if (!isLocked(expression)) {
@@ -3656,9 +3461,6 @@ public void visit(SimpleFromClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
if (!isLocked(expression)) {
@@ -3667,9 +3469,6 @@ public void visit(SimpleSelectClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
if (!isLocked(expression)) {
@@ -3679,27 +3478,18 @@ public void visit(SimpleSelectStatement expression) {
}
}
- /**
- * {@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 @@ public void visit(StateFieldPathExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(SubExpression expression) {
}
}
- /**
- * {@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 @@ else if (expression.hasLeftParenthesis()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(TrimExpression expression) {
super.visit(expression);
@@ -3943,27 +3712,18 @@ else if (expression.hasLeftParenthesis()) {
}
}
- /**
- * {@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 @@ else if (expression.hasSet() &&
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
super.visit(expression);
@@ -4092,9 +3849,6 @@ else if (expression.hasSpaceAfterEqualSign()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
if (!isLocked(expression)) {
@@ -4103,27 +3857,18 @@ public void visit(UpdateStatement expression) {
}
}
- /**
- * {@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 @@ else if (expression.hasThen()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
if (!isLocked(expression)) {
@@ -4950,9 +4692,6 @@ protected AbstractConditionalClauseCollectionHelper(AbstractContentAssistVisitor
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(Expression expression,
CollectionExpression collectionExpression,
@@ -5010,17 +4749,11 @@ public void addAtTheEndOfChild(Expression expression,
}
}
- /**
- * {@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 @@ public void addTheBeginningOfChild(Expression expression,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(Expression expression,
CollectionExpression collectionExpression,
@@ -5135,9 +4865,6 @@ else if ("IS NOT".equalsIgnoreCase(text)) {
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 @@ public int maxCollectionSize(Expression expression) {
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 @@ protected AbstractFromClauseStatementHelper(AbstractContentAssistVisitor visitor
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 @@ protected AbstractGroupByClauseStatementHelper(AbstractContentAssistVisitor visi
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 @@ protected AbstractHavingClauseStatementHelper(AbstractContentAssistVisitor visit
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 @@ protected AbstractSelectClauseCollectionHelper(AbstractContentAssistVisitor visi
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(T expression,
CollectionExpression collectionExpression,
@@ -5380,17 +5038,11 @@ public void addAtTheEndOfChild(T expression,
}
}
- /**
- * {@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 @@ public void addTheBeginningOfChild(T expression,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(T expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getSelectExpression());
@@ -5415,41 +5064,26 @@ public CollectionExpression buildCollectionExpression(T expression) {
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 @@ protected AbstractSelectClauseStatementHelper(AbstractContentAssistVisitor visit
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 @@ protected AbstractWhereClauseSelectStatementHelper(AbstractContentAssistVisitor
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 @@ public void dispose() {
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 @@ protected static class AppendableExpressionVisitor extends AbstractAppendableExp
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 @@ public void visit(AdditionExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(AndExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ArithmeticFactor expression) {
if (expression.hasExpression()) {
@@ -5750,26 +5318,17 @@ public void visit(ArithmeticFactor expression) {
}
}
- /**
- * {@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 @@ public void visit(BetweenExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(CollectionExpression expression) {
collectionExpression = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -5862,9 +5409,6 @@ public void visit(CollectionMemberDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
@@ -5881,18 +5425,12 @@ public void visit(CollectionMemberExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
appendable = !conditionalExpression &&
!expression.endsWithDot();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ComparisonExpression expression) {
@@ -5918,36 +5456,24 @@ else if (expression.hasRightExpression()) {
}
}
- /**
- * {@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 @@ public void visit(DateTime expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
if (expression.hasRangeVariableDeclaration()) {
@@ -5976,9 +5499,6 @@ public void visit(DeleteClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
@@ -5990,9 +5510,6 @@ public void visit(DeleteStatement expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
if (expression.hasRightExpression()) {
@@ -6000,9 +5517,6 @@ public void visit(DivisionExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
@@ -6012,26 +5526,17 @@ public void visit(EmptyCollectionComparisonExpression expression) {
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 @@ public void visit(ExistsExpression expression) {
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
@@ -6053,9 +5555,6 @@ protected void visit(Expression expression) {
appendable = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
@@ -6072,18 +5571,12 @@ else if (expression.hasDeclaration()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FunctionExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
@@ -6094,9 +5587,6 @@ public void visit(GroupByClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
if (expression.hasConditionalExpression()) {
@@ -6106,9 +5596,6 @@ public void visit(HavingClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -6162,9 +5649,6 @@ else if (clauseOfItems || (!clauseOfItems && (appendableType == AppendableType.C
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
@@ -6185,18 +5669,12 @@ else if (expression.hasJoins()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
appendable = !conditionalExpression &&
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -6207,17 +5685,11 @@ public void visit(InExpression expression) {
expression.hasRightParenthesis();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
appendable = !conditionalExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -6237,18 +5709,12 @@ else if (expression.hasFetch()) {
}
}
- /**
- * {@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 @@ public void visit(KeywordExpression expression) {
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 @@ public void visit(LikeExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(MultiplicationExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
@@ -6374,9 +5813,6 @@ public void visit(NotExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -6386,35 +5822,23 @@ public void visit(NullComparisonExpression expression) {
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 @@ public void visit(OnClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
if (expression.hasOrderByItems()) {
@@ -6436,9 +5857,6 @@ public void visit(OrderByClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
appendable = expression.hasSpaceAfterExpression() &&
@@ -6447,9 +5865,6 @@ public void visit(OrderByItem expression) {
!expression.isNullsFirst() && !expression.isNullsLast();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
if (expression.hasRightExpression()) {
@@ -6457,9 +5872,6 @@ public void visit(OrExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -6484,9 +5896,6 @@ public void visit(RangeVariableDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
// The result variable is parsed without AS
@@ -6495,9 +5904,6 @@ public void visit(ResultVariable expression) {
expression.hasResultVariable();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
if (expression.hasSelectExpression()) {
@@ -6507,9 +5913,6 @@ public void visit(SelectClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -6536,9 +5939,6 @@ else if (expression.hasFromClause()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
@@ -6555,9 +5955,6 @@ else if (expression.hasDeclaration()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
@@ -6568,9 +5965,6 @@ public void visit(SimpleSelectClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -6597,27 +5991,18 @@ else if (expression.hasFromClause()) {
}
}
- /**
- * {@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 @@ else if (appendableType == AppendableType.CLAUSE ||
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
appendable = !conditionalExpression &&
expression.hasCloseQuote();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
@@ -6707,18 +6086,12 @@ else if (expression.hasExpression()) {
}
}
- /**
- * {@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 @@ public void visit(SubtractionExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(UpdateClause expression) {
}
}
- /**
- * {@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 @@ public void visit(UpdateStatement expression) {
}
}
- /**
- * {@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 @@ public void visit(WhenClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
if (expression.hasConditionalExpression()) {
@@ -7011,9 +6351,6 @@ public void dispose() {
expression = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
this.expression = expression;
@@ -7023,9 +6360,6 @@ public void visit(CollectionExpression expression) {
// Made static final for performance reasons.
protected static final class CollectionMappingFilter implements Filter {
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(IMapping value) {
// Both association and collection field are accepted
@@ -7043,9 +6377,6 @@ protected ConcatExpressionCollectionHelper(AbstractContentAssistVisitor visitor)
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(ConcatExpression expression,
CollectionExpression collectionExpression,
@@ -7079,9 +6410,6 @@ public void addAtTheEndOfChild(ConcatExpression expression,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(ConcatExpression expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
@@ -7089,9 +6417,6 @@ public void addIdentifier(ConcatExpression expression, String identifier) {
visitor.addFunctionIdentifiers(expression.getParent().findQueryBNF(expression));
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(ConcatExpression expression,
CollectionExpression collectionExpression,
@@ -7102,9 +6427,6 @@ public void addTheBeginningOfChild(ConcatExpression expression,
visitor.addFunctionIdentifiers(queryBNF(expression, index));
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(ConcatExpression expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getExpression());
@@ -7114,9 +6436,6 @@ public CollectionExpression buildCollectionExpression(ConcatExpression expressio
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(ConcatExpression expression,
CollectionExpression collectionExpression,
@@ -7125,34 +6444,22 @@ public boolean canContinue(ConcatExpression expression,
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 @@ protected ConditionalClauseCollectionHelper(AbstractContentAssistVisitor visitor
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(AbstractConditionalClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getConditionalExpression());
@@ -7182,9 +6486,6 @@ public CollectionExpression buildCollectionExpression(AbstractConditionalClause
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasDelimiterAfterIdentifier(AbstractConditionalClause expression) {
return expression.hasSpaceAfterIdentifier();
@@ -7199,9 +6500,6 @@ protected ConstrutorCollectionHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(ConstructorExpression expression,
CollectionExpression collectionExpression,
@@ -7235,17 +6533,11 @@ public void addAtTheEndOfChild(ConstructorExpression expression,
}
}
- /**
- * {@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 @@ public void addTheBeginningOfChild(ConstructorExpression expression,
visitor.addFunctionIdentifiers(ConstructorItemBNF.ID);
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(ConstructorExpression expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getConstructorItems());
@@ -7268,9 +6557,6 @@ public CollectionExpression buildCollectionExpression(ConstructorExpression expr
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(ConstructorExpression expression,
CollectionExpression collectionExpression,
@@ -7279,25 +6565,16 @@ public boolean canContinue(ConstructorExpression expression,
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 @@ public int preExpressionLength(ConstructorExpression expression) {
return expression.getClassName().length();
}
- /**
- * {@inheritDoc}
- */
@Override
public JPQLQueryBNF queryBNF(ConstructorExpression expression, int index) {
return visitor.getQueryBNF(ConstructorItemBNF.ID);
@@ -7342,17 +6616,11 @@ public boolean isDeclaration() {
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 @@ public void visit(RangeVariableDeclaration expression) {
*/
protected static final class DefaultMappingCollector implements MappingCollector {
- /**
- * {@inheritDoc}
- */
@Override
public Collection buildProposals() {
return Collections.emptyList();
@@ -7382,9 +6647,6 @@ protected DeleteClauseCollectionHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(DeleteClause expression,
CollectionExpression collectionExpression,
@@ -7393,17 +6655,11 @@ public void addAtTheEndOfChild(DeleteClause expression,
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 @@ public void addTheBeginningOfChild(DeleteClause expression,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(DeleteClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getRangeVariableDeclaration());
@@ -7427,9 +6680,6 @@ public CollectionExpression buildCollectionExpression(DeleteClause expression) {
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(DeleteClause expression,
CollectionExpression collectionExpression,
@@ -7438,33 +6688,21 @@ public boolean canContinue(DeleteClause expression,
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 @@ protected DeleteClauseStatementHelper(AbstractContentAssistVisitor visitor) {
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 static final class DifferentComparisonFilter
*/
protected boolean valid;
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(Expression expression) {
try {
@@ -7567,17 +6778,11 @@ public boolean accept(Expression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
valid = true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
valid = false;
@@ -7592,9 +6797,6 @@ protected DoubleEncapsulatedCollectionHelper(AbstractContentAssistVisitor visito
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(AbstractDoubleEncapsulatedExpression expression,
CollectionExpression collectionExpression,
@@ -7628,9 +6830,6 @@ public void addAtTheEndOfChild(AbstractDoubleEncapsulatedExpression expression,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addIdentifier(AbstractDoubleEncapsulatedExpression expression, String identifier) {
visitor.proposals.addIdentifier(identifier);
@@ -7638,9 +6837,6 @@ public void addIdentifier(AbstractDoubleEncapsulatedExpression expression, Strin
visitor.addFunctionIdentifiers(expression.getParent().findQueryBNF(expression));
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(AbstractDoubleEncapsulatedExpression expression,
CollectionExpression collectionExpression,
@@ -7651,17 +6847,11 @@ public void addTheBeginningOfChild(AbstractDoubleEncapsulatedExpression expressi
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 @@ public boolean canContinue(AbstractDoubleEncapsulatedExpression expression,
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 @@ public boolean isEncapsulated() {
return encapsulated;
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
if (!visited) {
@@ -7747,9 +6922,6 @@ protected void visit(Expression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SubExpression expression) {
encapsulated = true;
@@ -7861,17 +7033,11 @@ public void prepare(Expression invalidExpression) {
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 @@ public void visit(AbstractSchemaName expression) {
}
}
- /**
- * {@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 @@ public void visit(ArithmeticFactor expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(AvgFunction expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BadExpression expression) {
badExpression = true;
@@ -7947,9 +7095,6 @@ public void visit(BadExpression expression) {
badExpression = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(BetweenExpression expression) {
@@ -7982,9 +7127,6 @@ else if (expression.hasLowerBoundExpression() &&
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CaseExpression expression) {
@@ -8018,17 +7160,11 @@ else if (expression.hasCaseOperand()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CoalesceExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -8085,9 +7221,6 @@ public void visit(CollectionExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberDeclaration expression) {
@@ -8116,9 +7249,6 @@ else if (expression.hasCollectionValuedPathExpression() &&
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionMemberExpression expression) {
@@ -8146,9 +7276,6 @@ public void visit(CollectionMemberExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionValuedPathExpression expression) {
@@ -8162,25 +7289,16 @@ public void visit(CollectionValuedPathExpression expression) {
}
}
- /**
- * {@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 @@ public void visit(ConstructorExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CountFunction expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DateTime expression) {
@@ -8234,9 +7346,6 @@ else if (invalidExpression == expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteClause expression) {
@@ -8261,9 +7370,6 @@ public void visit(DeleteClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DeleteStatement expression) {
@@ -8283,17 +7389,11 @@ public void visit(DeleteStatement expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(DivisionExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EmptyCollectionComparisonExpression expression) {
@@ -8315,9 +7415,6 @@ public void visit(EmptyCollectionComparisonExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(EntityTypeLiteral expression) {
@@ -8331,41 +7428,26 @@ public void visit(EntityTypeLiteral expression) {
}
}
- /**
- * {@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 @@ public void visit(GroupByClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
visitAbstractConditionalClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariable expression) {
@@ -8412,9 +7488,6 @@ public void visit(IdentificationVariable expression) {
queryPosition.addPosition(expression, positionWithinInvalidExpression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IdentificationVariableDeclaration expression) {
@@ -8435,17 +7508,11 @@ else if (expression.hasRangeVariableDeclaration()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(IndexExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InExpression expression) {
@@ -8474,9 +7541,6 @@ public void visit(InExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(InputParameter expression) {
@@ -8489,9 +7553,6 @@ public void visit(InputParameter expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(Join expression) {
@@ -8527,9 +7588,6 @@ else if (expression.hasJoinAssociationPath() &&
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(JPQLExpression expression) {
@@ -8544,17 +7602,11 @@ public void visit(JPQLExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeyExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(KeywordExpression expression) {
@@ -8569,17 +7621,11 @@ else if (invalidExpression == expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LengthExpression expression) {
visitAbstractSingleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(LikeExpression expression) {
@@ -8611,57 +7657,36 @@ else if (expression.hasPatternValue() &&
}
}
- /**
- * {@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 @@ public void visit(NotExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullComparisonExpression expression) {
@@ -8713,9 +7735,6 @@ public void visit(NullComparisonExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullExpression expression) {
@@ -8728,17 +7747,11 @@ public void visit(NullExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NullIfExpression expression) {
visitAbstractDoubleEncapsulatedExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NumericLiteral expression) {
@@ -8751,25 +7764,16 @@ public void visit(NumericLiteral expression) {
}
}
- /**
- * {@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 @@ public void visit(OrderByClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByItem expression) {
@@ -8814,17 +7815,11 @@ public void visit(OrderByItem expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrExpression expression) {
visitCompoundExpression(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -8845,9 +7840,6 @@ else if (!expression.hasAs()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
@@ -8881,9 +7873,6 @@ else if (!expression.hasAs()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectClause expression) {
@@ -8908,9 +7897,6 @@ public void visit(SelectClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -8964,17 +7950,11 @@ else if (expression.hasFromClause()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
visitAbstractFromClause(expression);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectClause expression) {
@@ -8992,9 +7972,6 @@ public void visit(SimpleSelectClause expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -9036,25 +8013,16 @@ else if (expression.hasFromClause()) {
}
}
- /**
- * {@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 @@ public void visit(StateFieldPathExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(StringLiteral expression) {
@@ -9083,41 +8048,26 @@ public void visit(StringLiteral expression) {
}
}
- /**
- * {@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 @@ else if (expression.hasCollectionValuedPathExpression() &&
}
}
- /**
- * {@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 @@ else if (expression.hasRangeVariableDeclaration()) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateItem expression) {
@@ -9229,9 +8164,6 @@ else if (!expression.hasEqualSign() &&
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(UpdateStatement expression) {
@@ -9255,25 +8187,16 @@ public void visit(UpdateStatement expression) {
}
}
- /**
- * {@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 @@ else if (expression.hasWhenExpression() &&
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
visitAbstractConditionalClause(expression);
@@ -9536,99 +8456,63 @@ public boolean isValid() {
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 @@ public boolean accept(IMapping mapping) {
};
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection buildProposals() {
@@ -9762,9 +8643,6 @@ protected boolean hasFromClause(AbstractSelectStatement expression) {
return (afterIdentifier != FROM) && expression.hasFromClause();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SelectStatement expression) {
@@ -9860,17 +8738,11 @@ else if (afterIdentifier == HAVING) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleFromClause expression) {
expression.getParent().accept(this);
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(SimpleSelectStatement expression) {
@@ -9967,9 +8839,6 @@ public boolean isFollowingInvalidExpression() {
return followingInvalidExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -9995,9 +8864,6 @@ public void visit(CollectionExpression expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void visit(Expression expression) {
this.expression = expression;
@@ -10013,9 +8879,6 @@ protected FromClauseCollectionHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(AbstractFromClause expression,
CollectionExpression collectionExpression,
@@ -10054,17 +8917,11 @@ public void addAtTheEndOfChild(AbstractFromClause expression,
}
}
- /**
- * {@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 @@ else if ((index > 0) && !hasComma) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(AbstractFromClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getDeclaration());
@@ -10105,9 +8959,6 @@ public CollectionExpression buildCollectionExpression(AbstractFromClause express
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(AbstractFromClause expression,
CollectionExpression collectionExpression,
@@ -10116,33 +8967,21 @@ public boolean canContinue(AbstractFromClause expression,
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 @@ protected FromClauseStatementHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public WhereClauseSelectStatementHelper getNextHelper() {
return visitor.getWhereClauseSelectStatementHelper();
@@ -10173,9 +9009,6 @@ protected GroupByClauseCollectionHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(GroupByClause expression,
CollectionExpression collectionExpression,
@@ -10184,17 +9017,11 @@ public void addAtTheEndOfChild(GroupByClause expression,
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 @@ public void addTheBeginningOfChild(GroupByClause expression,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(GroupByClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getGroupByItems());
@@ -10219,9 +9043,6 @@ public CollectionExpression buildCollectionExpression(GroupByClause expression)
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(GroupByClause expression,
CollectionExpression collectionExpression,
@@ -10230,33 +9051,21 @@ public boolean canContinue(GroupByClause expression,
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 @@ protected GroupByClauseStatementHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public HavingClauseStatementHelper getNextHelper() {
return visitor.getHavingClauseStatementHelper();
@@ -10286,17 +9092,11 @@ protected HavingClauseStatementHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public OrderByClauseStatementHelper getNextHelper() {
return visitor.getOrderByClauseStatementHelper();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(SelectStatement expression) {
return expression.hasSpaceBeforeOrderBy();
@@ -10316,9 +9116,7 @@ protected static enum IdentificationVariableType {
*/
ALL {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10351,9 +9149,7 @@ protected boolean add(AbstractContentAssistVisitor contentAssist,
*/
COLLECTION {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10381,9 +9177,7 @@ protected boolean add(AbstractContentAssistVisitor contentAssist,
*/
LEFT {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10427,9 +9221,7 @@ protected boolean add(AbstractContentAssistVisitor contentAssist,
*/
LEFT_COLLECTION {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10470,9 +9262,7 @@ protected boolean add(AbstractContentAssistVisitor contentAssist,
*/
NONE {
- /**
- * {@inheritDoc}
- */
+
@Override
protected boolean add(AbstractContentAssistVisitor contentAssist,
Declaration declaration,
@@ -10588,9 +9378,6 @@ protected boolean isPossibleCompositeIdentifier(String clause, String fragment)
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(CollectionExpression expression) {
@@ -10604,9 +9391,6 @@ public void visit(CollectionExpression expression) {
insideCollection = false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(FromClause expression) {
clause = FROM;
@@ -10614,9 +9398,6 @@ public void visit(FromClause expression) {
clause = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(GroupByClause expression) {
clause = GROUP_BY;
@@ -10624,9 +9405,6 @@ public void visit(GroupByClause expression) {
clause = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(HavingClause expression) {
clause = HAVING;
@@ -10634,17 +9412,11 @@ public void visit(HavingClause expression) {
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 @@ public void visit(IdentificationVariableDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(OrderByClause expression) {
clause = ORDER_BY;
@@ -10662,9 +9431,6 @@ public void visit(OrderByClause expression) {
clause = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
@@ -10682,9 +9448,6 @@ public void visit(RangeVariableDeclaration expression) {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
clause = WHERE;
@@ -10722,17 +9485,11 @@ public boolean isInvalid() {
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 @@ protected JoinCollectionHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(IdentificationVariableDeclaration expression,
CollectionExpression collectionExpression,
@@ -10758,17 +9512,11 @@ public void addAtTheEndOfChild(IdentificationVariableDeclaration expression,
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 @@ public void addTheBeginningOfChild(IdentificationVariableDeclaration expression,
visitor.addJoinIdentifiers();
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(IdentificationVariableDeclaration expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getJoins());
@@ -10790,9 +9535,6 @@ public CollectionExpression buildCollectionExpression(IdentificationVariableDecl
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(IdentificationVariableDeclaration expression,
CollectionExpression collectionExpression,
@@ -10801,33 +9543,21 @@ public boolean canContinue(IdentificationVariableDeclaration expression,
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 @@ public void dispose() {
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 @@ public void visit(HavingClause expression) {
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 @@ public void visit(OnClause expression) {
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 @@ public void visit(WhenClause expression) {
filter = NullFilter.instance();
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(WhereClause expression) {
// No need to filter, everything is allowed
@@ -11163,9 +9803,6 @@ protected static final class MappingTypeFilter
this.type = type;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(IMapping value) {
@@ -11208,9 +9845,6 @@ public boolean isNotExpression() {
return expression != null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(NotExpression expression) {
this.expression = expression;
@@ -11225,9 +9859,6 @@ protected OrderByClauseCollectionHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(AbstractOrderByClause expression,
CollectionExpression collectionExpression,
@@ -11243,17 +9874,11 @@ public void addAtTheEndOfChild(AbstractOrderByClause expression,
}
}
- /**
- * {@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 @@ public void addTheBeginningOfChild(AbstractOrderByClause expression,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public CollectionExpression buildCollectionExpression(AbstractOrderByClause expression) {
CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getOrderByItems());
@@ -11278,9 +9900,6 @@ public CollectionExpression buildCollectionExpression(AbstractOrderByClause expr
return collectionExpression;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean canContinue(AbstractOrderByClause expression,
CollectionExpression collectionExpression,
@@ -11289,33 +9908,21 @@ public boolean canContinue(AbstractOrderByClause expression,
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 @@ protected OrderByClauseStatementHelper(AbstractContentAssistVisitor visitor) {
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 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 @@ public boolean isRequired() {
// Made static final for performance reasons.
protected static final class PropertyMappingFilter implements Filter {
- /**
- * {@inheritDoc}
- */
@Override
public boolean accept(IMapping value) {
return !value.isTransient() &&
@@ -11423,9 +10003,6 @@ public void dispose() {
expression = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(RangeVariableDeclaration expression) {
this.expression = expression;
@@ -11447,9 +10024,6 @@ public void dispose() {
expression = null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void visit(ResultVariable expression) {
this.expression = expression;
@@ -11463,9 +10037,6 @@ protected SelectClauseCollectionHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addAtTheEndOfChild(SelectClause expression,
CollectionExpression collectionExpression,
@@ -11484,9 +10055,6 @@ public void addAtTheEndOfChild(SelectClause expression,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addTheBeginningOfChild(SelectClause expression,
CollectionExpression collectionExpression,
@@ -11500,9 +10068,6 @@ public void addTheBeginningOfChild(SelectClause expression,
}
}
- /**
- * {@inheritDoc}
- */
@Override
public int preExpressionLength(SelectClause expression) {
@@ -11527,9 +10092,6 @@ protected SelectClauseStatementHelper(AbstractContentAssistVisitor visitor) {
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public FromClauseStatementHelper getNextHelper() {
return visitor.getFromClauseStatementHelper();
@@ -11543,9 +10105,6 @@ protected SimpleFromClauseStatementHelper(AbstractContentAssistVisitor visitor)
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleWhereClauseSelectStatementHelper getNextHelper() {
return visitor.getSimpleWhereClauseSelectStatementHelper();
@@ -11559,9 +10118,6 @@ protected SimpleGroupByClauseStatementHelper(AbstractContentAssistVisitor visito
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public SimpleHavingClauseStatementHelper getNextHelper() {
return visitor.getSimpleHavingClauseStatementHelper();
@@ -11575,17 +10131,11 @@ protected SimpleHavingClauseStatementHelper(AbstractContentAssistVisitor visitor
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper getNextHelper() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean hasSpaceAfterClause(SimpleSelectStatement expression) {
return false;
@@ -11608,9 +10158,6 @@ protected SimpleSelectClauseStatementHelper(AbstractContentAssistVisitor visitor
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper getNextHelper() {
return visitor.getSimpleFromClauseStatementHelper();
@@ -11624,9 +10171,6 @@ protected SimpleWhereClauseSelectStatementHelper(AbstractContentAssistVisitor vi
super(visitor);
}
- /**
- * {@inheritDoc}
- */
@Override
public StatementHelper