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/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/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/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/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.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/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/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/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/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 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/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/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/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 getNextHelper() { return visitor.getSimpleGroupByClauseStatementHelper(); @@ -11719,25 +10263,16 @@ protected static final class SubqueryAppendableExpressionVisitor extends Abstrac */ protected boolean subExpression; - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { this.appendable = subExpression; } - /** - * {@inheritDoc} - */ @Override public void visit(NullExpression expression) { this.appendable = subExpression; } - /** - * {@inheritDoc} - */ @Override public void visit(SubExpression expression) { subExpression = true; @@ -11775,9 +10310,6 @@ public boolean isInSubquery() { return expression != null; } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { this.expression = expression; @@ -11792,9 +10324,6 @@ protected TripleEncapsulatedCollectionHelper(AbstractContentAssistVisitor visito super(visitor); } - /** - * {@inheritDoc} - */ @Override public void addAtTheEndOfChild(AbstractTripleEncapsulatedExpression expression, CollectionExpression collectionExpression, @@ -11828,18 +10357,12 @@ public void addAtTheEndOfChild(AbstractTripleEncapsulatedExpression expression, } } - /** - * {@inheritDoc} - */ @Override public void addIdentifier(AbstractTripleEncapsulatedExpression expression, String identifier) { visitor.proposals.addIdentifier(identifier); visitor.addFunctionIdentifiers(expression); } - /** - * {@inheritDoc} - */ @Override public void addTheBeginningOfChild(AbstractTripleEncapsulatedExpression expression, CollectionExpression collectionExpression, @@ -11850,17 +10373,11 @@ public void addTheBeginningOfChild(AbstractTripleEncapsulatedExpression expressi visitor.addFunctionIdentifiers(queryBNF(expression, index)); } - /** - * {@inheritDoc} - */ @Override public CollectionExpression buildCollectionExpression(AbstractTripleEncapsulatedExpression expression) { return expression.buildCollectionExpression(); } - /** - * {@inheritDoc} - */ @Override public boolean canContinue(AbstractTripleEncapsulatedExpression expression, CollectionExpression collectionExpression, @@ -11869,35 +10386,23 @@ public boolean canContinue(AbstractTripleEncapsulatedExpression expression, return false; } - /** - * {@inheritDoc} - */ @Override public boolean hasDelimiterAfterIdentifier(AbstractTripleEncapsulatedExpression expression) { return expression.hasSpaceAfterIdentifier() || expression.hasLeftParenthesis(); } - /** - * {@inheritDoc} - */ @Override public int maxCollectionSize(AbstractTripleEncapsulatedExpression expression) { // Both LOCATE and SUBSTRING can allow up to 3 encapsulated expressions return 3; } - /** - * {@inheritDoc} - */ @Override public int preExpressionLength(AbstractTripleEncapsulatedExpression expression) { return 0; } - /** - * {@inheritDoc} - */ @Override public JPQLQueryBNF queryBNF(AbstractTripleEncapsulatedExpression expression, int index) { return visitor.getQueryBNF(expression.getParameterQueryBNFId(index)); @@ -11912,65 +10417,41 @@ protected UpdateClauseStatementHelper(AbstractContentAssistVisitor visitor) { super(visitor); } - /** - * {@inheritDoc} - */ @Override public void addClauseProposals() { visitor.addIdentifier(UPDATE); } - /** - * {@inheritDoc} - */ @Override public void addInternalClauseProposals(UpdateStatement expression) { // Does not have internal clauses } - /** - * {@inheritDoc} - */ @Override public Expression getClause(UpdateStatement expression) { return expression.getUpdateClause(); } - /** - * {@inheritDoc} - */ @Override public StatementHelper getNextHelper() { return visitor.getWhereClauseUpdateStatementHelper(); } - /** - * {@inheritDoc} - */ @Override public boolean hasClause(UpdateStatement expression) { return true; } - /** - * {@inheritDoc} - */ @Override public boolean hasSpaceAfterClause(UpdateStatement expression) { return expression.hasSpaceAfterUpdateClause(); } - /** - * {@inheritDoc} - */ @Override public boolean isClauseComplete(UpdateStatement expression) { return visitor.isComplete(expression.getUpdateClause()); } - /** - * {@inheritDoc} - */ @Override public boolean isRequired() { return true; @@ -11985,9 +10466,6 @@ protected UpdateItemCollectionHelper(AbstractContentAssistVisitor visitor) { super(visitor); } - /** - * {@inheritDoc} - */ @Override public void addAtTheEndOfChild(UpdateClause expression, CollectionExpression collectionExpression, @@ -11998,17 +10476,11 @@ public void addAtTheEndOfChild(UpdateClause expression, visitor.addAggregateIdentifiers(NewValueBNF.ID); } - /** - * {@inheritDoc} - */ @Override public void addIdentifier(UpdateClause expression, String identifier) { visitor.proposals.addIdentifier(identifier); } - /** - * {@inheritDoc} - */ @Override public void addTheBeginningOfChild(UpdateClause expression, CollectionExpression collectionExpression, @@ -12018,9 +10490,6 @@ public void addTheBeginningOfChild(UpdateClause expression, visitor.addIdentificationVariables(); } - /** - * {@inheritDoc} - */ @Override public CollectionExpression buildCollectionExpression(UpdateClause expression) { CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getUpdateItems()); @@ -12030,9 +10499,6 @@ public CollectionExpression buildCollectionExpression(UpdateClause expression) { return collectionExpression; } - /** - * {@inheritDoc} - */ @Override public boolean canContinue(UpdateClause expression, CollectionExpression collectionExpression, @@ -12041,25 +10507,16 @@ public boolean canContinue(UpdateClause expression, return false; } - /** - * {@inheritDoc} - */ @Override public boolean hasDelimiterAfterIdentifier(UpdateClause expression) { return expression.hasSpaceAfterUpdate(); } - /** - * {@inheritDoc} - */ @Override public int maxCollectionSize(UpdateClause expression) { return Integer.MAX_VALUE; } - /** - * {@inheritDoc} - */ @Override public int preExpressionLength(UpdateClause expression) { // There is a SPACE_LENGTH less, it's added automatically @@ -12070,9 +10527,6 @@ public int preExpressionLength(UpdateClause expression) { SET.length(); } - /** - * {@inheritDoc} - */ @Override public JPQLQueryBNF queryBNF(UpdateClause expression, int index) { return visitor.getQueryBNF(NewValueBNF.ID); @@ -12100,17 +10554,11 @@ protected VisitParentVisitor(AbstractContentAssistVisitor visitor) { this.visitor = visitor; } - /** - * {@inheritDoc} - */ @Override protected void visit(Expression expression) { expression.getParent().accept(visitor); } - /** - * {@inheritDoc} - */ @Override public void visit(InExpression expression) { @@ -12153,9 +10601,6 @@ protected WhenClauseConditionalClauseCollectionHelper(AbstractContentAssistVisit super(visitor); } - /** - * {@inheritDoc} - */ @Override public CollectionExpression buildCollectionExpression(WhenClause expression) { CollectionExpression collectionExpression = visitor.getCollectionExpression(expression.getWhenExpression()); @@ -12165,9 +10610,6 @@ public CollectionExpression buildCollectionExpression(WhenClause expression) { return collectionExpression; } - /** - * {@inheritDoc} - */ @Override public boolean hasDelimiterAfterIdentifier(WhenClause expression) { return expression.hasSpaceAfterWhen(); @@ -12182,65 +10624,41 @@ protected WhereClauseDeleteStatementHelper(AbstractContentAssistVisitor visitor) super(visitor); } - /** - * {@inheritDoc} - */ @Override public void addClauseProposals() { visitor.addIdentifier(WHERE); } - /** - * {@inheritDoc} - */ @Override public void addInternalClauseProposals(DeleteStatement expression) { // Does not have internal clauses } - /** - * {@inheritDoc} - */ @Override public Expression getClause(DeleteStatement expression) { return expression.getWhereClause(); } - /** - * {@inheritDoc} - */ @Override public StatementHelper getNextHelper() { return null; } - /** - * {@inheritDoc} - */ @Override public boolean hasClause(DeleteStatement expression) { return expression.hasWhereClause(); } - /** - * {@inheritDoc} - */ @Override public boolean hasSpaceAfterClause(DeleteStatement expression) { return false; } - /** - * {@inheritDoc} - */ @Override public boolean isClauseComplete(DeleteStatement expression) { return visitor.isComplete(expression.getWhereClause()); } - /** - * {@inheritDoc} - */ @Override public boolean isRequired() { return false; @@ -12254,9 +10672,6 @@ protected WhereClauseSelectStatementHelper(AbstractContentAssistVisitor visitor) super(visitor); } - /** - * {@inheritDoc} - */ @Override public StatementHelper getNextHelper() { return visitor.getGroupByClauseStatementHelper(); @@ -12271,65 +10686,41 @@ protected WhereClauseUpdateStatementHelper(AbstractContentAssistVisitor visitor) super(visitor); } - /** - * {@inheritDoc} - */ @Override public void addClauseProposals() { visitor.addIdentifier(WHERE); } - /** - * {@inheritDoc} - */ @Override public void addInternalClauseProposals(UpdateStatement expression) { // Does not have internal clauses } - /** - * {@inheritDoc} - */ @Override public Expression getClause(UpdateStatement expression) { return expression.getWhereClause(); } - /** - * {@inheritDoc} - */ @Override public StatementHelper getNextHelper() { return null; } - /** - * {@inheritDoc} - */ @Override public boolean hasClause(UpdateStatement expression) { return expression.hasWhereClause(); } - /** - * {@inheritDoc} - */ @Override public boolean hasSpaceAfterClause(UpdateStatement expression) { return false; } - /** - * {@inheritDoc} - */ @Override public boolean isClauseComplete(UpdateStatement expression) { return visitor.isComplete(expression.getWhereClause()); } - /** - * {@inheritDoc} - */ @Override public boolean isRequired() { return false; @@ -12362,17 +10753,11 @@ public boolean isWithinInvalidExpression() { return withinInvalidExpression; } - /** - * {@inheritDoc} - */ @Override public void visit(BadExpression expression) { withinInvalidExpression = true; } - /** - * {@inheritDoc} - */ @Override public void visit(UnknownExpression expression) { withinInvalidExpression = true; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/BasicRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/BasicRefactoringTool.java index 71d61299da0..10a7b947333 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/BasicRefactoringTool.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/BasicRefactoringTool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -351,9 +351,6 @@ public void renameVariable(String oldVariableName, String newVariableName) { delta.addTextEdits(renamer.textEdits); } - /** - * {@inheritDoc} - */ @Override public String toActualText() { return getDelta().applyChanges(); @@ -540,17 +537,11 @@ protected void rename(AbstractPathExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpression expression) { rename(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpression expression) { rename(expression); @@ -584,9 +575,6 @@ public ClassNameRenamer(String oldClassName, String newClassName) { this.newClassName = newClassName; } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpression expression) { // Test for a fully qualified class name in a range variable declaration @@ -595,9 +583,6 @@ public void visit(CollectionValuedPathExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(ConstructorExpression expression) { visit(expression, expression.getClassName(), 4); // 4 = "NEW " @@ -640,9 +625,6 @@ else if (fragment.length() < oldClassName.length()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpression expression) { // A fully qualified enum constant is parsed as a state field path expression @@ -704,9 +686,6 @@ public EntityNameRenamer(String oldEntityName, String newEntityName) { this.newEntityName = newEntityName; } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaName expression) { if (oldEntityName.equals(expression.getText())) { @@ -714,9 +693,6 @@ public void visit(AbstractSchemaName expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(EntityTypeLiteral expression) { if (oldEntityName.equals(expression.getEntityTypeName())) { @@ -724,9 +700,6 @@ public void visit(EntityTypeLiteral expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { if (oldEntityName.equals(expression.getText())) { @@ -788,17 +761,11 @@ protected void renameEnumConstant(AbstractPathExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpression expression) { renameEnumConstant(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpression expression) { renameEnumConstant(expression); @@ -832,17 +799,11 @@ public JavaQuery(IManagedTypeProvider provider, CharSequence jpqlQuery) { setExpression(jpqlQuery); } - /** - * {@inheritDoc} - */ @Override public String getExpression() { return jpqlQuery; } - /** - * {@inheritDoc} - */ @Override public IManagedTypeProvider getProvider() { return provider; @@ -857,9 +818,6 @@ public void setExpression(CharSequence jpqlQuery) { this.jpqlQuery = (jpqlQuery != null) ? jpqlQuery.toString() : ExpressionTools.EMPTY_STRING; } - /** - * {@inheritDoc} - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -902,9 +860,6 @@ public ResultVariableNameRenamer(String oldVariableName, String newVariableName) this.newVariableName = newVariableName; } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { @@ -915,9 +870,6 @@ public void visit(IdentificationVariable expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariable expression) { @@ -932,9 +884,6 @@ public void visit(ResultVariable expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatement expression) { @@ -981,9 +930,6 @@ public VariableNameRenamer(String oldVariableName, String newVariableName) { this.newVariableName = newVariableName; } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { if (oldVariableName.equalsIgnoreCase(expression.getText())) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultBasicRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultBasicRefactoringTool.java index 217c317fae1..df6b61dcab3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultBasicRefactoringTool.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultBasicRefactoringTool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -78,9 +78,6 @@ public DefaultBasicRefactoringTool(CharSequence jpqlFragment, super(jpqlFragment, jpqlGrammar, managedTypeProvider, jpqlQueryBNFId); } - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildJPQLQueryContext() { return new DefaultJPQLQueryContext(getGrammar()); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistProposals.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistProposals.java index e140903a732..35011df6f1c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistProposals.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistProposals.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -238,9 +238,6 @@ private static Map> buildOrderedIdentifiers() { return identifiers; } - /** - * {@inheritDoc} - */ @Override public Iterable abstractSchemaTypes() { return new SnapshotCloneIterable(entities); @@ -324,9 +321,6 @@ public void addRangeIdentificationVariable(String identificationVariable, IEntit rangeIdentificationVariables.put(identificationVariable, entity); } - /** - * {@inheritDoc} - */ @Override public Result buildEscapedQuery(String jpqlQuery, String proposal, int position, boolean insert) { @@ -464,9 +458,6 @@ else if (proposal != wordsToReplace) { return new int[] { startPosition, startPosition + length }; } - /** - * {@inheritDoc} - */ @Override public Result buildQuery(String jpqlQuery, String proposal, int position, boolean insert) { @@ -489,9 +480,6 @@ public Result buildQuery(String jpqlQuery, String proposal, int position, boolea return new Result(sb.toString(), positions[0] + proposal.length()); } - /** - * {@inheritDoc} - */ @Override public ResultQuery buildXmlQuery(String jpqlQuery, String proposal, int position, boolean insert) { @@ -524,9 +512,6 @@ public ResultQuery buildXmlQuery(String jpqlQuery, String proposal, int position return new Result(sb.toString(), proposalPositions[0] + proposal.length()); } - /** - * {@inheritDoc} - */ @Override public Iterable classNames() { if (classNamePrefix == null) { @@ -535,9 +520,6 @@ public Iterable classNames() { return extension.classNames(classNamePrefix, classType); } - /** - * {@inheritDoc} - */ @Override public Iterable columnNames() { if (tableName == null) { @@ -546,17 +528,11 @@ public Iterable columnNames() { return extension.columnNames(tableName, columnNamePrefix); } - /** - * {@inheritDoc} - */ @Override public Iterable enumConstant() { return new SnapshotCloneIterable(enumProposals.values()); } - /** - * {@inheritDoc} - */ @Override public IEntity getAbstractSchemaType(String identificationVariable) { return rangeIdentificationVariables.get(identificationVariable); @@ -573,9 +549,6 @@ public String getClassNamePrefix() { return classNamePrefix; } - /** - * {@inheritDoc} - */ @Override public ClassType getClassType() { return classType; @@ -602,9 +575,6 @@ public JPQLGrammar getGrammar() { return jpqlGrammar; } - /** - * {@inheritDoc} - */ @Override public IdentifierRole getIdentifierRole(String identifier) { return jpqlGrammar.getExpressionRegistry().getIdentifierRole(identifier); @@ -632,9 +602,6 @@ public String getTableNamePrefix() { return tableNamePrefix; } - /** - * {@inheritDoc} - */ @Override public boolean hasProposals() { return !mappings.isEmpty() || @@ -648,9 +615,6 @@ public boolean hasProposals() { !rangeIdentificationVariables.isEmpty(); } - /** - * {@inheritDoc} - */ @Override public Iterable identificationVariables() { List variables = new ArrayList(identificationVariables.size() + rangeIdentificationVariables.size()); @@ -659,9 +623,6 @@ public Iterable identificationVariables() { return new SnapshotCloneIterable(variables); } - /** - * {@inheritDoc} - */ @Override public Iterable identifiers() { return new SnapshotCloneIterable(identifiers); @@ -750,9 +711,6 @@ public String longuestIdentifier(String proposal) { return LONGUEST_IDENTIFIERS.containsKey(proposal) ? LONGUEST_IDENTIFIERS.get(proposal) : proposal; } - /** - * {@inheritDoc} - */ @Override public Iterable mappings() { return new SnapshotCloneIterable(mappings); @@ -819,9 +777,6 @@ public int startPosition(WordParser wordParser, String proposal) { return -1; } - /** - * {@inheritDoc} - */ @Override public Iterable tableNames() { if (tableNamePrefix == null) { @@ -830,9 +785,6 @@ public Iterable tableNames() { return extension.tableNames(tableNamePrefix); } - /** - * {@inheritDoc} - */ @Override public String toString() { @@ -928,17 +880,11 @@ private static final class DefaultEnumProposals implements EnumProposals { this.constants = new HashSet(); } - /** - * {@inheritDoc} - */ @Override public Iterable enumConstants() { return new SnapshotCloneIterable(constants); } - /** - * {@inheritDoc} - */ @Override public IType enumType() { return enumType; @@ -975,25 +921,16 @@ public Result(String jpqlQuery, int position) { this.position = position; } - /** - * {@inheritDoc} - */ @Override public int getPosition() { return position; } - /** - * {@inheritDoc} - */ @Override public String getQuery() { return jpqlQuery; } - /** - * {@inheritDoc} - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistVisitor.java index aa420e27457..af1b8172fa6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultContentAssistVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -84,25 +84,16 @@ public DefaultContentAssistVisitor(JPQLQueryContext queryContext) { super(queryContext); } - /** - * {@inheritDoc} - */ @Override protected AcceptableTypeVisitor buildAcceptableTypeVisitor() { return new AcceptableTypeVisitor(); } - /** - * {@inheritDoc} - */ @Override protected JPQLGrammar getLatestGrammar() { return DefaultJPQLGrammar.instance(); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { // Generic JPA does not support identifying a JOIN FETCH with an identification variable @@ -114,108 +105,69 @@ protected boolean isJoinFetchIdentifiable() { */ protected class AcceptableTypeVisitor extends AbstractContentAssistVisitor.AcceptableTypeVisitor { - /** - * {@inheritDoc} - */ @Override public void visit(AbsExpression expression) { type = queryContext.getType(Number.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ArithmeticFactor expression) { type = queryContext.getType(Number.class); } - /** - * {@inheritDoc} - */ @Override public void visit(AvgFunction expression) { type = queryContext.getType(Number.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ConcatExpression expression) { type = queryContext.getType(CharSequence.class); } - /** - * {@inheritDoc} - */ @Override public void visit(LengthExpression expression) { type = queryContext.getType(CharSequence.class); } - /** - * {@inheritDoc} - */ @Override public void visit(LocateExpression expression) { // TODO: Handle the position type = queryContext.getType(CharSequence.class); } - /** - * {@inheritDoc} - */ @Override public void visit(LowerExpression expression) { type = queryContext.getType(CharSequence.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ModExpression expression) { // In theory we would only allow Long and Integer type = queryContext.getType(Number.class); } - /** - * {@inheritDoc} - */ @Override public void visit(SqrtExpression expression) { type = queryContext.getType(Number.class); } - /** - * {@inheritDoc} - */ @Override public void visit(SubstringExpression expression) { // TODO: Handle the position type = queryContext.getType(CharSequence.class); } - /** - * {@inheritDoc} - */ @Override public void visit(SumFunction expression) { type = queryContext.getType(Number.class); } - /** - * {@inheritDoc} - */ @Override public void visit(TrimExpression expression) { type = queryContext.getType(CharSequence.class); } - /** - * {@inheritDoc} - */ @Override public void visit(UpperExpression expression) { type = queryContext.getType(CharSequence.class); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultGrammarValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultGrammarValidator.java index 7a710d0d4e1..dcf0e0b55e6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultGrammarValidator.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultGrammarValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -49,33 +49,21 @@ public DefaultGrammarValidator(JPQLGrammar jpqlGrammar) { super(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected LiteralVisitor buildLiteralVisitor() { return new DefaultLiteralVisitor(); } - /** - * {@inheritDoc} - */ @Override protected OwningClauseVisitor buildOwningClauseVisitor() { return new OwningClauseVisitor(); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean isSubqueryAllowedAnywhere() { return getJPAVersion().isNewerThanOrEqual(JPAVersion.VERSION_2_1); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryContext.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryContext.java index 7ab9c1c0ba9..a3c5bebd844 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryContext.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -58,9 +58,6 @@ protected DefaultJPQLQueryContext(JPQLQueryContext parent, Expression currentQue super(parent, currentQuery); } - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildJPQLQueryContext(JPQLQueryContext currentContext, Expression currentQuery) { @@ -68,33 +65,21 @@ protected JPQLQueryContext buildJPQLQueryContext(JPQLQueryContext currentContext return new DefaultJPQLQueryContext(currentContext, currentQuery); } - /** - * {@inheritDoc} - */ @Override protected DefaultLiteralVisitor buildLiteralVisitor() { return new DefaultLiteralVisitor(); } - /** - * {@inheritDoc} - */ @Override protected DefaultParameterTypeVisitor buildParameterTypeVisitor() { return new DefaultParameterTypeVisitor(this); } - /** - * {@inheritDoc} - */ @Override protected DefaultResolverBuilder buildResolverBuilder() { return new DefaultResolverBuilder(this); } - /** - * {@inheritDoc} - */ @Override public DefaultJPQLQueryContext getParent() { return (DefaultJPQLQueryContext) super.getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryHelper.java index 168e8fd3bbc..2d485c66d32 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultJPQLQueryHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -81,9 +81,6 @@ public DefaultJPQLQueryHelper(JPQLQueryContext queryContext) { super(queryContext); } - /** - * {@inheritDoc} - */ @Override public BasicRefactoringTool buildBasicRefactoringTool() { return new DefaultBasicRefactoringTool( @@ -93,25 +90,16 @@ public BasicRefactoringTool buildBasicRefactoringTool() { ); } - /** - * {@inheritDoc} - */ @Override protected AbstractContentAssistVisitor buildContentAssistVisitor(JPQLQueryContext queryContext) { return new DefaultContentAssistVisitor(queryContext); } - /** - * {@inheritDoc} - */ @Override protected DefaultGrammarValidator buildGrammarValidator(JPQLGrammar jpqlGrammar) { return new DefaultGrammarValidator(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildJPQLQueryContext(JPQLGrammar jpqlGrammar) { return new DefaultJPQLQueryContext(jpqlGrammar); @@ -130,9 +118,6 @@ protected IJPQLQueryBuilder buildQueryBuilder() { } } - /** - * {@inheritDoc} - */ @Override public RefactoringTool buildRefactoringTool() { @@ -145,9 +130,6 @@ public RefactoringTool buildRefactoringTool() { ); } - /** - * {@inheritDoc} - */ @Override protected DefaultSemanticValidator buildSemanticValidator(JPQLQueryContext queryContext) { return new DefaultSemanticValidator(queryContext); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultParameterTypeVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultParameterTypeVisitor.java index 4f21bb7c72d..88ed521293b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultParameterTypeVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultParameterTypeVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -48,9 +48,6 @@ public DefaultParameterTypeVisitor(JPQLQueryContext queryContext) { this.queryContext = queryContext; } - /** - * {@inheritDoc} - */ @Override public IType getType() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringDelta.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringDelta.java index 4d97286ca92..bba389298ed 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringDelta.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringDelta.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -89,9 +89,6 @@ public void addTextEdits(Iterable textEdits) { } } - /** - * {@inheritDoc} - */ @Override public String applyChanges() { @@ -137,9 +134,6 @@ protected int calculateInsertionPosition(TextEdit textEdit) { return position; } - /** - * {@inheritDoc} - */ @Override public boolean hasTextEdits() { return !textEdits.isEmpty(); @@ -158,25 +152,16 @@ protected void initialize(CharSequence jpqlQuery) { this.textEdits = new LinkedList(); } - /** - * {@inheritDoc} - */ @Override public int size() { return textEdits.size(); } - /** - * {@inheritDoc} - */ @Override public ListIterable textEdits() { return new SnapshotCloneListIterable(textEdits); } - /** - * {@inheritDoc} - */ @Override public String toString() { return textEdits.toString(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringTool.java index e7549613507..251eda5b778 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringTool.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultRefactoringTool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -79,17 +79,11 @@ public DefaultRefactoringTool(IManagedTypeProvider managedTypeProvider, super(managedTypeProvider, jpqlQueryBuilder, jpqlFragment, jpqlQueryBNFId); } - /** - * {@inheritDoc} - */ @Override protected IJPQLQueryFormatter buildFormatter() { return new DefaultActualJPQLQueryFormatter(true); } - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildJPQLQueryContext() { return new DefaultJPQLQueryContext(getGrammar()); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultSemanticValidator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultSemanticValidator.java index 586fbcb0f6e..29a86e96b6a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultSemanticValidator.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultSemanticValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -207,17 +207,11 @@ protected boolean areTypesEquivalent(Object[] typeDeclarations1, Object[] typeDe return true; } - /** - * {@inheritDoc} - */ @Override protected LiteralVisitor buildLiteralVisitor() { return new DefaultLiteralVisitor(); } - /** - * {@inheritDoc} - */ @Override protected OwningClauseVisitor buildOwningClauseVisitor() { return new OwningClauseVisitor(); @@ -274,9 +268,6 @@ protected TypeValidator getValidator(Class validatorCla return validator; } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); @@ -440,17 +431,11 @@ protected boolean isValidWithFindQueryBNF(AbstractExpression expression, String } } - /** - * {@inheritDoc} - */ @Override protected PathType selectClausePathExpressionPathType() { return PathType.ANY_FIELD; } - /** - * {@inheritDoc} - */ @Override protected boolean validateAbsExpression(AbsExpression expression) { @@ -464,9 +449,6 @@ protected boolean validateAbsExpression(AbsExpression expression) { return valid; } - /** - * {@inheritDoc} - */ @Override protected int validateArithmeticExpression(ArithmeticExpression expression, String leftExpressionWrongTypeMessageKey, @@ -491,9 +473,6 @@ protected int validateArithmeticExpression(ArithmeticExpression expression, return result; } - /** - * {@inheritDoc} - */ @Override protected boolean validateAvgFunction(AvgFunction expression) { @@ -507,9 +486,6 @@ protected boolean validateAvgFunction(AvgFunction expression) { return valid; } - /** - * {@inheritDoc} - */ @Override protected int validateBetweenExpression(BetweenExpression expression) { @@ -549,9 +525,6 @@ protected boolean validateBooleanType(Expression expression, String messageKey) return true; } - /** - * {@inheritDoc} - */ @Override protected int validateCollectionMemberExpression(CollectionMemberExpression expression) { @@ -572,9 +545,6 @@ protected int validateCollectionMemberExpression(CollectionMemberExpression expr return result; } - /** - * {@inheritDoc} - */ @Override protected boolean validateComparisonExpression(ComparisonExpression expression) { @@ -596,9 +566,6 @@ protected boolean validateComparisonExpression(ComparisonExpression expression) return valid; } - /** - * {@inheritDoc} - */ @Override protected boolean validateConcatExpression(ConcatExpression expression) { @@ -619,9 +586,6 @@ protected boolean validateConcatExpression(ConcatExpression expression) { return result; } - /** - * {@inheritDoc} - */ @Override protected void validateConstructorExpression(ConstructorExpression expression) { @@ -689,9 +653,6 @@ else if (expression.hasLeftParenthesis() && } } - /** - * {@inheritDoc} - */ @Override protected void validateCountFunction(CountFunction expression) { @@ -717,18 +678,12 @@ protected void validateCountFunction(CountFunction expression) { } } - /** - * {@inheritDoc} - */ @Override protected void validateEntryExpression(EntryExpression expression) { validateMapIdentificationVariable(expression); super.validateEntryExpression(expression); } - /** - * {@inheritDoc} - */ @Override protected boolean validateIdentificationVariable(IdentificationVariable expression, String variable) { @@ -778,18 +733,12 @@ protected boolean validateIntegralType(Expression expression, String queryBNF, S return true; } - /** - * {@inheritDoc} - */ @Override protected void validateKeyExpression(KeyExpression expression) { validateMapIdentificationVariable(expression); super.validateKeyExpression(expression); } - /** - * {@inheritDoc} - */ @Override protected boolean validateLengthExpression(LengthExpression expression) { @@ -802,9 +751,6 @@ protected boolean validateLengthExpression(LengthExpression expression) { return valid; } - /** - * {@inheritDoc} - */ @Override protected int validateLocateExpression(LocateExpression expression) { @@ -831,9 +777,6 @@ protected int validateLocateExpression(LocateExpression expression) { return result; } - /** - * {@inheritDoc} - */ @Override protected boolean validateLowerExpression(LowerExpression expression) { @@ -872,9 +815,6 @@ protected void validateMapIdentificationVariable(EncapsulatedIdentificationVaria } } - /** - * {@inheritDoc} - */ @Override protected int validateModExpression(ModExpression expression) { @@ -907,18 +847,12 @@ protected int validateModExpression(ModExpression expression) { return result; } - /** - * {@inheritDoc} - */ @Override protected void validateNotExpression(NotExpression expression) { super.validateNotExpression(expression); validateBooleanType(expression.getExpression(), NotExpression_WrongType); } - /** - * {@inheritDoc} - */ @Override protected void validateNullComparisonExpression(NullComparisonExpression expression) { @@ -958,9 +892,6 @@ protected boolean validateNumericType(Expression expression, String messageKey) return true; } - /** - * {@inheritDoc} - */ @Override protected boolean validateSqrtExpression(SqrtExpression expression) { @@ -996,9 +927,6 @@ protected boolean validateStringType(Expression expression, String messageKey) { return true; } - /** - * {@inheritDoc} - */ @Override protected int validateSubstringExpression(SubstringExpression expression) { @@ -1040,9 +968,6 @@ protected int validateSubstringExpression(SubstringExpression expression) { return result; } - /** - * {@inheritDoc} - */ @Override protected boolean validateSumFunction(SumFunction expression) { @@ -1056,9 +981,6 @@ protected boolean validateSumFunction(SumFunction expression) { return valid; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("null") protected boolean validateUpdateItem(UpdateItem expression) { @@ -1153,9 +1075,6 @@ protected void validateUpdateItemTypes(UpdateItem expression, Object type) { } } - /** - * {@inheritDoc} - */ @Override protected boolean validateUpperExpression(UpperExpression expression) { @@ -1170,9 +1089,6 @@ protected boolean validateUpperExpression(UpperExpression expression) { return valid; } - /** - * {@inheritDoc} - */ @Override protected void validateValueExpression(ValueExpression expression) { validateMapIdentificationVariable(expression); @@ -1185,106 +1101,70 @@ protected void validateValueExpression(ValueExpression expression) { */ protected class BooleanTypeValidator extends TypeValidator { - /** - * {@inheritDoc} - */ @Override protected boolean isRightType(Object type) { return getTypeHelper().isBooleanType(type); } - /** - * {@inheritDoc} - */ @Override public void visit(AllOrAnyExpression expression) { // ALL|ANY|SOME always returns a boolean value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(AndExpression expression) { // AND always returns a boolean value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(BetweenExpression expression) { // BETWEEN always returns a boolean value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(ComparisonExpression expression) { // A comparison always returns a boolean value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(EmptyCollectionComparisonExpression expression) { // IS EMPTY always returns a boolean value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(ExistsExpression expression) { // EXISTS always returns a boolean value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(KeywordExpression expression) { valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(LikeExpression expression) { // LIKE always returns a boolean value valid = true; } - /** - * {@inheritDoc} - */ - @Override + @Override public void visit(NotExpression expression) { // NOT always returns a boolean value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(NullComparisonExpression expression) { // IS NULL always returns a boolean value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(OrExpression expression) { // OR always returns a boolean value @@ -1299,9 +1179,6 @@ protected static class NullValueVisitor extends AbstractExpressionVisitor { */ protected boolean valid; - /** - * {@inheritDoc} - */ @Override public void visit(KeywordExpression expression) { valid = expression.getText() == Expression.NULL; @@ -1314,170 +1191,113 @@ public void visit(KeywordExpression expression) { */ protected class NumericTypeValidator extends TypeValidator { - /** - * {@inheritDoc} - */ @Override protected boolean isRightType(Object type) { return getTypeHelper().isNumericType(type); } - /** - * {@inheritDoc} - */ @Override public void visit(AbsExpression expression) { // ABS always returns a numeric value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(AdditionExpression expression) { // An addition expression always returns a numeric value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(ArithmeticFactor expression) { // +/- is always numeric value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(AvgFunction expression) { // AVG always returns a double valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(CountFunction expression) { // COUNT always returns a long valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(DivisionExpression expression) { // A division expression always returns a numeric value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(IndexExpression expression) { // INDEX always returns an integer valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(LengthExpression expression) { // LENGTH always returns an integer valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(LocateExpression expression) { // LOCATE always returns an integer valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(MaxFunction expression) { // SUM always returns a numeric value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(MinFunction expression) { // SUM always returns a numeric value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(ModExpression expression) { // MOD always returns an integer valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(MultiplicationExpression expression) { // A multiplication expression always returns a numeric value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(NumericLiteral expression) { // A numeric literal is by definition valid valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(SizeExpression expression) { // SIZE always returns an integer valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(SqrtExpression expression) { // SQRT always returns a double valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(SubtractionExpression expression) { // A subtraction expression always returns a numeric value valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(SumFunction expression) { // SUM always returns a long @@ -1489,25 +1309,16 @@ protected static class ResultVariableInOrderByVisitor extends AbstractExpression public boolean result; - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { expression.getParent().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByClause expression) { result = true; } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByItem expression) { expression.getParent().accept(this); @@ -1520,62 +1331,41 @@ public void visit(OrderByItem expression) { */ protected class StringTypeValidator extends TypeValidator { - /** - * {@inheritDoc} - */ @Override protected boolean isRightType(Object type) { return getTypeHelper().isStringType(type); } - /** - * {@inheritDoc} - */ @Override public void visit(ConcatExpression expression) { // CONCAT always returns a string valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(LowerExpression expression) { // LOWER always returns a string valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(StringLiteral expression) { // A string literal is by definition valid valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(SubstringExpression expression) { // SUBSTRING always returns a string valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(TrimExpression expression) { // TRIM always returns a string valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(UpperExpression expression) { // UPPER always returns a string @@ -1602,27 +1392,18 @@ protected abstract class TypeValidator extends AbstractExpressionVisitor { */ protected abstract boolean isRightType(Object type); - /** - * {@inheritDoc} - */ @Override public final void visit(CaseExpression expression) { Object type = getType(expression); valid = isRightType(type); } - /** - * {@inheritDoc} - */ @Override public final void visit(CoalesceExpression expression) { Object type = getType(expression); valid = isRightType(type); } - /** - * {@inheritDoc} - */ @Override public final void visit(InputParameter expression) { // An input parameter can't be validated until the query @@ -1630,35 +1411,23 @@ public final void visit(InputParameter expression) { valid = true; } - /** - * {@inheritDoc} - */ @Override public void visit(NullExpression expression) { // The missing expression is validated by GrammarValidator valid = true; } - /** - * {@inheritDoc} - */ @Override public final void visit(NullIfExpression expression) { expression.getFirstExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public final void visit(StateFieldPathExpression expression) { Object type = getType(expression); valid = isRightType(type); } - /** - * {@inheritDoc} - */ @Override public final void visit(SubExpression expression) { expression.getExpression().accept(this); @@ -1669,41 +1438,26 @@ protected static class UpdateClauseAbstractSchemaNameFinder extends AbstractExpr protected AbstractSchemaName expression; - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaName expression) { this.expression = expression; } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionExpression expression) { expression.getParent().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclaration expression) { expression.getRootObject().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateClause expression) { expression.getRangeVariableDeclaration().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateItem expression) { expression.getParent().accept(this); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultTextEdit.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultTextEdit.java index 7948ef9a476..327578e2dc0 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultTextEdit.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/DefaultTextEdit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -55,41 +55,26 @@ public DefaultTextEdit(int offset, String oldValue, String newValue) { this.newValue = newValue; } - /** - * {@inheritDoc} - */ @Override public int getLength() { return oldValue.length(); } - /** - * {@inheritDoc} - */ @Override public String getNewValue() { return newValue; } - /** - * {@inheritDoc} - */ @Override public int getOffset() { return offset; } - /** - * {@inheritDoc} - */ @Override public String getOldValue() { return oldValue; } - /** - * {@inheritDoc} - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkBasicRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkBasicRefactoringTool.java index b28c7faa63f..439312bd405 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkBasicRefactoringTool.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkBasicRefactoringTool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -79,9 +79,6 @@ public EclipseLinkBasicRefactoringTool(CharSequence jpqlFragment, super(jpqlFragment, jpqlGrammar, managedTypeProvider, jpqlQueryBNFId); } - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildJPQLQueryContext() { return new EclipseLinkJPQLQueryContext(getGrammar()); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkContentAssistVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkContentAssistVisitor.java index 5d899f116f2..f3c00cc4841 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkContentAssistVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkContentAssistVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -101,81 +101,51 @@ public EclipseLinkContentAssistVisitor(JPQLQueryContext queryContext) { super(queryContext); } - /** - * {@inheritDoc} - */ @Override protected AcceptableTypeVisitor buildAcceptableTypeVisitor() { return new AcceptableTypeVisitor(); } - /** - * {@inheritDoc} - */ @Override protected AppendableExpressionVisitor buildAppendableExpressionVisitor() { return new AppendableExpressionVisitor(this); } - /** - * {@inheritDoc} - */ @Override protected EndingQueryPositionBuilder buildEndingQueryPositionBuilder() { return new EndingQueryPositionBuilder(this); } - /** - * {@inheritDoc} - */ @Override protected FollowingClausesVisitor buildFollowingClausesVisitor() { return new FollowingClausesVisitor(); } - /** - * {@inheritDoc} - */ @Override protected FromClauseCollectionHelper buildFromClauseCollectionHelper() { return new FromClauseCollectionHelper(this); } - /** - * {@inheritDoc} - */ @Override protected FromClauseStatementHelper buildFromClauseStatementHelper() { return new FromClauseStatementHelper(this); } - /** - * {@inheritDoc} - */ @Override protected GroupByClauseCollectionHelper buildGroupByClauseCollectionHelper() { return new GroupByClauseCollectionHelper(this); } - /** - * {@inheritDoc} - */ @Override protected IncompleteCollectionExpressionVisitor buildIncompleteCollectionExpressionVisitor() { return new IncompleteCollectionExpressionVisitor(); } - /** - * {@inheritDoc} - */ @Override protected OrderByClauseStatementHelper buildOrderByClauseStatementHelper() { return new OrderByClauseStatementHelper(this); } - /** - * {@inheritDoc} - */ @Override protected SimpleFromClauseStatementHelper buildSimpleFromClauseStatementHelper() { return new SimpleFromClauseStatementHelper(this); @@ -200,9 +170,6 @@ protected EclipseLinkVersion getEcliseLinkVersion() { return EclipseLinkVersion.value(queryContext.getProviderVersion()); } - /** - * {@inheritDoc} - */ @Override protected JPQLGrammar getLatestGrammar() { return DefaultEclipseLinkJPQLGrammar.instance(); @@ -238,9 +205,6 @@ protected UnionClauseStatementHelper getUnionClauseStatementHelper() { return helper; } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); @@ -248,9 +212,6 @@ protected void initialize() { identifierFilters.put(NOT_EQUAL, VALID_IDENTIFIER_FILTER); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { EclipseLinkVersion version = EclipseLinkVersion.value(queryContext.getProviderVersion()); @@ -270,9 +231,6 @@ protected boolean isTableExpression(Expression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(AsOfClause expression) { super.visit(expression); @@ -332,9 +290,6 @@ else if (expression.hasTimestamp()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CastExpression expression) { super.visit(expression); @@ -380,9 +335,6 @@ else if (isPositionWithin(position, length, AS)) { } } - /** - * {@inheritDoc} - */ @Override public void visit(ConnectByClause expression) { super.visit(expression); @@ -405,18 +357,12 @@ else if (expression.hasSpaceAfterConnectBy()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(DatabaseType expression) { super.visit(expression); // Nothing to do, this is database specific } - /** - * {@inheritDoc} - */ @Override public void visit(ExtractExpression expression) { super.visit(expression); @@ -493,9 +439,6 @@ else if (expression.hasLeftParenthesis()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(HierarchicalQueryClause expression) { super.visit(expression); @@ -548,9 +491,6 @@ else if (expression.hasSpaceAfterConnectByClause()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByItem expression) { super.visit(expression); @@ -600,9 +540,6 @@ public void visit(OrderByItem expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(OrderSiblingsByClause expression) { if (!isLocked(expression)) { @@ -611,9 +548,6 @@ public void visit(OrderSiblingsByClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(RegexpExpression expression) { super.visit(expression); @@ -647,9 +581,6 @@ public void visit(RegexpExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(StartWithClause expression) { if (!isLocked(expression)) { @@ -658,9 +589,6 @@ public void visit(StartWithClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(TableExpression expression) { super.visit(expression); @@ -698,9 +626,6 @@ else if (expression.hasLeftParenthesis()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(TableVariableDeclaration expression) { super.visit(expression); @@ -722,9 +647,6 @@ public void visit(TableVariableDeclaration expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(UnionClause expression) { super.visit(expression); @@ -777,9 +699,6 @@ else if (isPositionWithin(position, length, ALL)) { } } - /** - * {@inheritDoc} - */ @Override protected void visitThirdPartyPathExpression(AbstractPathExpression expression, String variableName) { @@ -814,9 +733,6 @@ protected static final class AppendableExpressionVisitor extends AbstractContent super(visitor); } - /** - * {@inheritDoc} - */ @Override public void visit(AsOfClause expression) { if (expression.hasExpression()) { @@ -824,18 +740,12 @@ public void visit(AsOfClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CastExpression expression) { appendable = !conditionalExpression && expression.hasRightParenthesis(); } - /** - * {@inheritDoc} - */ @Override public void visit(ConnectByClause expression) { if (expression.hasExpression()) { @@ -843,26 +753,17 @@ public void visit(ConnectByClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(DatabaseType expression) { // Always complete since it's a single word } - /** - * {@inheritDoc} - */ @Override public void visit(ExtractExpression expression) { appendable = !conditionalExpression && expression.hasRightParenthesis(); } - /** - * {@inheritDoc} - */ @Override public void visit(HierarchicalQueryClause expression) { @@ -877,9 +778,6 @@ else if (expression.hasStartWithClause()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(OrderSiblingsByClause expression) { @@ -890,9 +788,6 @@ public void visit(OrderSiblingsByClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(RegexpExpression expression) { if (expression.hasPatternValue()) { @@ -900,9 +795,6 @@ public void visit(RegexpExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(StartWithClause expression) { @@ -913,18 +805,12 @@ public void visit(StartWithClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(TableExpression expression) { appendable = !conditionalExpression && expression.hasRightParenthesis(); } - /** - * {@inheritDoc} - */ @Override public void visit(TableVariableDeclaration expression) { if (expression.hasIdentificationVariable()) { @@ -932,9 +818,6 @@ public void visit(TableVariableDeclaration expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(UnionClause expression) { if (expression.hasQuery()) { @@ -951,9 +834,6 @@ protected EndingQueryPositionBuilder(AbstractContentAssistVisitor visitor) { super(visitor); } - /** - * {@inheritDoc} - */ @Override public void visit(AsOfClause expression) { @@ -972,9 +852,6 @@ public void visit(AsOfClause expression) { queryPosition.addPosition(expression, expression.getLength() - correction); } - /** - * {@inheritDoc} - */ @Override public void visit(CastExpression expression) { @@ -997,9 +874,6 @@ public void visit(CastExpression expression) { queryPosition.addPosition(expression, expression.getLength() - correction); } - /** - * {@inheritDoc} - */ @Override public void visit(ConnectByClause expression) { @@ -1018,25 +892,16 @@ public void visit(ConnectByClause expression) { queryPosition.addPosition(expression, expression.getLength() - correction); } - /** - * {@inheritDoc} - */ @Override public void visit(DatabaseType expression) { visitAbstractDoubleEncapsulatedExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(ExtractExpression expression) { visitAbstractSingleEncapsulatedExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(HierarchicalQueryClause expression) { @@ -1067,9 +932,6 @@ else if (expression.hasStartWithClause()) { queryPosition.addPosition(expression, expression.getLength() - correction); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderSiblingsByClause expression) { @@ -1088,9 +950,6 @@ public void visit(OrderSiblingsByClause expression) { queryPosition.addPosition(expression, expression.getLength() - correction); } - /** - * {@inheritDoc} - */ @Override public void visit(RegexpExpression expression) { @@ -1109,25 +968,16 @@ public void visit(RegexpExpression expression) { queryPosition.addPosition(expression, expression.getLength() - correction); } - /** - * {@inheritDoc} - */ @Override public void visit(StartWithClause expression) { visitAbstractConditionalClause(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(TableExpression expression) { visitAbstractSingleEncapsulatedExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(TableVariableDeclaration expression) { @@ -1149,9 +999,6 @@ else if (!expression.hasAs()) { queryPosition.addPosition(expression, expression.getLength() - correction); } - /** - * {@inheritDoc} - */ @Override public void visit(UnionClause expression) { @@ -1183,9 +1030,6 @@ protected static final class FollowingClausesVisitor extends AbstractContentAssi protected boolean hasStartWithClause; protected boolean introspect; - /** - * {@inheritDoc} - */ @Override public void dispose() { super.dispose(); @@ -1195,9 +1039,6 @@ public void dispose() { hasOrderSiblingsByClause = false; } - /** - * {@inheritDoc} - */ @Override protected boolean hasFromClause(AbstractSelectStatement expression) { @@ -1299,9 +1140,6 @@ else if (afterIdentifier == ORDER_SIBLINGS_BY) { return false; } - /** - * {@inheritDoc} - */ @Override public void visit(FromClause expression) { @@ -1329,9 +1167,6 @@ public void visit(HierarchicalQueryClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleFromClause expression) { @@ -1354,9 +1189,6 @@ protected FromClauseCollectionHelper(AbstractContentAssistVisitor visitor) { super(visitor); } - /** - * {@inheritDoc} - */ @Override public void addAtTheEndOfChild(AbstractFromClause expression, CollectionExpression collectionExpression, @@ -1414,9 +1246,6 @@ else if ((index > 0) && end && !hasComma) { } } - /** - * {@inheritDoc} - */ @Override public void addTheBeginningOfChild(AbstractFromClause expression, CollectionExpression collectionExpression, @@ -1472,9 +1301,6 @@ protected FromClauseStatementHelper(AbstractContentAssistVisitor visitor) { super(visitor); } - /** - * {@inheritDoc} - */ @Override public void addInternalClauseProposals(SelectStatement expression) { super.addInternalClauseProposals(expression); @@ -1502,9 +1328,6 @@ public void addInternalClauseProposals(SelectStatement expression) { */ protected class IncompleteCollectionExpressionVisitor extends AbstractContentAssistVisitor.IncompleteCollectionExpressionVisitor { - /** - * {@inheritDoc} - */ @Override protected List compositeIdentifiersAfter(String clause) { @@ -1528,17 +1351,11 @@ protected OrderByClauseStatementHelper(AbstractContentAssistVisitor visitor) { super(visitor); } - /** - * {@inheritDoc} - */ @Override public UnionClauseStatementHelper getNextHelper() { return getUnionClauseStatementHelper(); } - /** - * {@inheritDoc} - */ @Override public boolean hasSpaceAfterClause(SelectStatement expression) { return expression.hasSpaceBeforeUnion(); @@ -1551,9 +1368,6 @@ protected SimpleFromClauseStatementHelper(AbstractContentAssistVisitor visitor) super(visitor); } - /** - * {@inheritDoc} - */ @Override public void addInternalClauseProposals(SimpleSelectStatement expression) { super.addInternalClauseProposals(expression); @@ -1586,9 +1400,6 @@ protected class TableExpressionVisitor extends AbstractEclipseLinkExpressionVisi */ protected boolean valid; - /** - * {@inheritDoc} - */ @Override public void visit(TableExpression expression) { valid = (this.expression == expression); @@ -1597,9 +1408,6 @@ public void visit(TableExpression expression) { protected class UnionClauseStatementHelper implements StatementHelper { - /** - * {@inheritDoc} - */ @Override public void addClauseProposals() { addIdentifier(EXCEPT); @@ -1607,56 +1415,35 @@ public void addClauseProposals() { addIdentifier(UNION); } - /** - * {@inheritDoc} - */ @Override public void addInternalClauseProposals(SelectStatement expression) { } - /** - * {@inheritDoc} - */ @Override public Expression getClause(SelectStatement expression) { return expression.getUnionClauses(); } - /** - * {@inheritDoc} - */ @Override public StatementHelper getNextHelper() { return null; } - /** - * {@inheritDoc} - */ @Override public boolean hasClause(SelectStatement expression) { return expression.hasUnionClauses(); } - /** - * {@inheritDoc} - */ @Override public boolean hasSpaceAfterClause(SelectStatement expression) { return false; } - /** - * {@inheritDoc} - */ @Override public boolean isClauseComplete(SelectStatement expression) { return isComplete(expression.getUnionClauses()); } - /** - * {@inheritDoc} - */ @Override public boolean isRequired() { return false; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryContext.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryContext.java index 6f092bf74ba..c3c5d79b6b6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryContext.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -65,17 +65,11 @@ protected EclipseLinkJPQLQueryContext(JPQLQueryContext parent, Expression curren super(parent, currentQuery); } - /** - * {@inheritDoc} - */ @Override protected DeclarationResolver buildDeclarationResolver(DeclarationResolver parent) { return new EclipseLinkDeclarationResolver(parent, this); } - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildJPQLQueryContext(JPQLQueryContext currentContext, Expression currentQuery) { @@ -83,33 +77,21 @@ protected JPQLQueryContext buildJPQLQueryContext(JPQLQueryContext currentContext return new EclipseLinkJPQLQueryContext(currentContext, currentQuery); } - /** - * {@inheritDoc} - */ @Override protected LiteralVisitor buildLiteralVisitor() { return new EclipseLinkLiteralVisitor(); } - /** - * {@inheritDoc} - */ @Override protected EclipseLinkParameterTypeVisitor buildParameterTypeVisitor() { return new EclipseLinkParameterTypeVisitor(this); } - /** - * {@inheritDoc} - */ @Override protected ResolverBuilder buildResolverBuilder() { return new EclipseLinkResolverBuilder(this); } - /** - * {@inheritDoc} - */ @Override public EclipseLinkJPQLQueryContext getParent() { return (EclipseLinkJPQLQueryContext) super.getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryHelper.java index 982ee2a9a81..476477e0965 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkJPQLQueryHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -83,9 +83,6 @@ public EclipseLinkJPQLQueryHelper(JPQLQueryContext queryContext) { super(queryContext); } - /** - * {@inheritDoc} - */ @Override public BasicRefactoringTool buildBasicRefactoringTool() { return new EclipseLinkBasicRefactoringTool( @@ -95,9 +92,6 @@ public BasicRefactoringTool buildBasicRefactoringTool() { ); } - /** - * {@inheritDoc} - */ @Override protected AbstractContentAssistVisitor buildContentAssistVisitor(JPQLQueryContext queryContext) { return new EclipseLinkContentAssistVisitor(queryContext); @@ -114,17 +108,11 @@ protected EclipseLinkSemanticValidatorExtension buildEclipseLinkSemanticValidato return EclipseLinkSemanticValidatorExtension.NULL_EXTENSION; } - /** - * {@inheritDoc} - */ @Override protected EclipseLinkGrammarValidator buildGrammarValidator(JPQLGrammar jpqlGrammar) { return new EclipseLinkGrammarValidator(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildJPQLQueryContext(JPQLGrammar jpqlGrammar) { return new EclipseLinkJPQLQueryContext(jpqlGrammar); @@ -139,9 +127,6 @@ protected IJPQLQueryBuilder buildQueryBuilder() { return new EclipseLinkJPQLQueryBuilder(getGrammar()); } - /** - * {@inheritDoc} - */ @Override public RefactoringTool buildRefactoringTool() { @@ -154,9 +139,6 @@ public RefactoringTool buildRefactoringTool() { ); } - /** - * {@inheritDoc} - */ @Override protected AbstractEclipseLinkSemanticValidator buildSemanticValidator(JPQLQueryContext queryContext) { return new EclipseLinkSemanticValidator( diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkParameterTypeVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkParameterTypeVisitor.java index 934bb37bd10..98dc45f38c8 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkParameterTypeVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkParameterTypeVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -48,9 +48,6 @@ public EclipseLinkParameterTypeVisitor(JPQLQueryContext queryContext) { this.queryContext = queryContext; } - /** - * {@inheritDoc} - */ @Override public IType getType() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkRefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkRefactoringTool.java index cdebe3db164..c3c71dd18d4 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkRefactoringTool.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkRefactoringTool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -80,17 +80,11 @@ public EclipseLinkRefactoringTool(IManagedTypeProvider managedTypeProvider, super(managedTypeProvider, jpqlQueryBuilder, jpqlFragment, jpqlQueryBNFId); } - /** - * {@inheritDoc} - */ @Override protected IJPQLQueryFormatter buildFormatter() { return new EclipseLinkActualJPQLQueryFormatter(true); } - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildJPQLQueryContext() { return new EclipseLinkJPQLQueryContext(getGrammar()); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkResolverBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkResolverBuilder.java index 36a319c9e85..c4eff81f522 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkResolverBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/EclipseLinkResolverBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -54,97 +54,61 @@ public EclipseLinkResolverBuilder(EclipseLinkJPQLQueryContext queryContext) { super(queryContext); } - /** - * {@inheritDoc} - */ @Override public void visit(AsOfClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(CastExpression expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ConnectByClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(DatabaseType expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ExtractExpression expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(HierarchicalQueryClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderSiblingsByClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(RegexpExpression expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(StartWithClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(TableExpression expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(TableVariableDeclaration expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(UnionClause expression) { resolver = buildClassResolver(Object.class); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericSemanticValidatorHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericSemanticValidatorHelper.java index 956fe8d8c9f..4748806582b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericSemanticValidatorHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericSemanticValidatorHelper.java @@ -105,9 +105,6 @@ protected IdentificationVariableVisitor buildIdentificationVariableVisitor() { return new IdentificationVariableVisitor(); } - /** - * {@inheritDoc} - */ @Override public void collectAllDeclarationIdentificationVariables(Map> identificationVariables) { @@ -144,25 +141,16 @@ protected void collectLocalDeclarationIdentificationVariables(JPQLQueryContext q } } - /** - * {@inheritDoc} - */ @Override public void collectLocalDeclarationIdentificationVariables(Map> identificationVariables) { collectLocalDeclarationIdentificationVariables(queryContext.getCurrentContext(), identificationVariables); } - /** - * {@inheritDoc} - */ @Override public void disposeSubqueryContext() { queryContext.disposeSubqueryContext(); } - /** - * {@inheritDoc} - */ @Override public String[] entityNames() { @@ -175,9 +163,6 @@ public String[] entityNames() { return names.toArray(new String[names.size()]); } - /** - * {@inheritDoc} - */ @Override public List getAllDeclarations() { @@ -192,50 +177,32 @@ public List getAllDeclarations() { return declarations; } - /** - * {@inheritDoc} - */ @Override public IConstructor[] getConstructors(Object type) { return CollectionTools.array(IConstructor.class, ((IType) type).constructors()); } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings({ "rawtypes", "unchecked" }) public List getDeclarations() { return queryContext.getDeclarations(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getEmbeddable(Object type) { return queryContext.getProvider().getEmbeddable((IType) type); } - /** - * {@inheritDoc} - */ @Override public IEntity getEntityNamed(String entityName) { return queryContext.getProvider().getEntityNamed(entityName); } - /** - * {@inheritDoc} - */ @Override public String[] getEnumConstants(Object type) { return ((IType) type).getEnumConstants(); } - /** - * {@inheritDoc} - */ @Override public JPQLGrammar getGrammar() { return queryContext.getGrammar(); @@ -259,33 +226,21 @@ protected IdentificationVariableVisitor getIdentificationVariableVisitor() { return identificationVariableVisitor; } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(Expression expression) { return queryContext.getResolver(expression).getManagedType(); } - /** - * {@inheritDoc} - */ @Override public IMapping getMappingNamed(Object managedType, String path) { return ((IManagedType) managedType).getMappingNamed(path); } - /** - * {@inheritDoc} - */ @Override public IType getMappingType(Object mapping) { return (mapping != null) ? ((IMapping) mapping).getType() : queryContext.getTypeHelper().unknownType(); } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration[] getMethodParameterTypeDeclarations(Object constructor) { return ((IConstructor) constructor).getParameterTypes(); @@ -300,9 +255,6 @@ public JPQLQueryContext getQueryContext() { return queryContext; } - /** - * {@inheritDoc} - */ @Override public IManagedType getReferenceManagedType(Object relationshipMapping) { @@ -314,41 +266,26 @@ public IManagedType getReferenceManagedType(Object relationshipMapping) { return mapping.getParent().getProvider().getManagedType(mapping.getType()); } - /** - * {@inheritDoc} - */ @Override public IType getType(Expression expression) { return queryContext.getType(expression); } - /** - * {@inheritDoc} - */ @Override public IType getType(Object typeDeclaration) { return ((ITypeDeclaration) typeDeclaration).getType(); } - /** - * {@inheritDoc} - */ @Override public IType getType(String typeName) { return queryContext.getType(typeName); } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration getTypeDeclaration(Expression expression) { return queryContext.getTypeDeclaration(expression); } - /** - * {@inheritDoc} - */ @Override public ITypeHelper getTypeHelper() { if (typeHelper == null) { @@ -357,33 +294,21 @@ public ITypeHelper getTypeHelper() { return typeHelper; } - /** - * {@inheritDoc} - */ @Override public String getTypeName(Object type) { return ((IType) type).getName(); } - /** - * {@inheritDoc} - */ @Override public boolean isAssignableTo(Object type1, Object type2) { return ((IType) type1).isAssignableTo((IType) type2) ; } - /** - * {@inheritDoc} - */ @Override public boolean isCollectionIdentificationVariable(String variableName) { return queryContext.isCollectionIdentificationVariable(variableName); } - /** - * {@inheritDoc} - */ @Override public boolean isCollectionMapping(Object mapping) { return (mapping != null) && ((IMapping) mapping).isCollection(); @@ -394,65 +319,41 @@ public boolean isEmbeddableMapping(Object mapping) { return (mapping != null) && ((IMapping) mapping).isEmbeddable(); } - /** - * {@inheritDoc} - */ @Override public boolean isEnumType(Object type) { return ((IType) type).isEnum(); } - /** - * {@inheritDoc} - */ @Override public boolean isIdentificationVariableValidInComparison(IdentificationVariable expression) { return false; } - /** - * {@inheritDoc} - */ @Override public boolean isManagedTypeResolvable(Object managedType) { return ((IManagedType) managedType).getType().isResolvable(); } - /** - * {@inheritDoc} - */ @Override public boolean isPropertyMapping(Object mapping) { return (mapping != null) && ((IMapping) mapping).isProperty(); } - /** - * {@inheritDoc} - */ @Override public boolean isRelationshipMapping(Object mapping) { return (mapping != null) && ((IMapping) mapping).isRelationship(); } - /** - * {@inheritDoc} - */ @Override public boolean isResultVariable(String variableName) { return queryContext.isResultVariable(variableName); } - /** - * {@inheritDoc} - */ @Override public boolean isTransient(Object mapping) { return (mapping != null) && ((IMapping) mapping).isTransient(); } - /** - * {@inheritDoc} - */ @Override public boolean isTypeDeclarationAssignableTo(Object typeDeclaration1, Object typeDeclaration2) { @@ -474,33 +375,21 @@ public boolean isTypeDeclarationAssignableTo(Object typeDeclaration1, Object typ return isAssignableTo(declaration1.getType(), declaration2.getType()); } - /** - * {@inheritDoc} - */ @Override public boolean isTypeResolvable(Object type) { return ((IType) type).isResolvable(); } - /** - * {@inheritDoc} - */ @Override public void newSubqueryContext(SimpleSelectStatement expression) { queryContext.newSubqueryContext(expression); } - /** - * {@inheritDoc} - */ @Override public IMapping resolveMapping(Expression expression) { return queryContext.getResolver(expression).getMapping(); } - /** - * {@inheritDoc} - */ @Override public IMapping resolveMapping(String variableName, String name) { @@ -522,9 +411,6 @@ protected static class IdentificationVariableVisitor extends AbstractExpressionV */ protected IdentificationVariable identificationVariable; - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { identificationVariable = expression; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericTypeHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericTypeHelper.java index 5a681b6e60a..f51c2a2941e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericTypeHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/GenericTypeHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -45,401 +45,251 @@ public GenericTypeHelper(TypeHelper delegate) { this.delegate = delegate; } - /** - * {@inheritDoc} - */ @Override public IType bigDecimal() { return delegate.bigDecimal(); } - /** - * {@inheritDoc} - */ @Override public IType bigInteger() { return delegate.bigInteger(); } - /** - * {@inheritDoc} - */ @Override public IType booleanType() { return delegate.booleanType(); } - /** - * {@inheritDoc} - */ @Override public IType byteType() { return delegate.byteType(); } - /** - * {@inheritDoc} - */ @Override public IType characterType() { return delegate.characterType(); } - /** - * {@inheritDoc} - */ @Override public IType collectionType() { return delegate.collectionType(); } - /** - * {@inheritDoc} - */ @Override public IType convertPrimitive(Object type) { return delegate.convertPrimitive((IType) type); } - /** - * {@inheritDoc} - */ @Override public IType dateType() { return delegate.dateType(); } - /** - * {@inheritDoc} - */ @Override public IType doubleType() { return delegate.doubleType(); } - /** - * {@inheritDoc} - */ @Override public IType enumType() { return delegate.enumType(); } - /** - * {@inheritDoc} - */ @Override public IType floatType() { return delegate.floatType(); } - /** - * {@inheritDoc} - */ @Override public IType getType(Class type) { return delegate.getType(type); } - /** - * {@inheritDoc} - */ @Override public IType getType(String typeName) { return delegate.getType(typeName); } - /** - * {@inheritDoc} - */ @Override public IType integerType() { return delegate.integerType(); } - /** - * {@inheritDoc} - */ @Override public boolean isBooleanType(Object type) { return delegate.isBooleanType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isCollectionType(Object type) { return delegate.isCollectionType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isDateType(Object type) { return delegate.isDateType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isEnumType(Object type) { return delegate.isEnumType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isFloatingType(Object type) { return delegate.isFloatingType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isIntegralType(Object type) { return delegate.isIntegralType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isMapType(Object type) { return delegate.isMapType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isNumericType(Object type) { return delegate.isNumericType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isObjectType(Object type) { return delegate.isObjectType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isPrimitiveType(Object type) { return delegate.isPrimitiveType((IType) type); } - /** - * {@inheritDoc} - */ @Override public boolean isStringType(Object type) { return delegate.isStringType((IType) type); } - /** - * {@inheritDoc} - */ @Override public IType longType() { return delegate.longType(); } - /** - * {@inheritDoc} - */ @Override public IType longType(Object type) { return delegate.longType((IType) type); } - /** - * {@inheritDoc} - */ @Override public IType mapType() { return delegate.mapType(); } - /** - * {@inheritDoc} - */ @Override public IType numberType() { return delegate.numberType(); } - /** - * {@inheritDoc} - */ @Override public IType objectType() { return delegate.objectType(); } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration objectTypeDeclaration() { return delegate.objectTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public IType primitiveBoolean() { return delegate.primitiveBoolean(); } - /** - * {@inheritDoc} - */ @Override public IType primitiveByte() { return delegate.primitiveByte(); } - /** - * {@inheritDoc} - */ @Override public IType primitiveChar() { return delegate.primitiveChar(); } - /** - * {@inheritDoc} - */ @Override public IType primitiveDouble() { return delegate.primitiveDouble(); } - /** - * {@inheritDoc} - */ @Override public IType primitiveFloat() { return delegate.primitiveFloat(); } - /** - * {@inheritDoc} - */ @Override public IType primitiveInteger() { return delegate.primitiveInteger(); } - /** - * {@inheritDoc} - */ @Override public IType primitiveLong() { return delegate.primitiveLong(); } - /** - * {@inheritDoc} - */ @Override public IType primitiveShort() { return delegate.primitiveShort(); } - /** - * {@inheritDoc} - */ @Override public IType shortType() { return delegate.shortType(); } - /** - * {@inheritDoc} - */ @Override public IType stringType() { return delegate.stringType(); } - /** - * {@inheritDoc} - */ @Override public IType timestampType() { return delegate.timestampType(); } - /** - * {@inheritDoc} - */ @Override public IType toBooleanType(Object type) { return delegate.toBooleanType((IType) type); } - /** - * {@inheritDoc} - */ @Override public IType toByteType(Object type) { return delegate.toByteType((IType) type); } - /** - * {@inheritDoc} - */ @Override public IType toDoubleType(Object type) { return delegate.toDoubleType((IType) type); } - /** - * {@inheritDoc} - */ @Override public IType toFloatType(Object type) { return delegate.toFloatType((IType) type); } - /** - * {@inheritDoc} - */ @Override public IType toIntegerType(Object type) { return delegate.toIntegerType((IType) type); } - /** - * {@inheritDoc} - */ @Override public IType toShortType(Object type) { return delegate.toShortType((IType) type); } - /** - * {@inheritDoc} - */ @Override public IType unknownType() { return delegate.unknownType(); } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration unknownTypeDeclaration() { return delegate.unknownTypeDeclaration(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/JPQLQueryContext.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/JPQLQueryContext.java index 88c4b5f6f9f..7fc06572750 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/JPQLQueryContext.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/JPQLQueryContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -897,9 +897,6 @@ protected void store(JPQLQueryContext parent, Expression currentQuery) { this.contexts.put(currentQuery, this); } - /** - * {@inheritDoc} - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -930,9 +927,6 @@ protected class InputParameterVisitor extends AbstractTraverseChildrenVisitor { */ protected String parameterName; - /** - * {@inheritDoc} - */ @Override public void visit(InputParameter expression) { if (parameterName.equals(expression.getParameter())) { @@ -940,9 +934,6 @@ public void visit(InputParameter expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { newSubqueryContext(expression); @@ -967,17 +958,11 @@ protected static class QueryExpressionVisitor extends AbstractTraverseParentVisi */ protected Expression expression; - /** - * {@inheritDoc} - */ @Override public void visit(JPQLExpression expression) { this.expression = expression; } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { this.expression = expression; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/NumericTypeComparator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/NumericTypeComparator.java index d88790b4a81..981c4882e01 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/NumericTypeComparator.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/NumericTypeComparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -42,9 +42,6 @@ public NumericTypeComparator(TypeHelper typeHelper) { this.typeHelper = typeHelper; } - /** - * {@inheritDoc} - */ @Override public int compare(IType type1, IType type2) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/RefactoringTool.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/RefactoringTool.java index 032fd638112..58dfc219f7b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/RefactoringTool.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/RefactoringTool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -364,9 +364,6 @@ public void setFormatter(IJPQLQueryFormatter jpqlQueryFormatter) { this.jpqlQueryFormatter = jpqlQueryFormatter; } - /** - * {@inheritDoc} - */ @Override public String toActualText() { return getFormatter().toString(getStateObject()); @@ -441,17 +438,11 @@ protected StateObjectUpdater pathExpression return pathExpressionUpdater; } - /** - * {@inheritDoc} - */ @Override public void visit(ConstructorExpressionStateObject stateObject) { visit(stateObject, stateObject.getClassName(), constructorUpdater()); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpressionStateObject stateObject) { visit(stateObject, stateObject.getPath(), pathExpressionUpdater()); @@ -554,9 +545,6 @@ public EntityNameRenamer(String oldEntityName, String newEntityName) { this.newEntityName = newEntityName; } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaNameStateObject stateObject) { if (oldEntityName.equals(stateObject.getText())) { @@ -564,9 +552,6 @@ public void visit(AbstractSchemaNameStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(EntityTypeLiteralStateObject stateObject) { if (oldEntityName.equals(stateObject.getText())) { @@ -574,9 +559,6 @@ public void visit(EntityTypeLiteralStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableStateObject stateObject) { if (oldEntityName.equals(stateObject.getText())) { @@ -584,9 +566,6 @@ public void visit(IdentificationVariableStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(TreatExpressionStateObject stateObject) { if (oldEntityName.equals(stateObject.getEntityTypeName())) { @@ -646,17 +625,11 @@ protected void renameEnumConstant(AbstractPathExpressionStateObject stateObject) } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpressionStateObject stateObject) { renameEnumConstant(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpressionStateObject stateObject) { renameEnumConstant(stateObject); @@ -739,17 +712,11 @@ protected void rename(AbstractPathExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpressionStateObject stateObject) { rename(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpressionStateObject stateObject) { rename(stateObject); @@ -788,9 +755,6 @@ public ResultVariableNameRenamer(String oldVariableName, String newVariableName) this.newVariableName = newVariableName; } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableStateObject stateObject) { @@ -801,9 +765,6 @@ public void visit(IdentificationVariableStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(JPQLQueryStateObject stateObject) { if (stateObject.hasQueryStatement()) { @@ -811,9 +772,6 @@ public void visit(JPQLQueryStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByItemStateObject stateObject) { if (stateObject.hasStateObject()) { @@ -821,9 +779,6 @@ public void visit(OrderByItemStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariableStateObject stateObject) { if (oldVariableName.equalsIgnoreCase(stateObject.getResultVariable())) { @@ -831,9 +786,6 @@ public void visit(ResultVariableStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatementStateObject stateObject) { @@ -894,9 +846,6 @@ public VariableNameRenamer(String oldVariableName, String newVariableName) { this.newVariableName = newVariableName; } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpressionStateObject stateObject) { @@ -906,9 +855,6 @@ public void visit(CollectionValuedPathExpressionStateObject stateObject) { super.visit(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableStateObject stateObject) { if (oldVariableName.equalsIgnoreCase(stateObject.getText())) { @@ -916,9 +862,6 @@ public void visit(IdentificationVariableStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpressionStateObject stateObject) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractActualJPQLQueryFormatter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractActualJPQLQueryFormatter.java index a6d624c885e..c806900910a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractActualJPQLQueryFormatter.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractActualJPQLQueryFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -718,49 +718,31 @@ protected void toStringTripleEncapsulated(AbstractTripleEncapsulatedExpressionSt } } - /** - * {@inheritDoc} - */ @Override public void visit(AbsExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaNameStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AdditionExpressionStateObject stateObject) { toStringCompound(stateObject, PLUS); } - /** - * {@inheritDoc} - */ @Override public void visit(AllOrAnyExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AndExpressionStateObject stateObject) { toStringCompound(stateObject, AND); } - /** - * {@inheritDoc} - */ @Override public void visit(ArithmeticFactorStateObject stateObject) { @@ -776,25 +758,16 @@ public void visit(ArithmeticFactorStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(AvgFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(BadExpressionStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(BetweenExpressionStateObject stateObject) { @@ -848,9 +821,6 @@ public void visit(BetweenExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CaseExpressionStateObject stateObject) { @@ -910,9 +880,6 @@ public void visit(CaseExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CoalesceExpressionStateObject stateObject) { @@ -942,9 +909,6 @@ else if (expression.hasSpaceAfterIdentifier()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberDeclarationStateObject stateObject) { @@ -999,9 +963,6 @@ else if (stateObject.isDerived() && } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberExpressionStateObject stateObject) { @@ -1044,25 +1005,16 @@ public void visit(CollectionMemberExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpressionStateObject stateObject) { toStringPathExpression(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ComparisonExpressionStateObject stateObject) { toStringCompound(stateObject, stateObject.getIdentifier()); } - /** - * {@inheritDoc} - */ @Override public void visit(ConcatExpressionStateObject stateObject) { @@ -1089,9 +1041,6 @@ public void visit(ConcatExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(ConstructorExpressionStateObject stateObject) { @@ -1125,17 +1074,11 @@ public void visit(ConstructorExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CountFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DateTimeStateObject stateObject) { @@ -1148,9 +1091,6 @@ public void visit(DateTimeStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteClauseStateObject stateObject) { @@ -1181,41 +1121,26 @@ public void visit(DeleteClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteStatementStateObject stateObject) { toStringModifyStatement(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DerivedPathIdentificationVariableDeclarationStateObject stateObject) { toStringIdentificationVariableDeclaration(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DerivedPathVariableDeclarationStateObject stateObject) { toStringRangeVariableDeclaration(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DivisionExpressionStateObject stateObject) { toStringCompound(stateObject, DIVISION); } - /** - * {@inheritDoc} - */ @Override public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) { @@ -1243,33 +1168,21 @@ public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(EntityTypeLiteralStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(EntryExpressionStateObject stateObject) { toStringEncapsulatedIdentificationVariable(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(EnumTypeStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ExistsExpressionStateObject stateObject) { @@ -1311,17 +1224,11 @@ public void visit(ExistsExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(FromClauseStateObject stateObject) { toStringFromClause(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(FunctionExpressionStateObject stateObject) { @@ -1366,9 +1273,6 @@ else if (exactMatch && expression.hasSpaceAfterIdentifier()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(GroupByClauseStateObject stateObject) { @@ -1392,9 +1296,6 @@ public void visit(GroupByClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(HavingClauseStateObject stateObject) { @@ -1420,33 +1321,21 @@ public void visit(HavingClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclarationStateObject stateObject) { toStringIdentificationVariableDeclaration(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(IndexExpressionStateObject stateObject) { toStringEncapsulatedIdentificationVariable(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(InExpressionStateObject stateObject) { @@ -1487,17 +1376,11 @@ else if (shouldOutput(expression) || expression.hasSpaceAfterIn()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(InputParameterStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(JoinStateObject stateObject) { @@ -1545,9 +1428,6 @@ public void visit(JoinStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(JPQLQueryStateObject stateObject) { @@ -1559,17 +1439,11 @@ else if (stateObject.hasQueryStatement()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(KeyExpressionStateObject stateObject) { toStringEncapsulatedIdentificationVariable(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(KeywordExpressionStateObject stateObject) { @@ -1582,17 +1456,11 @@ public void visit(KeywordExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(LengthExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(LikeExpressionStateObject stateObject) { @@ -1651,57 +1519,36 @@ public void visit(LikeExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(LocateExpressionStateObject stateObject) { toStringTripleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(LowerExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(MaxFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(MinFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ModExpressionStateObject stateObject) { toStringDoubleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(MultiplicationExpressionStateObject stateObject) { toStringCompound(stateObject, MULTIPLICATION); } - /** - * {@inheritDoc} - */ @Override public void visit(NotExpressionStateObject stateObject) { @@ -1725,9 +1572,6 @@ public void visit(NotExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(NullComparisonExpressionStateObject stateObject) { @@ -1758,33 +1602,21 @@ public void visit(NullComparisonExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(NullIfExpressionStateObject stateObject) { toStringDoubleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(NumericLiteralStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ObjectExpressionStateObject stateObject) { toStringEncapsulatedIdentificationVariable(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByClauseStateObject stateObject) { @@ -1808,9 +1640,6 @@ public void visit(OrderByClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByItemStateObject stateObject) { @@ -1844,25 +1673,16 @@ public void visit(OrderByItemStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(OrExpressionStateObject stateObject) { toStringCompound(stateObject, OR); } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclarationStateObject stateObject) { toStringRangeVariableDeclaration(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariableStateObject stateObject) { @@ -1903,9 +1723,6 @@ public void visit(ResultVariableStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SelectClauseStateObject stateObject) { @@ -1938,9 +1755,6 @@ public void visit(SelectClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatementStateObject stateObject) { @@ -1967,17 +1781,11 @@ public void visit(SelectStatementStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleFromClauseStateObject stateObject) { toStringFromClause(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectClauseStateObject stateObject) { @@ -2010,9 +1818,6 @@ public void visit(SimpleSelectClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatementStateObject stateObject) { @@ -2024,73 +1829,46 @@ public void visit(SimpleSelectStatementStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SizeExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SqrtExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpressionStateObject stateObject) { toStringPathExpression(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(StringLiteralStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SubExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SubstringExpressionStateObject stateObject) { toStringTripleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SubtractionExpressionStateObject stateObject) { toStringCompound(stateObject, MINUS); } - /** - * {@inheritDoc} - */ @Override public void visit(SumFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(TreatExpressionStateObject stateObject) { @@ -2135,9 +1913,6 @@ public void visit(TreatExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(TrimExpressionStateObject stateObject) { @@ -2206,25 +1981,16 @@ else if ((expression != null) && expression.hasSpaceAfterIdentifier()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(TypeExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UnknownExpressionStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateClauseStateObject stateObject) { @@ -2264,9 +2030,6 @@ public void visit(UpdateClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateItemStateObject stateObject) { @@ -2299,33 +2062,21 @@ public void visit(UpdateItemStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateStatementStateObject stateObject) { toStringModifyStatement(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UpperExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ValueExpressionStateObject stateObject) { toStringEncapsulatedIdentificationVariable(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(WhenClauseStateObject stateObject) { @@ -2367,9 +2118,6 @@ public void visit(WhenClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(WhereClauseStateObject stateObject) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractCaseExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractCaseExpressionStateObjectBuilder.java index 9a81230427d..9c0b8df4331 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractCaseExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractCaseExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -47,9 +47,6 @@ protected AbstractCaseExpressionStateObjectBuilder(StateObject parent) { caseExpressionStateObject = new CaseExpressionStateObject(parent); } - /** - * {@inheritDoc} - */ @Override public CaseExpressionStateObject buildStateObject() { caseExpressionStateObject.setElse(pop()); @@ -59,9 +56,6 @@ public CaseExpressionStateObject buildStateObject() { return caseExpressionStateObject; } - /** - * {@inheritDoc} - */ @Override public ICaseExpressionStateObjectBuilder when(ICaseExpressionStateObjectBuilder when, ICaseExpressionStateObjectBuilder then) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalExpressionStateObjectBuilder.java index ab1cb27fe8e..5193a3b016d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -63,9 +63,6 @@ public AbstractConditionalExpressionStateObjectBuilder(StateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public T all(SimpleSelectStatementStateObject subquery) { allOrAny(ALL, subquery); @@ -77,9 +74,6 @@ protected void allOrAny(String identifier, SimpleSelectStatementStateObject subq add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T and(T builder) { @@ -98,9 +92,6 @@ public T and(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T any(SimpleSelectStatementStateObject subquery) { allOrAny(ANY, subquery); @@ -124,9 +115,6 @@ protected void between(boolean not) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T between(T lowerBoundExpression, T upperBoundExpression) { checkBuilders(lowerBoundExpression, upperBoundExpression); @@ -134,9 +122,6 @@ public T between(T lowerBoundExpression, T upperBoundExpression) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T collectionPath(String path) { StateObject stateObject = buildCollectionPath(path); @@ -162,27 +147,18 @@ protected void comparison(String identifier, StateObject rightStateObject) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T different(Number number) { comparison(DIFFERENT, buildNumeric(number)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T different(String literal) { comparison(DIFFERENT, literal(literal)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T different(T builder) { checkBuilder(builder); @@ -190,27 +166,18 @@ public T different(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T equal(Number number) { comparison(EQUAL, buildNumeric(number)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T equal(String literal) { comparison(EQUAL, literal(literal)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T equal(T builder) { checkBuilder(builder); @@ -223,45 +190,30 @@ protected void exists(boolean not, SimpleSelectStatementStateObject subquery) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T exists(SimpleSelectStatementStateObject subquery) { exists(false, subquery); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T FALSE() { keyword(FALSE); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T greaterThan(Number number) { comparison(GREATER_THAN, buildNumeric(number)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T greaterThan(String literal) { comparison(GREATER_THAN, literal(literal)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T greaterThan(T builder) { checkBuilder(builder); @@ -269,27 +221,18 @@ public T greaterThan(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T greaterThanOrEqual(Number number) { comparison(GREATER_THAN_OR_EQUAL, buildNumeric(number)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T greaterThanOrEqual(String literal) { comparison(GREATER_THAN_OR_EQUAL, literal(literal)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T greaterThanOrEqual(T builder) { checkBuilder(builder); @@ -319,27 +262,18 @@ protected void in(boolean not, T... inItems) { in(false, stateObjects(inItems)); } - /** - * {@inheritDoc} - */ @Override public T in(SimpleSelectStatementStateObject subquery) { in(false, Collections.singletonList(subquery)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T in(String... inItems) { in(false, inItems); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T in(T... inItems) { checkBuilders(inItems); @@ -358,27 +292,18 @@ protected void isEmpty(boolean not, String path) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T isEmpty(String path) { isEmpty(false, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T isNotEmpty(String path) { isEmpty(true, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T isNotNull(String path) { isNull(true, path); @@ -405,9 +330,6 @@ protected void isNull(boolean not, String path) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T isNull(String path) { isNull(false, path); @@ -435,18 +357,12 @@ protected void like(boolean not, String escapeCharacter) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T like(String patternValue) { like(string(patternValue)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T like(T patternValue) { checkBuilder(patternValue); @@ -454,9 +370,6 @@ public T like(T patternValue) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T like(T patternValue, String escapeCharacter) { checkBuilder(patternValue); @@ -464,9 +377,6 @@ public T like(T patternValue, String escapeCharacter) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T lower(T builder) { checkBuilder(builder); @@ -475,27 +385,18 @@ public T lower(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T lowerThan(Number number) { comparison(LOWER_THAN, buildNumeric(number)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T lowerThan(String literal) { comparison(LOWER_THAN, literal(literal)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T lowerThan(T builder) { checkBuilder(builder); @@ -503,27 +404,18 @@ public T lowerThan(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T lowerThanOrEqual(Number number) { comparison(LOWER_THAN_OR_EQUAL, buildNumeric(number)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T lowerThanOrEqual(String literal) { comparison(LOWER_THAN_OR_EQUAL, literal(literal)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T lowerThanOrEqual(T builder) { checkBuilder(builder); @@ -546,27 +438,18 @@ protected void member(boolean not, boolean of, String collectionValuedPathExpres add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T member(String path) { member(false, false, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T memberOf(String path) { member(false, true, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notBetween(T lowerBoundExpression, T upperBoundExpression) { checkBuilders(lowerBoundExpression, upperBoundExpression); @@ -574,36 +457,24 @@ public T notBetween(T lowerBoundExpression, T upperBoundExpression) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notExists(SimpleSelectStatementStateObject subquery) { exists(true, subquery); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notIn(SimpleSelectStatementStateObject subquery) { in(true, Collections.singletonList(subquery)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notIn(String... inItems) { in(true, inItems); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notIn(T... inItems) { checkBuilders(inItems); @@ -611,18 +482,12 @@ public T notIn(T... inItems) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notLike(String patternValue) { notLike(string(patternValue)); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notLike(T builder) { checkBuilder(builder); @@ -630,9 +495,6 @@ public T notLike(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notLike(T builder, String escapeCharacter) { checkBuilder(builder); @@ -640,36 +502,24 @@ public T notLike(T builder, String escapeCharacter) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notMember(String path) { member(true, false, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T notMemberOf(String path) { member(true, true, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T NULL() { keyword(NULL); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T or(T builder) { @@ -688,18 +538,12 @@ public T or(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T some(SimpleSelectStatementStateObject subquery) { allOrAny(SOME, subquery); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T sub(StateObject stateObject) { stateObject = new SubExpressionStateObject(getParent(), stateObject); @@ -707,9 +551,6 @@ public T sub(StateObject stateObject) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T substring(T parameter1, T parameter2, T parameter3) { @@ -730,9 +571,6 @@ public T substring(T parameter1, T parameter2, T parameter3) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T trim(Specification specification, String trimCharacter, T builder) { @@ -750,26 +588,17 @@ public T trim(Specification specification, String trimCharacter, T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T trim(Specification specification, T builder) { return trim(specification, null, builder); } - /** - * {@inheritDoc} - */ @Override public T TRUE() { keyword(TRUE); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T upper(T builder) { checkBuilder(builder); @@ -778,9 +607,6 @@ public T upper(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T variable(String variable) { StateObject stateObject = buildIdentificationVariable(variable); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalStateObjectBuilderWrapper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalStateObjectBuilderWrapper.java index 47b82858049..b747bf017e5 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalStateObjectBuilderWrapper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractConditionalStateObjectBuilderWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -46,65 +46,41 @@ public AbstractConditionalStateObjectBuilderWrapper(IConditionalExpressionStateO this.delegate = delegate; } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder abs(IConditionalExpressionStateObjectBuilder builder) { return delegate.abs(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder add(IConditionalExpressionStateObjectBuilder builder) { return delegate.add(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder all(SimpleSelectStatementStateObject subquery) { return delegate.all(subquery); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder and(IConditionalExpressionStateObjectBuilder builder) { return delegate.and(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder any(SimpleSelectStatementStateObject subquery) { return delegate.any(subquery); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder avg(String path) { return delegate.avg(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder avgDistinct(String path) { return delegate.avgDistinct(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder between(IConditionalExpressionStateObjectBuilder lowerBoundExpression, IConditionalExpressionStateObjectBuilder upperBoundExpression) { @@ -112,281 +88,176 @@ public IConditionalExpressionStateObjectBuilder between(IConditionalExpressionSt return delegate.between(lowerBoundExpression, upperBoundExpression); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder collectionPath(String path) { return delegate.collectionPath(path); } - /** - * {@inheritDoc} - */ @Override public void commit() { delegate.commit(); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder count(String path) { return delegate.count(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder countDistinct(String path) { return delegate.countDistinct(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder currentDate() { return delegate.currentDate(); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder currentTime() { return delegate.currentTime(); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder currentTimestamp() { return delegate.currentTimestamp(); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder date(String jdbcDate) { return delegate.date(jdbcDate); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder different(IConditionalExpressionStateObjectBuilder builder) { return delegate.different(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder different(Number number) { return delegate.different(number); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder different(String literal) { return delegate.different(literal); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder divide(IConditionalExpressionStateObjectBuilder builder) { return delegate.divide(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder entityType(String entityTypeName) { return delegate.entityType(entityTypeName); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder equal(IConditionalExpressionStateObjectBuilder builder) { return delegate.equal(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder equal(Number number) { return delegate.equal(number); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder equal(String literal) { return delegate.equal(literal); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder exists(SimpleSelectStatementStateObject subquery) { return delegate.exists(subquery); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder FALSE() { return delegate.FALSE(); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder greaterThan(IConditionalExpressionStateObjectBuilder builder) { return delegate.greaterThan(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder greaterThan(Number number) { return delegate.greaterThan(number); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder greaterThan(String literal) { return delegate.greaterThan(literal); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder greaterThanOrEqual(IConditionalExpressionStateObjectBuilder builder) { return delegate.greaterThanOrEqual(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder greaterThanOrEqual(Number number) { return delegate.greaterThanOrEqual(number); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder greaterThanOrEqual(String literal) { return delegate.greaterThanOrEqual(literal); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder in(IConditionalExpressionStateObjectBuilder... inItems) { return delegate.in(inItems); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder in(SimpleSelectStatementStateObject subquery) { return delegate.in(subquery); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder in(String... inItems) { return delegate.in(inItems); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder index(String variable) { return delegate.index(variable); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder isEmpty(String path) { return delegate.isEmpty(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder isNotEmpty(String path) { return delegate.isNotEmpty(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder isNotNull(String path) { return delegate.isNotNull(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder isNull(String path) { return delegate.isNull(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder length(IConditionalExpressionStateObjectBuilder builder) { return delegate.length(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder like(IConditionalExpressionStateObjectBuilder patternValue) { return delegate.like(patternValue); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder like(IConditionalExpressionStateObjectBuilder patternValue, String escapeCharacter) { @@ -394,17 +265,11 @@ public IConditionalExpressionStateObjectBuilder like(IConditionalExpressionState return delegate.like(patternValue, escapeCharacter); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder like(String patternValue) { return delegate.like(patternValue); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder locate(IConditionalExpressionStateObjectBuilder parameter1, IConditionalExpressionStateObjectBuilder parameter2) { @@ -412,9 +277,6 @@ public IConditionalExpressionStateObjectBuilder locate(IConditionalExpressionSta return delegate.locate(parameter1, parameter2); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder locate(IConditionalExpressionStateObjectBuilder parameter1, IConditionalExpressionStateObjectBuilder parameter2, IConditionalExpressionStateObjectBuilder parameter3) { @@ -422,121 +284,76 @@ public IConditionalExpressionStateObjectBuilder locate(IConditionalExpressionSta return delegate.locate(parameter1, parameter2); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder lower(IConditionalExpressionStateObjectBuilder builder) { return delegate.lower(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder lowerThan(IConditionalExpressionStateObjectBuilder builder) { return delegate.lowerThan(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder lowerThan(Number number) { return delegate.lowerThan(number); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder lowerThan(String literal) { return delegate.lowerThan(literal); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder lowerThanOrEqual(IConditionalExpressionStateObjectBuilder builder) { return delegate.lowerThanOrEqual(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder lowerThanOrEqual(Number number) { return delegate.lowerThanOrEqual(number); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder lowerThanOrEqual(String literal) { return delegate.lowerThanOrEqual(literal); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder max(String path) { return delegate.max(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder maxDistinct(String path) { return delegate.maxDistinct(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder member(String path) { return delegate.member(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder memberOf(String path) { return delegate.memberOf(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder min(String path) { return delegate.min(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder minDistinct(String path) { return delegate.minDistinct(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder minus(IConditionalExpressionStateObjectBuilder builder) { return delegate.minus(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder mod(IConditionalExpressionStateObjectBuilder parameter1, IConditionalExpressionStateObjectBuilder parameter2) { @@ -544,17 +361,11 @@ public IConditionalExpressionStateObjectBuilder mod(IConditionalExpressionStateO return delegate.mod(parameter1, parameter2); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder multiply(IConditionalExpressionStateObjectBuilder builder) { return delegate.multiply(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notBetween(IConditionalExpressionStateObjectBuilder lowerBoundExpression, IConditionalExpressionStateObjectBuilder upperBoundExpression) { @@ -562,49 +373,31 @@ public IConditionalExpressionStateObjectBuilder notBetween(IConditionalExpressio return delegate.notBetween(lowerBoundExpression, upperBoundExpression); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notExists(SimpleSelectStatementStateObject subquery) { return delegate.notExists(subquery); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notIn(IConditionalExpressionStateObjectBuilder... inItems) { return delegate.notIn(inItems); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notIn(SimpleSelectStatementStateObject subquery) { return delegate.notIn(subquery); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notIn(String... inItems) { return delegate.notIn(inItems); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notLike(IConditionalExpressionStateObjectBuilder builder) { return delegate.notLike(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notLike(IConditionalExpressionStateObjectBuilder builder, String escapeCharacter) { @@ -612,161 +405,101 @@ public IConditionalExpressionStateObjectBuilder notLike(IConditionalExpressionSt return delegate.notLike(builder, escapeCharacter); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notLike(String patternValue) { return delegate.notLike(patternValue); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notMember(String path) { return delegate.notMember(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder notMemberOf(String path) { return delegate.notMemberOf(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder NULL() { return delegate.NULL(); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder numeric(Number numeric) { return delegate.numeric(numeric); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder or(IConditionalExpressionStateObjectBuilder builder) { return delegate.or(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder parameter(String parameter) { return delegate.parameter(parameter); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder path(String path) { return delegate.path(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder plus(IConditionalExpressionStateObjectBuilder builder) { return delegate.plus(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder size(String path) { return delegate.size(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder some(SimpleSelectStatementStateObject subquery) { return delegate.some(subquery); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder sqrt(IConditionalExpressionStateObjectBuilder builder) { return delegate.sqrt(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder string(String literal) { return delegate.string(literal); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder sub(IConditionalExpressionStateObjectBuilder builder) { return delegate.sub(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder sub(StateObject stateObject) { return delegate.sub(stateObject); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder substring(IConditionalExpressionStateObjectBuilder parameter1, IConditionalExpressionStateObjectBuilder parameter2, IConditionalExpressionStateObjectBuilder parameter3) { return null; } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder subtract(IConditionalExpressionStateObjectBuilder builder) { return delegate.subtract(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder sum(String path) { return delegate.sum(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder sumDistinct(String path) { return delegate.sumDistinct(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder trim(Specification specification, IConditionalExpressionStateObjectBuilder builder) { @@ -774,9 +507,6 @@ public IConditionalExpressionStateObjectBuilder trim(Specification specification return delegate.trim(specification, builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder trim(Specification specification, String trimCharacter, @@ -785,33 +515,21 @@ public IConditionalExpressionStateObjectBuilder trim(Specification specification return delegate.trim(specification, trimCharacter, builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder TRUE() { return delegate.TRUE(); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder type(String path) { return delegate.type(path); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder upper(IConditionalExpressionStateObjectBuilder builder) { return delegate.upper(builder); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder variable(String variable) { return delegate.variable(variable); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSelectExpressionStateObjectBuilder.java index f6db40ec909..c3e6fb27929 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSelectExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSelectExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -35,17 +35,11 @@ protected AbstractEclipseLinkSelectExpressionStateObjectBuilder(SelectClauseStat super(parent); } - /** - * {@inheritDoc} - */ @Override public IEclipseLinkSelectExpressionStateObjectBuilder append() { return (IEclipseLinkSelectExpressionStateObjectBuilder) super.append(); } - /** - * {@inheritDoc} - */ @Override public IEclipseLinkSelectExpressionStateObjectBuilder new_(String className, ISelectExpressionStateObjectBuilder... parameters) { @@ -53,33 +47,21 @@ public IEclipseLinkSelectExpressionStateObjectBuilder new_(String className, return (IEclipseLinkSelectExpressionStateObjectBuilder) super.new_(className, parameters); } - /** - * {@inheritDoc} - */ @Override public IEclipseLinkSelectExpressionStateObjectBuilder object(String identificationVariable) { return (IEclipseLinkSelectExpressionStateObjectBuilder) super.object(identificationVariable); } - /** - * {@inheritDoc} - */ @Override public IEclipseLinkSelectExpressionStateObjectBuilder resultVariable(String resultVariable) { return (IEclipseLinkSelectExpressionStateObjectBuilder) super.resultVariable(resultVariable); } - /** - * {@inheritDoc} - */ @Override public IEclipseLinkSelectExpressionStateObjectBuilder resultVariableAs(String resultVariable) { return (IEclipseLinkSelectExpressionStateObjectBuilder) super.resultVariableAs(resultVariable); } - /** - * {@inheritDoc} - */ @Override public IEclipseLinkSelectExpressionStateObjectBuilder variable(String variable) { StateObject stateObject = buildIdentificationVariable(variable); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSimpleSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSimpleSelectExpressionStateObjectBuilder.java index 062a883fce6..105f5b9572c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSimpleSelectExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractEclipseLinkSimpleSelectExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -34,25 +34,16 @@ protected AbstractEclipseLinkSimpleSelectExpressionStateObjectBuilder(SimpleSele super(parent); } - /** - * {@inheritDoc} - */ @Override public void commit() { getParent().setSelectItem(pop()); } - /** - * {@inheritDoc} - */ @Override protected SimpleSelectClauseStateObject getParent() { return (SimpleSelectClauseStateObject) super.getParent(); } - /** - * {@inheritDoc} - */ @Override public IEclipseLinkSimpleSelectExpressionStateObjectBuilder variable(String variable) { return (IEclipseLinkSimpleSelectExpressionStateObjectBuilder) super.variable(variable); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryBuilder.java index 89e8f8ed16d..73a8d141dd3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -46,17 +46,11 @@ protected AbstractJPQLQueryBuilder() { super(); } - /** - * {@inheritDoc} - */ @Override public ICaseExpressionStateObjectBuilder buildCaseExpressionStateObjectBuilder(StateObject parent) { return new DefaultCaseExpressionStateObjectBuilder(parent); } - /** - * {@inheritDoc} - */ @Override public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider, CharSequence jpqlQuery, @@ -65,9 +59,6 @@ public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider, return buildStateObject(provider, jpqlQuery, JPQLStatementBNF.ID, tolerant); } - /** - * {@inheritDoc} - */ @Override public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider, CharSequence jpqlQuery, @@ -96,9 +87,6 @@ public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider, } } - /** - * {@inheritDoc} - */ @Override public StateObject buildStateObject(StateObject parent, CharSequence jpqlFragment, diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryFormatter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryFormatter.java index f186f8662be..ff523a59eb7 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryFormatter.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractJPQLQueryFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -424,49 +424,31 @@ protected void toStringTripleEncapsulated(AbstractTripleEncapsulatedExpressionSt } } - /** - * {@inheritDoc} - */ @Override public void visit(AbsExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaNameStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AdditionExpressionStateObject stateObject) { toStringCompound(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AllOrAnyExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AndExpressionStateObject stateObject) { toStringCompound(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ArithmeticFactorStateObject stateObject) { if (stateObject.isDecorated()) { @@ -480,25 +462,16 @@ public void visit(ArithmeticFactorStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(AvgFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(BadExpressionStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(BetweenExpressionStateObject stateObject) { @@ -533,9 +506,6 @@ public void visit(BetweenExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CaseExpressionStateObject stateObject) { @@ -568,9 +538,6 @@ public void visit(CaseExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CoalesceExpressionStateObject stateObject) { @@ -595,9 +562,6 @@ public void visit(CoalesceExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberDeclarationStateObject stateObject) { @@ -633,9 +597,6 @@ public void visit(CollectionMemberDeclarationStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberExpressionStateObject stateObject) { @@ -666,25 +627,16 @@ else if (stateObject.hasOf()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpressionStateObject stateObject) { toStringPathExpression(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ComparisonExpressionStateObject stateObject) { toStringCompound(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ConcatExpressionStateObject stateObject) { @@ -700,9 +652,6 @@ public void visit(ConcatExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(ConstructorExpressionStateObject stateObject) { @@ -729,17 +678,11 @@ public void visit(ConstructorExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CountFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DateTimeStateObject stateObject) { @@ -751,9 +694,6 @@ else if (stateObject.hasText()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteClauseStateObject stateObject) { @@ -767,41 +707,26 @@ public void visit(DeleteClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteStatementStateObject stateObject) { toStringModifyStatement(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DerivedPathIdentificationVariableDeclarationStateObject stateObject) { toStringIdentificationVariableDeclaration(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DerivedPathVariableDeclarationStateObject stateObject) { toStringRangeVariableDeclaration(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DivisionExpressionStateObject stateObject) { toStringCompound(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) { @@ -815,33 +740,21 @@ public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(EntityTypeLiteralStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(EntryExpressionStateObject stateObject) { toStringEncapsulatedIdentificationVariable(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(EnumTypeStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ExistsExpressionStateObject stateObject) { @@ -872,17 +785,11 @@ public void visit(ExistsExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(FromClauseStateObject stateObject) { toStringFromClause(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(FunctionExpressionStateObject stateObject) { @@ -906,9 +813,6 @@ public void visit(FunctionExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(GroupByClauseStateObject stateObject) { @@ -926,33 +830,21 @@ public void visit(GroupByClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(HavingClauseStateObject stateObject) { toStringConditional(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclarationStateObject stateObject) { toStringIdentificationVariableDeclaration(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(IndexExpressionStateObject stateObject) { @@ -969,9 +861,6 @@ public void visit(IndexExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(InExpressionStateObject stateObject) { @@ -1010,17 +899,11 @@ public void visit(InExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(InputParameterStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(JoinStateObject stateObject) { @@ -1043,25 +926,16 @@ public void visit(JoinStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(JPQLQueryStateObject stateObject) { toText(stateObject.getQueryStatement()); } - /** - * {@inheritDoc} - */ @Override public void visit(KeyExpressionStateObject stateObject) { toStringEncapsulatedIdentificationVariable(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(KeywordExpressionStateObject stateObject) { @@ -1073,17 +947,11 @@ else if (stateObject.hasText()) { } } - /** - * {@inheritDoc} - */ @Override public void visit(LengthExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(LikeExpressionStateObject stateObject) { @@ -1113,57 +981,36 @@ public void visit(LikeExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(LocateExpressionStateObject stateObject) { toStringTripleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(LowerExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(MaxFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(MinFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ModExpressionStateObject stateObject) { toStringDoubleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(MultiplicationExpressionStateObject stateObject) { toStringCompound(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(NotExpressionStateObject stateObject) { @@ -1181,9 +1028,6 @@ public void visit(NotExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(NullComparisonExpressionStateObject stateObject) { @@ -1201,33 +1045,21 @@ public void visit(NullComparisonExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(NullIfExpressionStateObject stateObject) { toStringDoubleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(NumericLiteralStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ObjectExpressionStateObject stateObject) { toStringEncapsulatedIdentificationVariable(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByClauseStateObject stateObject) { @@ -1245,9 +1077,6 @@ public void visit(OrderByClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByItemStateObject stateObject) { @@ -1267,25 +1096,16 @@ public void visit(OrderByItemStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(OrExpressionStateObject stateObject) { toStringCompound(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclarationStateObject stateObject) { toStringRangeVariableDeclaration(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariableStateObject stateObject) { @@ -1313,9 +1133,6 @@ public void visit(ResultVariableStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SelectClauseStateObject stateObject) { @@ -1338,9 +1155,6 @@ public void visit(SelectClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatementStateObject stateObject) { @@ -1352,17 +1166,11 @@ public void visit(SelectStatementStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleFromClauseStateObject stateObject) { toStringFromClause(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectClauseStateObject stateObject) { @@ -1385,81 +1193,51 @@ public void visit(SimpleSelectClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatementStateObject stateObject) { toStringSelectStatement(stateObject, false); } - /** - * {@inheritDoc} - */ @Override public void visit(SizeExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SqrtExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpressionStateObject stateObject) { toStringPathExpression(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(StringLiteralStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SubExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SubstringExpressionStateObject stateObject) { toStringTripleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SubtractionExpressionStateObject stateObject) { toStringCompound(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SumFunctionStateObject stateObject) { toStringAggregateFunction(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(TreatExpressionStateObject stateObject) { @@ -1492,9 +1270,6 @@ public void visit(TreatExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(TrimExpressionStateObject stateObject) { @@ -1539,25 +1314,16 @@ public void visit(TrimExpressionStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(TypeExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UnknownExpressionStateObject stateObject) { toStringSimpleStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateClauseStateObject stateObject) { @@ -1579,9 +1345,6 @@ public void visit(UpdateClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateItemStateObject stateObject) { @@ -1602,33 +1365,21 @@ public void visit(UpdateItemStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateStatementStateObject stateObject) { toStringModifyStatement(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UpperExpressionStateObject stateObject) { toStringSingleEncapsulated(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ValueExpressionStateObject stateObject) { toStringEncapsulatedIdentificationVariable(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(WhenClauseStateObject stateObject) { @@ -1654,9 +1405,6 @@ public void visit(WhenClauseStateObject stateObject) { } } - /** - * {@inheritDoc} - */ @Override public void visit(WhereClauseStateObject stateObject) { toStringConditional(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractNewValueStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractNewValueStateObjectBuilder.java index e5162a752b5..02e924c981a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractNewValueStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractNewValueStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -38,25 +38,16 @@ protected AbstractNewValueStateObjectBuilder(UpdateItemStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void commit() { getParent().setNewValue(pop()); } - /** - * {@inheritDoc} - */ @Override protected UpdateItemStateObject getParent() { return (UpdateItemStateObject) super.getParent(); } - /** - * {@inheritDoc} - */ @Override public INewValueStateObjectBuilder NULL() { StateObject stateObject = new KeywordExpressionStateObject(getParent(), NULL); @@ -64,9 +55,6 @@ public INewValueStateObjectBuilder NULL() { return this; } - /** - * {@inheritDoc} - */ @Override public INewValueStateObjectBuilder variable(String variable) { StateObject stateObject = buildIdentificationVariable(variable); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractScalarExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractScalarExpressionStateObjectBuilder.java index 8fa569e7354..88ac4fa65d2 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractScalarExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractScalarExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -88,9 +88,6 @@ protected AbstractScalarExpressionStateObjectBuilder(StateObject parent) { this.parent = parent; } - /** - * {@inheritDoc} - */ @Override public T abs(T builder) { @@ -101,9 +98,6 @@ public T abs(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T add(T builder) { @@ -132,18 +126,12 @@ protected void avg(boolean distinct, String path) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T avg(String path) { avg(false, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T avgDistinct(String path) { avg(true, path); @@ -178,9 +166,6 @@ protected StateObject buildStringLiteral(String literal) { return new StringLiteralStateObject(parent, literal); } - /** - * {@inheritDoc} - */ @Override public T case_(ICaseExpressionStateObjectBuilder builder) { Assert.isEqual(caseBuilder, builder, "The Case expression builder is not the same as the current one"); @@ -189,9 +174,6 @@ public T case_(ICaseExpressionStateObjectBuilder builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T coalesce(T builder1, T builder2, T... builders) { @@ -208,9 +190,6 @@ public T coalesce(T builder1, T builder2, T... builders) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T concat(T builder1, T builder2, T... builders) { @@ -232,51 +211,33 @@ protected void count(boolean distinct, String path) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T count(String path) { count(false, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T countDistinct(String path) { count(true, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T currentDate() { return date(CURRENT_DATE); } - /** - * {@inheritDoc} - */ @Override public T currentTime() { return date(CURRENT_TIME); } - /** - * {@inheritDoc} - */ @Override public T currentTimestamp() { return date(CURRENT_TIMESTAMP); } - /** - * {@inheritDoc} - */ @Override public T date(String jdbcDate) { StateObject stateObject = new DateTimeStateObject(parent, jdbcDate); @@ -284,9 +245,6 @@ public T date(String jdbcDate) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T divide(T builder) { @@ -305,9 +263,6 @@ public T divide(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T entityType(String entityTypeName) { StateObject stateObject = new EntityTypeLiteralStateObject(parent,entityTypeName); @@ -315,9 +270,6 @@ public T entityType(String entityTypeName) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T enumLiteral(Enum> enumConstant) { StateObject stateObject = new EnumTypeStateObject(parent, enumConstant); @@ -325,9 +277,6 @@ public T enumLiteral(Enum> enumConstant) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T function(String identifier, String functionName, String... arguments) { @@ -342,9 +291,6 @@ public T function(String identifier, String functionName, String... arguments) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T function(String identifier, String functionName, T... arguments) { @@ -361,9 +307,6 @@ public T function(String identifier, String functionName, T... arguments) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public ICaseExpressionStateObjectBuilder getCaseBuilder() { if (caseBuilder == null) { @@ -382,9 +325,6 @@ protected StateObject getParent() { return parent; } - /** - * {@inheritDoc} - */ @Override public T index(String variable) { StateObject stateObject = new IndexExpressionStateObject(parent, variable); @@ -392,9 +332,6 @@ public T index(String variable) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T length(T builder) { @@ -442,17 +379,11 @@ protected List literals(String... literals) { return stateObjects; } - /** - * {@inheritDoc} - */ @Override public T locate(T parameter1, T parameter2) { return locate(parameter1, parameter2, null); } - /** - * {@inheritDoc} - */ @Override public T locate(T parameter1, T parameter2, T parameter3) { @@ -482,18 +413,12 @@ protected void max(boolean distinct, String path) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T max(String path) { max(false, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T maxDistinct(String path) { max(true, path); @@ -505,27 +430,18 @@ protected void min(boolean distinct, String path) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T min(String path) { min(false, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T minDistinct(String path) { min(true, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T minus(T builder) { checkBuilders(builder); @@ -533,9 +449,6 @@ public T minus(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T mod(T parameter1, T parameter2) { @@ -554,9 +467,6 @@ public T mod(T parameter1, T parameter2) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T multiply(T builder) { @@ -575,9 +485,6 @@ public T multiply(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T nullIf(T builder1, T builder2) { @@ -596,9 +503,6 @@ public T nullIf(T builder1, T builder2) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T numeric(Number number) { StateObject stateObject = buildNumeric(number); @@ -606,9 +510,6 @@ public T numeric(Number number) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T numeric(String number) { StateObject stateObject = buildNumeric(number); @@ -616,9 +517,6 @@ public T numeric(String number) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T parameter(String parameter) { StateObject stateObject = buildInputParameter(parameter); @@ -626,9 +524,6 @@ public T parameter(String parameter) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T path(String path) { StateObject stateObject = buildStateFieldPath(path); @@ -636,9 +531,6 @@ public T path(String path) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T plus(T builder) { checkBuilders(builder); @@ -646,9 +538,6 @@ public T plus(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T size(String path) { StateObject stateObject = new SizeExpressionStateObject(parent, buildCollectionPath(path)); @@ -656,9 +545,6 @@ public T size(String path) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T sqrt(T builder) { @@ -701,9 +587,6 @@ protected List stateObjects(T... builders) { return stateObjects(builders.length); } - /** - * {@inheritDoc} - */ @Override public T string(String literal) { StateObject stateObject = buildStringLiteral(literal); @@ -711,9 +594,6 @@ public T string(String literal) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T sub(T builder) { @@ -724,9 +604,6 @@ public T sub(T builder) { return (T) this; } - /** - * {@inheritDoc} - */ @Override public T subtract(T builder) { @@ -750,27 +627,18 @@ protected void sum(boolean distinct, String path) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public T sum(String path) { sum(false, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T sumDistinct(String path) { sum(true, path); return (T) this; } - /** - * {@inheritDoc} - */ @Override public T type(String path) { StateObject stateObject = new TypeExpressionStateObject(parent, path); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSelectExpressionStateObjectBuilder.java index ed078ba052d..9ea638977d0 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSelectExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSelectExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -46,18 +46,12 @@ protected AbstractSelectExpressionStateObjectBuilder(SelectClauseStateObject par stateObjectList = new ArrayList(); } - /** - * {@inheritDoc} - */ @Override public ISelectExpressionStateObjectBuilder append() { stateObjectList.add(pop()); return this; } - /** - * {@inheritDoc} - */ @Override public void commit() { if (hasStateObjects()) { @@ -66,17 +60,11 @@ public void commit() { getParent().addItems(stateObjectList); } - /** - * {@inheritDoc} - */ @Override protected SelectClauseStateObject getParent() { return (SelectClauseStateObject) super.getParent(); } - /** - * {@inheritDoc} - */ @Override public ISelectExpressionStateObjectBuilder new_(String className, ISelectExpressionStateObjectBuilder... parameters) { @@ -92,9 +80,6 @@ public ISelectExpressionStateObjectBuilder new_(String className, return this; } - /** - * {@inheritDoc} - */ @Override public ISelectExpressionStateObjectBuilder object(String identificationVariable) { StateObject stateObject = new ObjectExpressionStateObject(getParent(), identificationVariable); @@ -102,9 +87,6 @@ public ISelectExpressionStateObjectBuilder object(String identificationVariable) return this; } - /** - * {@inheritDoc} - */ @Override public ISelectExpressionStateObjectBuilder resultVariable(String resultVariable) { resultVariable(resultVariable, false); @@ -123,18 +105,12 @@ protected void resultVariable(String resultVariable, boolean as) { add(stateObject); } - /** - * {@inheritDoc} - */ @Override public ISelectExpressionStateObjectBuilder resultVariableAs(String resultVariable) { resultVariable(resultVariable, true); return this; } - /** - * {@inheritDoc} - */ @Override public ISelectExpressionStateObjectBuilder variable(String variable) { StateObject stateObject = buildIdentificationVariable(variable); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSimpleSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSimpleSelectExpressionStateObjectBuilder.java index 8c58121199d..c5c7646f573 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSimpleSelectExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/AbstractSimpleSelectExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -38,17 +38,11 @@ protected AbstractSimpleSelectExpressionStateObjectBuilder(AbstractSelectClauseS super(parent); } - /** - * {@inheritDoc} - */ @Override protected AbstractSelectClauseStateObject getParent() { return (AbstractSelectClauseStateObject) super.getParent(); } - /** - * {@inheritDoc} - */ @Override public ISimpleSelectExpressionStateObjectBuilder variable(String variable) { StateObject stateObject = buildIdentificationVariable(variable); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BaseJPQLQueryFormatter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BaseJPQLQueryFormatter.java index dd50a9891d1..c5e681ef3b0 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BaseJPQLQueryFormatter.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BaseJPQLQueryFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -102,17 +102,11 @@ public IdentifierStyle getIdentifierStyle() { return style; } - /** - * {@inheritDoc} - */ @Override public String toString() { return writer.toString(); } - /** - * {@inheritDoc} - */ @Override public String toString(StateObject stateObject) { writer.delete(0, writer.length()); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BasicStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BasicStateObjectBuilder.java index cb18612d445..fd568764add 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BasicStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/BasicStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -517,9 +517,6 @@ protected String literal(Expression expression, LiteralType type) { } } - /** - * {@inheritDoc} - */ @Override public void visit(AbsExpression expression) { @@ -530,9 +527,6 @@ public void visit(AbsExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaName expression) { @@ -545,9 +539,6 @@ public void visit(AbstractSchemaName expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(AdditionExpression expression) { @@ -567,9 +558,6 @@ public void visit(AdditionExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(AllOrAnyExpression expression) { @@ -585,9 +573,6 @@ public void visit(AllOrAnyExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(AndExpression expression) { @@ -607,9 +592,6 @@ public void visit(AndExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(ArithmeticFactor expression) { @@ -625,9 +607,6 @@ public void visit(ArithmeticFactor expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(AvgFunction expression) { @@ -643,9 +622,6 @@ public void visit(AvgFunction expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(BadExpression expression) { @@ -658,9 +634,6 @@ public void visit(BadExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(BetweenExpression expression) { @@ -685,9 +658,6 @@ public void visit(BetweenExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(CaseExpression expression) { @@ -710,9 +680,6 @@ public void visit(CaseExpression expression) { this.stateObject = caseExpressionStateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(CoalesceExpression expression) { @@ -725,9 +692,6 @@ public void visit(CoalesceExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionExpression expression) { @@ -742,18 +706,12 @@ public void visit(CollectionExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberDeclaration expression) { // Not done here stateObject = null; } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberExpression expression) { @@ -772,9 +730,6 @@ public void visit(CollectionMemberExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpression expression) { @@ -787,9 +742,6 @@ public void visit(CollectionValuedPathExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(ComparisonExpression expression) { @@ -810,9 +762,6 @@ public void visit(ComparisonExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(ConcatExpression expression) { @@ -825,9 +774,6 @@ public void visit(ConcatExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(ConstructorExpression expression) { @@ -841,9 +787,6 @@ public void visit(ConstructorExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(CountFunction expression) { @@ -859,9 +802,6 @@ public void visit(CountFunction expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(DateTime expression) { DateTimeStateObject stateObject = new DateTimeStateObject(parent, expression.getText()); @@ -869,26 +809,17 @@ public void visit(DateTime expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteClause expression) { // Done via DeleteStatementBuilder stateObject = null; } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteStatement expression) { stateObject = getDeleteStatementBuilder().buildStateObject(parent, expression); } - /** - * {@inheritDoc} - */ @Override public void visit(DivisionExpression expression) { @@ -908,9 +839,6 @@ public void visit(DivisionExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(EmptyCollectionComparisonExpression expression) { @@ -924,9 +852,6 @@ public void visit(EmptyCollectionComparisonExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(EntityTypeLiteral expression) { @@ -939,9 +864,6 @@ public void visit(EntityTypeLiteral expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(EntryExpression expression) { @@ -954,9 +876,6 @@ public void visit(EntryExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(ExistsExpression expression) { @@ -972,18 +891,12 @@ public void visit(ExistsExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public final void visit(FromClause expression) { // Not done here stateObject = null; } - /** - * {@inheritDoc} - */ @Override public void visit(FunctionExpression expression) { @@ -998,26 +911,17 @@ public void visit(FunctionExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public final void visit(GroupByClause expression) { // Not done here stateObject = null; } - /** - * {@inheritDoc} - */ @Override public void visit(HavingClause expression) { expression.getConditionalExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { @@ -1031,9 +935,6 @@ public void visit(IdentificationVariable expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public final void visit(final IdentificationVariableDeclaration expression) { @@ -1051,9 +952,6 @@ public void visit(SimpleFromClauseStateObject stateObject) { stateObject.accept(visitor); } - /** - * {@inheritDoc} - */ @Override public void visit(IndexExpression expression) { @@ -1066,9 +964,6 @@ public void visit(IndexExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(InExpression expression) { @@ -1086,9 +981,6 @@ public void visit(InExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(InputParameter expression) { @@ -1101,9 +993,6 @@ public void visit(InputParameter expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public final void visit(Join expression) { stateObject = getJoinBuilder().buildStateObject( @@ -1112,9 +1001,6 @@ public final void visit(Join expression) { ); } - /** - * {@inheritDoc} - */ @Override public void visit(JPQLExpression expression) { @@ -1125,9 +1011,6 @@ public void visit(JPQLExpression expression) { parent.setQueryStatement(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(KeyExpression expression) { @@ -1140,9 +1023,6 @@ public void visit(KeyExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(KeywordExpression expression) { @@ -1155,9 +1035,6 @@ public void visit(KeywordExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(LengthExpression expression) { @@ -1172,9 +1049,6 @@ public void visit(LengthExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(LikeExpression expression) { @@ -1196,9 +1070,6 @@ public void visit(LikeExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(LocateExpression expression) { @@ -1222,9 +1093,6 @@ public void visit(LocateExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(LowerExpression expression) { @@ -1239,9 +1107,6 @@ public void visit(LowerExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(MaxFunction expression) { @@ -1257,9 +1122,6 @@ public void visit(MaxFunction expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(MinFunction expression) { @@ -1275,9 +1137,6 @@ public void visit(MinFunction expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(ModExpression expression) { @@ -1297,9 +1156,6 @@ public void visit(ModExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(MultiplicationExpression expression) { @@ -1319,9 +1175,6 @@ public void visit(MultiplicationExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(NotExpression expression) { @@ -1336,9 +1189,6 @@ public void visit(NotExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(NullComparisonExpression expression) { @@ -1354,17 +1204,11 @@ public void visit(NullComparisonExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(NullExpression expression) { stateObject = null; } - /** - * {@inheritDoc} - */ @Override public void visit(NullIfExpression expression) { @@ -1384,9 +1228,6 @@ public void visit(NullIfExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(NumericLiteral expression) { @@ -1399,9 +1240,6 @@ public void visit(NumericLiteral expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(ObjectExpression expression) { @@ -1414,26 +1252,17 @@ public void visit(ObjectExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(OnClause expression) { expression.getConditionalExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public final void visit(OrderByClause expression) { // Not done here stateObject = null; } - /** - * {@inheritDoc} - */ @Override public final void visit(OrderByItem expression) { @@ -1446,9 +1275,6 @@ public final void visit(OrderByItem expression) { orderByItem.setStateObject(stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(OrExpression expression) { @@ -1468,18 +1294,12 @@ public void visit(OrExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public final void visit(RangeVariableDeclaration expression) { // Not done here stateObject = null; } - /** - * {@inheritDoc} - */ @Override public final void visit(final ResultVariable expression) { @@ -1496,52 +1316,34 @@ public void visit(SelectClauseStateObject stateObject) { stateObject.accept(visitor); } - /** - * {@inheritDoc} - */ @Override public final void visit(SelectClause expression) { // Not done here stateObject = null; } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatement expression) { stateObject = getSelectStatementBuilder().buildStateObject(parent, expression); } - /** - * {@inheritDoc} - */ @Override public final void visit(SimpleFromClause expression) { // Done via SimpleSelectStatementBuilder stateObject = null; } - /** - * {@inheritDoc} - */ @Override public final void visit(SimpleSelectClause expression) { // Done via SimpleSelectStatementBuilder stateObject = null; } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { stateObject = getSimpleSelectStatementBuilder().buildStateObject(parent, expression); } - /** - * {@inheritDoc} - */ @Override public void visit(SizeExpression expression) { @@ -1556,9 +1358,6 @@ public void visit(SizeExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(SqrtExpression expression) { @@ -1573,9 +1372,6 @@ public void visit(SqrtExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpression expression) { @@ -1588,9 +1384,6 @@ public void visit(StateFieldPathExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(StringLiteral expression) { @@ -1603,9 +1396,6 @@ public void visit(StringLiteral expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(SubExpression expression) { @@ -1620,9 +1410,6 @@ public void visit(SubExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(SubstringExpression expression) { @@ -1646,9 +1433,6 @@ public void visit(SubstringExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(SubtractionExpression expression) { @@ -1668,9 +1452,6 @@ public void visit(SubtractionExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(SumFunction expression) { @@ -1686,17 +1467,11 @@ public void visit(SumFunction expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(TreatExpression expression) { // Done by JoinBuilder } - /** - * {@inheritDoc} - */ @Override public void visit(TrimExpression expression) { @@ -1717,9 +1492,6 @@ public void visit(TrimExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(TypeExpression expression) { @@ -1734,9 +1506,6 @@ public void visit(TypeExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(UnknownExpression expression) { @@ -1749,33 +1518,21 @@ public void visit(UnknownExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public final void visit(UpdateClause expression) { // Done via UpdateStatementBuilder } - /** - * {@inheritDoc} - */ @Override public final void visit(UpdateItem expression) { // Done via UpdateStatementBuilder } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateStatement expression) { stateObject = getUpdateStatementBuilder().buildStateObject(parent, expression); } - /** - * {@inheritDoc} - */ @Override public void visit(UpperExpression expression) { @@ -1790,9 +1547,6 @@ public void visit(UpperExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(ValueExpression expression) { @@ -1805,18 +1559,12 @@ public void visit(ValueExpression expression) { this.stateObject = stateObject; } - /** - * {@inheritDoc} - */ @Override public final void visit(WhenClause expression) { // Done throw WhenClauseBuilder stateObject = null; } - /** - * {@inheritDoc} - */ @Override public void visit(WhereClause expression) { expression.getConditionalExpression().accept(this); @@ -1866,9 +1614,6 @@ protected abstract class AbstractRangeDeclarationBuilder(); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionExpression expression) { CollectionTools.addAll(children, expression.children()); } - /** - * {@inheritDoc} - */ @Override protected void visit(Expression expression) { children.add(expression); @@ -2044,9 +1753,6 @@ protected static class CollectionMemberDeclarationBuilder extends AbstractTraver protected AbstractFromClauseStateObject parent; protected CollectionMemberDeclarationStateObject stateObject; - /** - * {@inheritDoc} - */ @Override public CollectionMemberDeclarationStateObject buildStateObject(AbstractFromClauseStateObject parent, Expression expression) { @@ -2062,9 +1768,6 @@ public CollectionMemberDeclarationStateObject buildStateObject(AbstractFromClaus } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberDeclaration expression) { stateObject = parent.addCollectionDeclaration(); @@ -2074,9 +1777,6 @@ public void visit(CollectionMemberDeclaration expression) { super.visit(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpression expression) { CollectionValuedPathExpressionStateObject path = stateObject.getCollectionValuedPath(); @@ -2084,9 +1784,6 @@ public void visit(CollectionValuedPathExpression expression) { path.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { IdentificationVariableStateObject variable = stateObject.getIdentificationVariable(); @@ -2106,9 +1803,6 @@ protected class DeleteStatementBuilder extends AbstractTraverseChildrenVisitor protected JPQLQueryStateObject parent; protected DeleteStatementStateObject stateObject; - /** - * {@inheritDoc} - */ @Override public DeleteStatementStateObject buildStateObject(JPQLQueryStateObject parent, Expression expression) { @@ -2123,9 +1817,6 @@ public DeleteStatementStateObject buildStateObject(JPQLQueryStateObject parent, } } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaName expression) { AbstractSchemaNameStateObject entityStateObject = stateObject.getAbstractSchemaNameStateObject(); @@ -2133,18 +1824,12 @@ public void visit(AbstractSchemaName expression) { entityStateObject.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteClause expression) { stateObject.getModifyClause().setExpression(expression); super.visit(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteStatement expression) { stateObject = parent.addDeleteStatement(); @@ -2152,9 +1837,6 @@ public void visit(DeleteStatement expression) { super.visit(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { IdentificationVariableStateObject variable = stateObject.getIdentificationVariableStateObject(); @@ -2163,18 +1845,12 @@ public void visit(IdentificationVariable expression) { variable.setVirtual(expression.isVirtual()); } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclaration expression) { stateObject.getModifyClause().getRangeVariableDeclaration().setExpression(expression); super.visit(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(WhereClause expression) { @@ -2194,9 +1870,6 @@ protected class JoinBuilder extends AbstractExpressionVisitor protected AbstractIdentificationVariableDeclarationStateObject parent; protected JoinStateObject stateObject; - /** - * {@inheritDoc} - */ @Override public JoinStateObject buildStateObject(AbstractIdentificationVariableDeclarationStateObject parent, Expression expression) { @@ -2212,26 +1885,17 @@ public JoinStateObject buildStateObject(AbstractIdentificationVariableDeclaratio } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionExpression expression) { expression.acceptChildren(this); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclaration expression) { expression.getRangeVariableDeclaration().accept(this); expression.getJoins().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(Join expression) { @@ -2248,9 +1912,6 @@ public void visit(Join expression) { expression.getIdentificationVariable().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(TreatExpression expression) { @@ -2272,17 +1933,11 @@ public void visit(TreatExpression expression) { */ protected class RangeDeclarationBuilder extends AbstractRangeDeclarationBuilder { - /** - * {@inheritDoc} - */ @Override protected AbstractIdentificationVariableDeclarationStateObject addRangeDeclaration(IdentificationVariableDeclaration expression) { return parent.addRangeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaName expression) { super.visit(expression); @@ -2301,9 +1956,6 @@ protected class SelectItemBuilder extends AnonymousExpressionVisitor protected SelectClauseStateObject parent; protected StateObject stateObject; - /** - * {@inheritDoc} - */ @Override public StateObject buildStateObject(SelectClauseStateObject parent, Expression expression) { @@ -2318,18 +1970,12 @@ public StateObject buildStateObject(SelectClauseStateObject parent, Expression e } } - /** - * {@inheritDoc} - */ @Override protected void visit(Expression expression) { expression.accept(BasicStateObjectBuilder.this); stateObject = BasicStateObjectBuilder.this.stateObject; } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariable expression) { @@ -2353,9 +1999,6 @@ public void visit(ResultVariable expression) { */ protected class SelectStatementBuilder extends AbstractSelectStatementBuilder { - /** - * {@inheritDoc} - */ @Override public void visit(FromClause expression) { @@ -2366,17 +2009,11 @@ public void visit(FromClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclaration expression) { getRangeDeclarationBuilder().buildStateObject(stateObject.getFromClause(), expression); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByClause expression) { @@ -2386,9 +2023,6 @@ public void visit(OrderByClause expression) { super.visit(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByItem expression) { @@ -2401,9 +2035,6 @@ public void visit(OrderByItem expression) { orderByItem.setStateObject(BasicStateObjectBuilder.this.stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SelectClause expression) { @@ -2421,9 +2052,6 @@ public void visit(SelectClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatement expression) { @@ -2441,9 +2069,6 @@ public void visit(SelectStatement expression) { */ protected class SimpleRangeDeclarationBuilder extends AbstractRangeDeclarationBuilder { - /** - * {@inheritDoc} - */ @Override protected AbstractIdentificationVariableDeclarationStateObject addRangeDeclaration(IdentificationVariableDeclaration expression) { @@ -2461,9 +2086,6 @@ protected AbstractIdentificationVariableDeclarationStateObject addRangeDeclarati return parent.addRangeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpression expression) { DerivedPathIdentificationVariableDeclarationStateObject stateObject = (DerivedPathIdentificationVariableDeclarationStateObject) this.stateObject; @@ -2478,17 +2100,11 @@ public void visit(CollectionValuedPathExpression expression) { */ protected class SimpleSelectStatementBuilder extends AbstractSelectStatementBuilder { - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclaration expression) { getSimpleRangeDeclarationBuilder().buildStateObject(stateObject.getFromClause(), expression); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleFromClause expression) { @@ -2499,9 +2115,6 @@ public void visit(SimpleFromClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectClause expression) { @@ -2516,9 +2129,6 @@ public void visit(SimpleSelectClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { @@ -2541,9 +2151,6 @@ protected class UpdateStatementBuilder extends AbstractTraverseChildrenVisitor protected UpdateStatementStateObject stateObject; protected UpdateItemStateObject updateItem; - /** - * {@inheritDoc} - */ @Override public UpdateStatementStateObject buildStateObject(JPQLQueryStateObject parent, Expression expression) { @@ -2559,18 +2166,12 @@ public UpdateStatementStateObject buildStateObject(JPQLQueryStateObject parent, } } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaName expression) { stateObject.setEntityName(expression.getText()); stateObject.getModifyClause().getAbstractSchemaNameStateObject().setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { @@ -2584,36 +2185,24 @@ public void visit(IdentificationVariable expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclaration expression) { stateObject.getModifyClause().getRangeVariableDeclaration().setExpression(expression); super.visit(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpression expression) { updateItem.getStateFieldPath().setPaths(expression.paths().iterator()); updateItem.getStateFieldPath().setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateClause expression) { stateObject.getModifyClause().setExpression(expression); super.visit(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateItem expression) { @@ -2651,9 +2240,6 @@ public void visit(UpdateItem expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateStatement expression) { @@ -2664,9 +2250,6 @@ public void visit(UpdateStatement expression) { super.visit(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(WhereClause expression) { @@ -2691,9 +2274,6 @@ protected class WhenClauseBuilder extends AbstractTraverseChildrenVisitor */ private CaseExpressionStateObject parent; - /** - * {@inheritDoc} - */ @Override public CaseExpressionStateObject buildStateObject(CaseExpressionStateObject parent, Expression expression) { @@ -2708,9 +2288,6 @@ public CaseExpressionStateObject buildStateObject(CaseExpressionStateObject pare } } - /** - * {@inheritDoc} - */ @Override public void visit(WhenClause expression) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultConditionalExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultConditionalExpressionStateObjectBuilder.java index 87cd94026a5..94be7984119 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultConditionalExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultConditionalExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,17 +36,11 @@ public DefaultConditionalExpressionStateObjectBuilder(AbstractConditionalClauseS super(parent); } - /** - * {@inheritDoc} - */ @Override public void commit() { getParent().setConditional(pop()); } - /** - * {@inheritDoc} - */ @Override protected AbstractConditionalClauseStateObject getParent() { return (AbstractConditionalClauseStateObject) super.getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultProblem.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultProblem.java index 48ad1ff2574..0b5f8a7c17f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultProblem.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultProblem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -60,33 +60,21 @@ public DefaultProblem(StateObject stateObject, String messageKey, String[] argum this.arguments = arguments; } - /** - * {@inheritDoc} - */ @Override public String[] getMessageArguments() { return arguments; } - /** - * {@inheritDoc} - */ @Override public String getMessageKey() { return messageKey; } - /** - * {@inheritDoc} - */ @Override public StateObject getStateObject() { return stateObject; } - /** - * {@inheritDoc} - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultSimpleSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultSimpleSelectExpressionStateObjectBuilder.java index 04e1b29c268..370dad6a632 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultSimpleSelectExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultSimpleSelectExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -33,17 +33,11 @@ public DefaultSimpleSelectExpressionStateObjectBuilder(SimpleSelectClauseStateOb super(parent); } - /** - * {@inheritDoc} - */ @Override public void commit() { getParent().setSelectItem(pop()); } - /** - * {@inheritDoc} - */ @Override protected SimpleSelectClauseStateObject getParent() { return (SimpleSelectClauseStateObject) super.getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultStateObjectBuilder.java index 12b69dbb119..f1878ce2da3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/DefaultStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,9 +36,6 @@ public DefaultStateObjectBuilder() { super(); } - /** - * {@inheritDoc} - */ @Override protected LiteralVisitor buildLiteralVisitor() { return new DefaultLiteralVisitor(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkConditionalStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkConditionalStateObjectBuilder.java index e0b8c4ecf9a..90326bf1671 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkConditionalStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkConditionalStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,17 +36,11 @@ public EclipseLinkConditionalStateObjectBuilder(AbstractConditionalClauseStateOb super(parent); } - /** - * {@inheritDoc} - */ @Override public void commit() { getParent().setConditional(pop()); } - /** - * {@inheritDoc} - */ @Override protected AbstractConditionalClauseStateObject getParent() { return (AbstractConditionalClauseStateObject) super.getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkJPQLQueryBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkJPQLQueryBuilder.java index 9f255bd2d9a..3442b3350bd 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkJPQLQueryBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkJPQLQueryBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -50,57 +50,36 @@ public EclipseLinkJPQLQueryBuilder(JPQLGrammar jpqlGrammar) { this.jpqlGrammar = jpqlGrammar; } - /** - * {@inheritDoc} - */ @Override protected EclipseLinkStateObjectBuilder buildStateObjectBuilder() { return new EclipseLinkStateObjectBuilder(); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) { return new EclipseLinkConditionalStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public EclipseLinkSelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) { return new EclipseLinkSelectExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public EclipseLinkSimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) { return new EclipseLinkSimpleSelectExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) { return new DefaultNewValueStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public JPQLGrammar getGrammar() { return jpqlGrammar; } - /** - * {@inheritDoc} - */ @Override public String toString() { return "EclipseLinkJPQLQueryBuilder using " + jpqlGrammar.toString(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkStateObjectBuilder.java index 193be5d9e38..56624269ea4 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/EclipseLinkStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -55,103 +55,64 @@ public EclipseLinkStateObjectBuilder() { super(); } - /** - * {@inheritDoc} - */ @Override protected LiteralVisitor buildLiteralVisitor() { return new EclipseLinkLiteralVisitor(); } - /** - * {@inheritDoc} - */ @Override public void visit(AsOfClause expression) { } - /** - * {@inheritDoc} - */ @Override public void visit(CastExpression expression) { // TODO } - /** - * {@inheritDoc} - */ @Override public void visit(ConnectByClause expression) { // TODO } - /** - * {@inheritDoc} - */ @Override public void visit(DatabaseType expression) { // TODO } - /** - * {@inheritDoc} - */ @Override public void visit(ExtractExpression expression) { // TODO } - /** - * {@inheritDoc} - */ @Override public void visit(HierarchicalQueryClause expression) { } - /** - * {@inheritDoc} - */ @Override public void visit(OrderSiblingsByClause expression) { // TODO } - /** - * {@inheritDoc} - */ @Override public void visit(RegexpExpression expression) { // TODO } - /** - * {@inheritDoc} - */ @Override public void visit(StartWithClause expression) { // TODO } - /** - * {@inheritDoc} - */ @Override public void visit(TableExpression expression) { // TODO } - /** - * {@inheritDoc} - */ @Override public void visit(TableVariableDeclaration expression) { // TODO } - /** - * {@inheritDoc} - */ @Override public void visit(UnionClause expression) { // TODO diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/IEclipseLinkSelectExpressionStateObjectBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/IEclipseLinkSelectExpressionStateObjectBuilder.java index 168a7cb0481..a9df2383b08 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/IEclipseLinkSelectExpressionStateObjectBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/IEclipseLinkSelectExpressionStateObjectBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -22,40 +22,22 @@ */ public interface IEclipseLinkSelectExpressionStateObjectBuilder extends ISelectExpressionStateObjectBuilder { - /** - * {@inheritDoc} - */ @Override IEclipseLinkSelectExpressionStateObjectBuilder append(); - /** - * {@inheritDoc} - */ @Override IEclipseLinkSelectExpressionStateObjectBuilder new_(String className, ISelectExpressionStateObjectBuilder... parameters); - /** - * {@inheritDoc} - */ @Override IEclipseLinkSelectExpressionStateObjectBuilder object(String identificationVariable); - /** - * {@inheritDoc} - */ @Override IEclipseLinkSelectExpressionStateObjectBuilder resultVariable(String resultVariable); - /** - * {@inheritDoc} - */ @Override IEclipseLinkSelectExpressionStateObjectBuilder resultVariableAs(String resultVariable); - /** - * {@inheritDoc} - */ @Override IEclipseLinkSelectExpressionStateObjectBuilder variable(String variable); } diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder1_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder1_0.java index 385a99d7901..f6ac6fb1dd9 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder1_0.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder1_0.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -41,57 +41,36 @@ public JPQLQueryBuilder1_0() { super(); } - /** - * {@inheritDoc} - */ @Override protected DefaultStateObjectBuilder buildStateObjectBuilder() { return new DefaultStateObjectBuilder(); } - /** - * {@inheritDoc} - */ @Override public DefaultConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) { return new DefaultConditionalExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public DefaultSelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) { return new DefaultSelectExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public DefaultSimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) { return new DefaultSimpleSelectExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) { return new DefaultNewValueStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public JPQLGrammar getGrammar() { return JPQLGrammar1_0.instance(); } - /** - * {@inheritDoc} - */ @Override public String toString() { return "JPQLQueryBuilder1_0 using " + getGrammar().toString(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_0.java index 0c5b43745ef..6f628d7f814 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_0.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_0.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -41,57 +41,36 @@ public JPQLQueryBuilder2_0() { super(); } - /** - * {@inheritDoc} - */ @Override protected DefaultStateObjectBuilder buildStateObjectBuilder() { return new DefaultStateObjectBuilder(); } - /** - * {@inheritDoc} - */ @Override public DefaultConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) { return new DefaultConditionalExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public DefaultSelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) { return new DefaultSelectExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public DefaultSimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) { return new DefaultSimpleSelectExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) { return new DefaultNewValueStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public JPQLGrammar getGrammar() { return JPQLGrammar2_0.instance(); } - /** - * {@inheritDoc} - */ @Override public String toString() { return "JPQLQueryBuilder2_0 using " + getGrammar().toString(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_1.java index 22bb96dc634..fefefb09e9f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_1.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilder2_1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -41,57 +41,36 @@ public JPQLQueryBuilder2_1() { super(); } - /** - * {@inheritDoc} - */ @Override protected DefaultStateObjectBuilder buildStateObjectBuilder() { return new DefaultStateObjectBuilder(); } - /** - * {@inheritDoc} - */ @Override public DefaultConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) { return new DefaultConditionalExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public DefaultSelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) { return new DefaultSelectExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public DefaultSimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) { return new DefaultSimpleSelectExpressionStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) { return new DefaultNewValueStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public JPQLGrammar getGrammar() { return JPQLGrammar2_1.instance(); } - /** - * {@inheritDoc} - */ @Override public String toString() { return "JPQLQueryBuilder2_1 using " + getGrammar().toString(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilderWrapper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilderWrapper.java index fffc64934b4..c04b91ce88f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilderWrapper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/JPQLQueryBuilderWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -52,17 +52,11 @@ protected JPQLQueryBuilderWrapper(IJPQLQueryBuilder delegate) { this.delegate = delegate; } - /** - * {@inheritDoc} - */ @Override public ICaseExpressionStateObjectBuilder buildCaseExpressionStateObjectBuilder(StateObject parent) { return delegate.buildCaseExpressionStateObjectBuilder(parent); } - /** - * {@inheritDoc} - */ @Override public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider, CharSequence jpqlQuery, @@ -71,9 +65,6 @@ public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider, return delegate.buildStateObject(provider, jpqlQuery, tolerant); } - /** - * {@inheritDoc} - */ @Override public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider, CharSequence jpqlQuery, @@ -83,9 +74,6 @@ public JPQLQueryStateObject buildStateObject(IManagedTypeProvider provider, return delegate.buildStateObject(provider, jpqlQuery, queryBNFId, tolerant); } - /** - * {@inheritDoc} - */ @Override public StateObject buildStateObject(StateObject parent, CharSequence jpqlFragment, @@ -94,33 +82,21 @@ public StateObject buildStateObject(StateObject parent, return delegate.buildStateObject(parent, jpqlFragment, queryBNFId); } - /** - * {@inheritDoc} - */ @Override public IConditionalExpressionStateObjectBuilder buildStateObjectBuilder(AbstractConditionalClauseStateObject stateObject) { return delegate.buildStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public ISelectExpressionStateObjectBuilder buildStateObjectBuilder(SelectClauseStateObject stateObject) { return delegate.buildStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public ISimpleSelectExpressionStateObjectBuilder buildStateObjectBuilder(SimpleSelectClauseStateObject stateObject) { return delegate.buildStateObjectBuilder(stateObject); } - /** - * {@inheritDoc} - */ @Override public INewValueStateObjectBuilder buildStateObjectBuilder(UpdateItemStateObject stateObject) { return delegate.buildStateObjectBuilder(stateObject); @@ -135,9 +111,6 @@ protected IJPQLQueryBuilder getDelegate() { return delegate; } - /** - * {@inheritDoc} - */ @Override public JPQLGrammar getGrammar() { return delegate.getGrammar(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/ListChangeEvent.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/ListChangeEvent.java index 61f21b4ac1b..3a787749b5e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/ListChangeEvent.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/ListChangeEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -67,67 +67,43 @@ public ListChangeEvent(StateObject source, this.startIndex = startIndex; } - /** - * {@inheritDoc} - */ @Override public int getEndIndex() { return endIndex; } - /** - * {@inheritDoc} - */ @Override public EventType getEventType() { return eventType; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public List getList() { return (List) list; } - /** - * {@inheritDoc} - */ @Override public String getListName() { return listName; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public > S getSource() { return (S) source; } - /** - * {@inheritDoc} - */ @Override public int getStartIndex() { return startIndex; } - /** - * {@inheritDoc} - */ @Override public ListIterable items() { return new SnapshotCloneListIterable(items); } - /** - * {@inheritDoc} - */ @Override public int itemsSize() { return items.size(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/PropertyChangeEvent.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/PropertyChangeEvent.java index 1e5eb2603f8..6fcbb7d8892 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/PropertyChangeEvent.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/PropertyChangeEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -63,33 +63,21 @@ public PropertyChangeEvent(StateObject source, String propertyName, T oldValue, this.newValue = newValue; } - /** - * {@inheritDoc} - */ @Override public T getNewValue() { return newValue; } - /** - * {@inheritDoc} - */ @Override public T getOldValue() { return oldValue; } - /** - * {@inheritDoc} - */ @Override public String getPropertyName() { return propertyName; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public S getSource() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbsExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbsExpressionStateObject.java index 1a939adf68d..baf14adf5f3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbsExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbsExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -69,33 +69,21 @@ protected AbsExpressionStateObject(StateObject parent, String jpqlFragment) { super(parent, jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public AbsExpression getExpression() { return (AbsExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return ABS; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return SimpleArithmeticExpressionBNF.ID; @@ -113,9 +101,6 @@ public void setExpression(AbsExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractConditionalClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractConditionalClauseStateObject.java index 534d06ac253..455a8602e9d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractConditionalClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractConditionalClauseStateObject.java @@ -80,9 +80,6 @@ protected AbstractConditionalClauseStateObject(StateObject parent, this.conditionalStateObject = parent(conditionalStateObject); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -170,9 +167,6 @@ public boolean hasConditional() { return conditionalStateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -250,9 +244,6 @@ public void visit(OrExpressionStateObject stateObject) { return encapsulate[0]; } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractDoubleEncapsulatedExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractDoubleEncapsulatedExpressionStateObject.java index f962bd95ac8..12a8e5bb99f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractDoubleEncapsulatedExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractDoubleEncapsulatedExpressionStateObject.java @@ -104,9 +104,6 @@ public AbstractDoubleEncapsulatedExpressionStateObject(StateObject parent, parseSecond(secondJpqlFragment); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { @@ -121,9 +118,6 @@ protected void addChildren(List children) { } } - /** - * {@inheritDoc} - */ @Override public AbstractDoubleEncapsulatedExpression getExpression() { return (AbstractDoubleEncapsulatedExpression) super.getExpression(); @@ -185,9 +179,6 @@ public boolean hasSecond() { return secondStateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -246,9 +237,6 @@ public void setSecond(StateObject secondStateObject) { firePropertyChanged(SECOND_STATE_OBJECT_PROPERTY, oldSecondStateObject, secondStateObject); } - /** - * {@inheritDoc} - */ @Override protected void toTextEncapsulatedExpression(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseChildrenVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseChildrenVisitor.java index 37eb743ae6d..22588e6f847 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseChildrenVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseChildrenVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -26,9 +26,6 @@ */ public abstract class AbstractEclipseLinkTraverseChildrenVisitor extends AnonynousEclipseLinkStateObjectVisitor { - /** - * {@inheritDoc} - */ @Override protected final void visit(StateObject stateObject) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseParentVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseParentVisitor.java index 2ea97591828..07be8114b7e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseParentVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEclipseLinkTraverseParentVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -25,17 +25,11 @@ */ public abstract class AbstractEclipseLinkTraverseParentVisitor extends AnonynousEclipseLinkStateObjectVisitor { - /** - * {@inheritDoc} - */ @Override public void visit(JPQLQueryStateObject stateObject) { // This is the root of the parsed tree } - /** - * {@inheritDoc} - */ @Override protected void visit(StateObject stateObject) { stateObject.getParent().accept(this); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEncapsulatedExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEncapsulatedExpressionStateObject.java index 501443f7730..a1600b8764e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEncapsulatedExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractEncapsulatedExpressionStateObject.java @@ -43,9 +43,6 @@ protected AbstractEncapsulatedExpressionStateObject(StateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public AbstractEncapsulatedExpression getExpression() { return (AbstractEncapsulatedExpression) super.getExpression(); @@ -71,9 +68,6 @@ public AbstractEncapsulatedExpression getExpression() { */ protected abstract void toTextEncapsulatedExpression(Appendable writer) throws IOException; - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { writer.append(getIdentifier()); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractFromClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractFromClauseStateObject.java index 5bd8ab5747c..5a8a23c543e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractFromClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractFromClauseStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -90,9 +90,6 @@ public CollectionMemberDeclarationStateObject addCollectionDeclaration(String co return stateObject; } - /** - * {@inheritDoc} - */ @Override protected void addProblems(List currentProblems) { super.addProblems(currentProblems); @@ -157,17 +154,11 @@ public IdentificationVariableDeclarationStateObject addRangeDeclaration(String e */ protected abstract String declarationBNF(); - /** - * {@inheritDoc} - */ @Override public ListIterable declarations() { return items(); } - /** - * {@inheritDoc} - */ @Override public IdentificationVariableStateObject findIdentificationVariable(String variable) { @@ -180,25 +171,16 @@ public IdentificationVariableStateObject findIdentificationVariable(String varia return null; } - /** - * {@inheritDoc} - */ @Override public DeclarationStateObject getDeclaration() { return this; } - /** - * {@inheritDoc} - */ @Override public AbstractFromClause getExpression() { return (AbstractFromClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(StateObject stateObject) { @@ -214,9 +196,6 @@ public IManagedType getManagedType(StateObject stateObject) { return null; } - /** - * {@inheritDoc} - */ @Override public AbstractSelectStatementStateObject getParent() { return (AbstractSelectStatementStateObject) super.getParent(); @@ -247,18 +226,12 @@ public Iterable identificationVariables() { return new SnapshotCloneIterable(stateObjects); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { return super.isEquivalent(stateObject) && areChildrenEquivalent((AbstractListHolderStateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override protected String listName() { return VARIABLE_DECLARATIONS_LIST; @@ -275,9 +248,6 @@ public void parse(String jpqlFragment) { buildStateObjects(jpqlFragment, declarationBNF()); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { writer.append(FROM); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java index 77b9527baf9..8f0c9c56681 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractIdentificationVariableDeclarationStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -71,9 +71,6 @@ protected AbstractIdentificationVariableDeclarationStateObject(AbstractFromClaus setIdentificationVariable(identificationVariable); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { children.add(rangeVariableDeclaration); @@ -176,9 +173,6 @@ public JoinStateObject addLeftOuterJoin(String path, String identificationVariab */ protected abstract AbstractRangeVariableDeclarationStateObject buildRangeVariableDeclarationStateObject(); - /** - * {@inheritDoc} - */ @Override public IdentificationVariableDeclaration getExpression() { return (IdentificationVariableDeclaration) super.getExpression(); @@ -202,9 +196,6 @@ public IdentificationVariableStateObject getIdentificationVariableStateObject() return getRangeVariableDeclaration().getIdentificationVariableStateObject(); } - /** - * {@inheritDoc} - */ @Override public AbstractFromClauseStateObject getParent() { return (AbstractFromClauseStateObject) super.getParent(); @@ -238,9 +229,6 @@ public StateObject getRootStateObject() { return getRangeVariableDeclaration().getRootStateObject(); } - /** - * {@inheritDoc} - */ @Override public ListIterable identificationVariables() { List stateObjects = new ArrayList(); @@ -251,18 +239,12 @@ public ListIterable identificationVariables() return new SnapshotCloneListIterable(stateObjects); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); rangeVariableDeclaration = buildRangeVariableDeclarationStateObject(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -275,9 +257,6 @@ public boolean isEquivalent(StateObject stateObject) { return false; } - /** - * {@inheritDoc} - */ @Override protected String listName() { return JOINS_LIST; @@ -324,9 +303,6 @@ public void setRootPath(String root) { getRangeVariableDeclaration().setRootPath(root); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractListHolderStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractListHolderStateObject.java index 0cb3a80f097..e01d34127f5 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractListHolderStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractListHolderStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -77,35 +77,23 @@ protected AbstractListHolderStateObject(StateObject parent, T... items) { Collections.addAll(this.items, parent(items)); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); children.addAll(items); } - /** - * {@inheritDoc} - */ @Override public S addItem(S item) { getChangeSupport().addItem(this, this.items, listName(), parent(item)); return item; } - /** - * {@inheritDoc} - */ @Override public void addItems(List items) { getChangeSupport().addItems(this, this.items, listName(), parent(items)); } - /** - * {@inheritDoc} - */ @Override public void addListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().addListChangeListener(listName, listener); @@ -139,58 +127,37 @@ protected boolean areChildrenEquivalent(AbstractListHolderStateObject(); } - /** - * {@inheritDoc} - */ @Override public ListIterable items() { return new SnapshotCloneListIterable(items); } - /** - * {@inheritDoc} - */ @Override public int itemsSize() { return items.size(); @@ -203,43 +170,28 @@ public int itemsSize() { */ protected abstract String listName(); - /** - * {@inheritDoc} - */ @Override public T moveDown(T item) { getChangeSupport().moveDown(this, items, listName(), item); return item; } - /** - * {@inheritDoc} - */ @Override public T moveUp(T item) { getChangeSupport().moveUp(this, items, listName(), item); return item; } - /** - * {@inheritDoc} - */ @Override public void removeItem(T stateObject) { getChangeSupport().removeItem(this, items, listName(), stateObject); } - /** - * {@inheritDoc} - */ @Override public void removeItems(Collection items) { getChangeSupport().removeItems(this, this.items, listName(), items); } - /** - * {@inheritDoc} - */ @Override public void removeListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().removeListChangeListener(listName, listener); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyClauseStateObject.java index d94f3a58bb3..cffa4ca120c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyClauseStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -45,26 +45,17 @@ protected AbstractModifyClauseStateObject(AbstractModifyStatementStateObject par super(parent); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); children.add(rangeVariableDeclaration); } - /** - * {@inheritDoc} - */ @Override public ListIterable declarations() { return new SingleElementListIterable(rangeVariableDeclaration); } - /** - * {@inheritDoc} - */ @Override public IManagedType findManagedType(StateObject stateObject) { return getManagedType(stateObject); @@ -89,9 +80,6 @@ public AbstractSchemaNameStateObject getAbstractSchemaNameStateObject() { return rangeVariableDeclaration.getRootStateObject(); } - /** - * {@inheritDoc} - */ @Override public DeclarationStateObject getDeclaration() { return this; @@ -131,9 +119,6 @@ public IdentificationVariableStateObject getIdentificationVariableStateObject() */ public abstract String getIdentifier(); - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(StateObject stateObject) { @@ -146,9 +131,6 @@ public IManagedType getManagedType(StateObject stateObject) { return null; } - /** - * {@inheritDoc} - */ @Override public AbstractModifyStatementStateObject getParent() { return (AbstractModifyStatementStateObject) super.getParent(); @@ -173,18 +155,12 @@ public boolean hasIdentificationVariable() { return rangeVariableDeclaration.hasIdentificationVariable(); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); rangeVariableDeclaration = new RangeVariableDeclarationStateObject(this); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -263,9 +239,6 @@ public void setIdentificationVariable(String identificationVariable) { rangeVariableDeclaration.setIdentificationVariable(identificationVariable); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { writer.append(getIdentifier()); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyStatementStateObject.java index 1e92f8aec7d..8a44a6556d5 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyStatementStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractModifyStatementStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -58,9 +58,6 @@ protected AbstractModifyStatementStateObject(JPQLQueryStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -107,9 +104,6 @@ public AbstractSchemaNameStateObject getAbstractSchemaNameStateObject() { return getModifyClause().getAbstractSchemaNameStateObject(); } - /** - * {@inheritDoc} - */ @Override public DeclarationStateObject getDeclaration() { return modifyClause.getDeclaration(); @@ -152,9 +146,6 @@ public AbstractModifyClauseStateObject getModifyClause() { return modifyClause; } - /** - * {@inheritDoc} - */ @Override public JPQLQueryStateObject getParent() { return (JPQLQueryStateObject) super.getParent(); @@ -190,18 +181,12 @@ public boolean hasWhereClause() { return whereClause != null; } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); modifyClause = buildModifyClause(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -319,9 +304,6 @@ public void toggleWhereClause() { } } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { modifyClause.toString(writer); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java index f2e0b9ad517..bc2ed12635a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractPathExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -127,9 +127,6 @@ protected AbstractPathExpressionStateObject(StateObject parent, String path) { setPath(path); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { @@ -142,9 +139,6 @@ protected void addChildren(List children) { } } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public String addItem(String item) { @@ -152,17 +146,11 @@ public String addItem(String item) { return item; } - /** - * {@inheritDoc} - */ @Override public void addItems(List items) { getChangeSupport().addItems(this, paths, PATHS_LIST, items); } - /** - * {@inheritDoc} - */ @Override public void addListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().addListChangeListener(listName, listener); @@ -229,17 +217,11 @@ public void append(String text) { getChangeSupport().fireListChangeEvent(event); } - /** - * {@inheritDoc} - */ @Override public boolean canMoveDown(String item) { return false; } - /** - * {@inheritDoc} - */ @Override public boolean canMoveUp(String item) { return false; @@ -257,9 +239,6 @@ protected void clearResolvedObjects() { typeDeclaration = null; } - /** - * {@inheritDoc} - */ @Override public AbstractPathExpression getExpression() { return (AbstractPathExpression) super.getExpression(); @@ -279,9 +258,6 @@ public StateObject getIdentificationVariable() { return identificationVariable; } - /** - * {@inheritDoc} - */ @Override public String getItem(int index) { return paths.get(index); @@ -365,17 +341,11 @@ public boolean hasIdentificationVariable() { return getIdentificationVariable() != null; } - /** - * {@inheritDoc} - */ @Override public boolean hasItems() { return !paths.isEmpty(); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); @@ -383,9 +353,6 @@ protected void initialize() { mappings = new ArrayList(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -419,33 +386,21 @@ public boolean isEquivalent(StateObject stateObject) { return true; } - /** - * {@inheritDoc} - */ @Override public ListIterable items() { return new SnapshotCloneListIterable(paths); } - /** - * {@inheritDoc} - */ @Override public int itemsSize() { return paths.size(); } - /** - * {@inheritDoc} - */ @Override public String moveDown(String item) { throw new RuntimeException(getClass().getName() + " does not support moveDown(String)."); } - /** - * {@inheritDoc} - */ @Override public String moveUp(String item) { throw new RuntimeException(getClass().getName() + " does not support moveUp(String)."); @@ -464,25 +419,16 @@ public void removeItem(int index) { removeItem(getItem(index)); } - /** - * {@inheritDoc} - */ @Override public void removeItem(String item) { getChangeSupport().removeItem(this, paths, PATHS_LIST, item); } - /** - * {@inheritDoc} - */ @Override public void removeItems(Collection items) { getChangeSupport().removeItems(this, this.paths, PATHS_LIST, items); } - /** - * {@inheritDoc} - */ @Override public void removeListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().removeListChangeListener(listName, listener); @@ -659,9 +605,6 @@ public void setPaths(String... paths) { setPaths(Arrays.asList(paths)); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractRangeVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractRangeVariableDeclarationStateObject.java index 0f2c50fc3b6..2f22264cb36 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractRangeVariableDeclarationStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractRangeVariableDeclarationStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -108,9 +108,6 @@ public AbstractRangeVariableDeclarationStateObject addAs() { return this; } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -118,9 +115,6 @@ protected void addChildren(List children) { children.add(identificationVariable); } - /** - * {@inheritDoc} - */ @Override protected void addProblems(List problems) { super.addProblems(problems); @@ -133,9 +127,6 @@ protected void addProblems(List problems) { protected abstract StateObject buildRootStateObject(); - /** - * {@inheritDoc} - */ @Override public RangeVariableDeclaration getExpression() { return (RangeVariableDeclaration) super.getExpression(); @@ -194,17 +185,11 @@ public boolean hasIdentificationVariable() { return identificationVariable.hasText(); } - /** - * {@inheritDoc} - */ @Override public ListIterable identificationVariables() { return new SingleElementListIterable(identificationVariable); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); @@ -212,9 +197,6 @@ protected void initialize() { identificationVariable = new IdentificationVariableStateObject(this); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -314,9 +296,6 @@ public void toggleAs() { setAs(!hasAs()); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSchemaNameStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSchemaNameStateObject.java index 4ca6b0ab67f..f0b63039641 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSchemaNameStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSchemaNameStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -67,9 +67,6 @@ public AbstractSchemaNameStateObject(StateObject parent, String entityName) { super(parent, entityName); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -87,9 +84,6 @@ public IEntity getEntity() { return entity; } - /** - * {@inheritDoc} - */ @Override public AbstractSchemaName getExpression() { return (AbstractSchemaName) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectClauseStateObject.java index 20c35abbace..b83099f0b4f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectClauseStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -54,9 +54,6 @@ protected AbstractSelectClauseStateObject(AbstractSelectStatementStateObject par super(parent); } - /** - * {@inheritDoc} - */ @Override public AbstractSelectClause getExpression() { return (AbstractSelectClause) super.getExpression(); @@ -71,9 +68,6 @@ public AbstractFromClauseStateObject getFromClause() { return getParent().getFromClause(); } - /** - * {@inheritDoc} - */ @Override public AbstractSelectStatementStateObject getParent() { return (AbstractSelectStatementStateObject) super.getParent(); @@ -95,9 +89,6 @@ public boolean hasDistinct() { */ public abstract boolean hasSelectItem(); - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectStatementStateObject.java index 15e87181fb9..ed53215fdbd 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectStatementStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSelectStatementStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -92,9 +92,6 @@ protected AbstractSelectStatementStateObject(StateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { @@ -282,25 +279,16 @@ public ListIterable declarations() { return fromClause.items(); } - /** - * {@inheritDoc} - */ @Override public IdentificationVariableStateObject findIdentificationVariable(String identificationVariable) { return fromClause.findIdentificationVariable(identificationVariable); } - /** - * {@inheritDoc} - */ @Override public DeclarationStateObject getDeclaration() { return fromClause; } - /** - * {@inheritDoc} - */ @Override public AbstractSelectStatement getExpression() { return (AbstractSelectStatement) super.getExpression(); @@ -404,9 +392,6 @@ public Iterable identificationVariables() { return fromClause.identificationVariables(); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); @@ -414,9 +399,6 @@ protected void initialize() { fromClause = buildFromClause(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -518,9 +500,6 @@ public void toggleWhereClause() { } } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSingleEncapsulatedExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSingleEncapsulatedExpressionStateObject.java index 066edd652a6..8a04a020085 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSingleEncapsulatedExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractSingleEncapsulatedExpressionStateObject.java @@ -82,9 +82,6 @@ protected AbstractSingleEncapsulatedExpressionStateObject(StateObject parent, parse(jpqlFragment); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -93,9 +90,6 @@ protected void addChildren(List children) { } } - /** - * {@inheritDoc} - */ @Override public AbstractSingleEncapsulatedExpression getExpression() { return (AbstractSingleEncapsulatedExpression) super.getExpression(); @@ -129,9 +123,6 @@ public boolean hasStateObject() { return getStateObject() != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -165,9 +156,6 @@ protected void setStateObject(StateObject stateObject) { firePropertyChanged(STATE_OBJECT_PROPERTY, oldStateObject, stateObject); } - /** - * {@inheritDoc} - */ @Override protected void toTextEncapsulatedExpression(Appendable writer) throws IOException { if (stateObject != null) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObject.java index 6361ad52ae8..dc3a5054f23 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObject.java @@ -189,9 +189,6 @@ protected void addChildren(List children) { protected void addProblems(List problems) { } - /** - * {@inheritDoc} - */ @Override public final void addPropertyChangeListener(String propertyName, IPropertyChangeListener listener) { changeSupport.addPropertyChangeListener(propertyName, listener); @@ -317,9 +314,6 @@ protected StateObject checkParent(StateObject parent) { return parent; } - /** - * {@inheritDoc} - */ @Override public final Iterable children() { List children = new ArrayList(); @@ -327,25 +321,16 @@ public final Iterable children() { return new SnapshotCloneIterable(children); } - /** - * {@inheritDoc} - */ @Override public void decorate(StateObject decorator) { this.decorator = parent(decorator); } - /** - * {@inheritDoc} - */ @Override public final boolean equals(Object object) { return super.equals(object); } - /** - * {@inheritDoc} - */ @Override public IdentificationVariableStateObject findIdentificationVariable(String identificationVariable) { return parent.findIdentificationVariable(identificationVariable); @@ -373,65 +358,41 @@ protected final ChangeSupport getChangeSupport() { return changeSupport; } - /** - * {@inheritDoc} - */ @Override public DeclarationStateObject getDeclaration() { return parent.getDeclaration(); } - /** - * {@inheritDoc} - */ @Override public StateObject getDecorator() { return decorator; } - /** - * {@inheritDoc} - */ @Override public Expression getExpression() { return expression; } - /** - * {@inheritDoc} - */ @Override public JPQLGrammar getGrammar() { return getRoot().getGrammar(); } - /** - * {@inheritDoc} - */ @Override public IManagedTypeProvider getManagedTypeProvider() { return getRoot().getManagedTypeProvider(); } - /** - * {@inheritDoc} - */ @Override public StateObject getParent() { return parent; } - /** - * {@inheritDoc} - */ @Override public IJPQLQueryBuilder getQueryBuilder() { return getRoot().getQueryBuilder(); } - /** - * {@inheritDoc} - */ @Override public JPQLQueryStateObject getRoot() { return parent.getRoot(); @@ -475,9 +436,6 @@ public ITypeRepository getTypeRepository() { return getManagedTypeProvider().getTypeRepository(); } - /** - * {@inheritDoc} - */ @Override public final int hashCode() { return super.hashCode(); @@ -490,17 +448,11 @@ protected void initialize() { changeSupport = new ChangeSupport(this); } - /** - * {@inheritDoc} - */ @Override public boolean isDecorated() { return decorator != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { return (this == stateObject) || @@ -546,9 +498,6 @@ protected T parent(T stateObject) { return stateObject; } - /** - * {@inheritDoc} - */ @Override public final void removePropertyChangeListener(String propertyName, IPropertyChangeListener listener) { changeSupport.removePropertyChangeListener(propertyName, listener); @@ -564,18 +513,12 @@ public void setExpression(Expression expression) { this.expression = expression; } - /** - * {@inheritDoc} - */ @Override public final void setParent(StateObject parent) { Assert.isNotNull(parent, "The parent cannot be null"); this.parent = parent; } - /** - * {@inheritDoc} - */ @Override public final String toString() { StringBuilder sb = new StringBuilder(); @@ -583,9 +526,6 @@ public final String toString() { return sb.toString(); } - /** - * {@inheritDoc} - */ @Override public final void toString(Appendable writer) { try { @@ -635,9 +575,6 @@ protected void toStringItems(Appendable writer, } } - /** - * {@inheritDoc} - */ @Override public final void toText(Appendable writer) { try { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObjectVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObjectVisitor.java index 9ee011a9398..38e89d60aa3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObjectVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractStateObjectVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -25,590 +25,338 @@ */ public abstract class AbstractStateObjectVisitor implements StateObjectVisitor { - /** - * {@inheritDoc} - */ @Override public void visit(AbsExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaNameStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(AdditionExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(AllOrAnyExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(AndExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(ArithmeticFactorStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(AvgFunctionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(BadExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(BetweenExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(CaseExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(CoalesceExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberDeclarationStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(ComparisonExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(ConcatExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(ConstructorExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(CountFunctionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(DateTimeStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteStatementStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(DerivedPathIdentificationVariableDeclarationStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(DerivedPathVariableDeclarationStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(DivisionExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(EntityTypeLiteralStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(EntryExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(EnumTypeStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(ExistsExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(FromClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(FunctionExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(GroupByClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(HavingClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclarationStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(IndexExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(InExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(InputParameterStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(JoinStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(JPQLQueryStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(KeyExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(KeywordExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(LengthExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(LikeExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(LocateExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(LowerExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(MaxFunctionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(MinFunctionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(ModExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(MultiplicationExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(NotExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(NullComparisonExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(NullIfExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(NumericLiteralStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(ObjectExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByItemStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(OrExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclarationStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariableStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SelectClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatementStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleFromClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatementStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SizeExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SqrtExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(StringLiteralStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SubExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SubstringExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SubtractionExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(SumFunctionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(TreatExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(TrimExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(TypeExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(UnknownExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateItemStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateStatementStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(UpperExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(ValueExpressionStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(WhenClauseStateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(WhereClauseStateObject stateObject) { } diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseChildrenVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseChildrenVisitor.java index fe66155785a..112bf7e4f93 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseChildrenVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseChildrenVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -26,9 +26,6 @@ */ public abstract class AbstractTraverseChildrenVisitor extends AnonymousStateObjectVisitor { - /** - * {@inheritDoc} - */ @Override protected final void visit(StateObject stateObject) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseParentVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseParentVisitor.java index 5175a3dc131..26bbfa12e9c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseParentVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTraverseParentVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -25,17 +25,11 @@ */ public abstract class AbstractTraverseParentVisitor extends AnonymousStateObjectVisitor { - /** - * {@inheritDoc} - */ @Override public void visit(JPQLQueryStateObject stateObject) { // This is the root of the parsed tree } - /** - * {@inheritDoc} - */ @Override protected void visit(StateObject stateObject) { stateObject.getParent().accept(this); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTripleEncapsulatedExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTripleEncapsulatedExpressionStateObject.java index d0555cf3ebf..fe673cda598 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTripleEncapsulatedExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AbstractTripleEncapsulatedExpressionStateObject.java @@ -121,9 +121,6 @@ protected AbstractTripleEncapsulatedExpressionStateObject(StateObject parent, parseThird (thirdJpqlFragment); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { @@ -142,9 +139,6 @@ protected void addChildren(List children) { } } - /** - * {@inheritDoc} - */ @Override public AbstractTripleEncapsulatedExpression getExpression() { return (AbstractTripleEncapsulatedExpression) super.getExpression(); @@ -234,9 +228,6 @@ public boolean hasThird() { return thirdStateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -319,9 +310,6 @@ public void setThird(StateObject thirdStateObject) { firePropertyChanged(THIRD_STATE_OBJECT_PROPERTY, oldThirdStateObject, thirdStateObject); } - /** - * {@inheritDoc} - */ @Override protected void toTextEncapsulatedExpression(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AdditionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AdditionExpressionStateObject.java index f70c9b9adb5..f12f4e813be 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AdditionExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AdditionExpressionStateObject.java @@ -73,25 +73,16 @@ public AdditionExpressionStateObject(StateObject parent, super(parent, leftJpqlFragment, rightJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public AdditionExpression getExpression() { return (AdditionExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return PLUS; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AggregateFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AggregateFunctionStateObject.java index 7e904a9d226..6fb6fb89542 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AggregateFunctionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AggregateFunctionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -109,9 +109,6 @@ protected AggregateFunctionStateObject(StateObject parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override public AggregateFunction getExpression() { return (AggregateFunction) super.getExpression(); @@ -128,9 +125,6 @@ public boolean hasDistinct() { return distinct; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -155,9 +149,6 @@ public void setDistinct(boolean distinct) { firePropertyChanged(DISTINCT_PROPERTY, oldDistinct, distinct); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); @@ -170,9 +161,6 @@ public void toggleDistinct() { setDistinct(!hasDistinct()); } - /** - * {@inheritDoc} - */ @Override protected void toTextEncapsulatedExpression(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AllOrAnyExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AllOrAnyExpressionStateObject.java index 672c41c7a04..feacabf9768 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AllOrAnyExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AllOrAnyExpressionStateObject.java @@ -113,41 +113,26 @@ public AllOrAnyExpressionStateObject(StateObject parent, String identifier, Stri this.identifier = identifier; } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public AllOrAnyExpression getExpression() { return (AllOrAnyExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return identifier; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return SubqueryBNF.ID; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -188,9 +173,6 @@ public void setIdentifier(String identifier) { firePropertyChanged(IDENTIFIER_PROPERTY, oldIdentifier, identifier); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AndExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AndExpressionStateObject.java index 93f3ac3d9bf..4d2ecda621d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AndExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AndExpressionStateObject.java @@ -95,41 +95,26 @@ public AndExpressionStateObject(StateObject parent, super(parent, leftJpqlFragment, rightJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public AndExpression getExpression() { return (AndExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return AND; } - /** - * {@inheritDoc} - */ @Override protected String getLeftQueryBNFId() { return ConditionalTermBNF.ID; } - /** - * {@inheritDoc} - */ @Override protected String getRightQueryBNFId() { return ConditionalFactorBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AnonymousStateObjectVisitor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AnonymousStateObjectVisitor.java index 53e698be90d..ed57bd7d6ce 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AnonymousStateObjectVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AnonymousStateObjectVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -25,545 +25,341 @@ */ public abstract class AnonymousStateObjectVisitor implements StateObjectVisitor { - /** - * {@inheritDoc} - */ @Override public void visit(AbsExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaNameStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AdditionExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AllOrAnyExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AndExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ArithmeticFactorStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(AvgFunctionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(BadExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(BetweenExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(CaseExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(CoalesceExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberDeclarationStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ComparisonExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ConcatExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ConstructorExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(CountFunctionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DateTimeStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteStatementStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DerivedPathIdentificationVariableDeclarationStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DerivedPathVariableDeclarationStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(DivisionExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(EmptyCollectionComparisonExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(EntityTypeLiteralStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(EntryExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(EnumTypeStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ExistsExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(FromClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(FunctionExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(GroupByClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(HavingClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclarationStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(IndexExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(InExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(InputParameterStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(JoinStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(JPQLQueryStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(KeyExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(KeywordExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(LengthExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(LikeExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(LocateExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(LowerExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(MaxFunctionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(MinFunctionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ModExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(MultiplicationExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(NotExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(NullComparisonExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(NullIfExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(NumericLiteralStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ObjectExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByItemStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(OrExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclarationStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariableStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SelectClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatementStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleFromClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatementStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SizeExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SqrtExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpressionStateObject stateObject) { visit((StateObject) stateObject); @@ -577,129 +373,81 @@ public void visit(StateFieldPathExpressionStateObject stateObject) { protected void visit(StateObject stateObject) { } - /** - * {@inheritDoc} - */ @Override public void visit(StringLiteralStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SubExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SubstringExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SubtractionExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(SumFunctionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(TreatExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(TrimExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(TypeExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UnknownExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateItemStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateStatementStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(UpperExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(ValueExpressionStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(WhenClauseStateObject stateObject) { visit((StateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public void visit(WhereClauseStateObject stateObject) { visit((StateObject) stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticExpressionStateObject.java index 7aacfd3a144..1a69aeac393 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticExpressionStateObject.java @@ -80,25 +80,16 @@ protected ArithmeticExpressionStateObject(StateObject parent, super(parent, leftJpqlFragment, rightJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public ArithmeticExpression getExpression() { return (ArithmeticExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override protected String getLeftQueryBNFId() { return ArithmeticExpressionBNF.ID; } - /** - * {@inheritDoc} - */ @Override protected String getRightQueryBNFId() { return ArithmeticTermBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticFactorStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticFactorStateObject.java index 042d4dcc8a1..66036c56182 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticFactorStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ArithmeticFactorStateObject.java @@ -78,17 +78,11 @@ public ArithmeticFactorStateObject(StateObject parent, boolean plusSign, StateOb this.stateObject = parent(stateObject); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -124,9 +118,6 @@ public String getArithmeticSign() { return plusSign ? PLUS : MINUS; } - /** - * {@inheritDoc} - */ @Override public ArithmeticFactor getExpression() { return (ArithmeticFactor) super.getExpression(); @@ -173,9 +164,6 @@ public boolean hasStateObject() { return stateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -242,9 +230,6 @@ public void toggleArithmeticSign() { setArithmeticSign(!plusSign); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { writer.append(getArithmeticSign()); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AvgFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AvgFunctionStateObject.java index 788c5f6fd83..19fbba41fa6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AvgFunctionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/AvgFunctionStateObject.java @@ -91,33 +91,21 @@ public AvgFunctionStateObject(StateObject parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public AvgFunction getExpression() { return (AvgFunction) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return AVG; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return StateFieldPathExpressionBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BadExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BadExpressionStateObject.java index 83d9f89dbdc..9733039086b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BadExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BadExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -38,17 +38,11 @@ public BadExpressionStateObject(StateObject parent, String text) { super(parent, text); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public BadExpression getExpression() { return (BadExpression) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BetweenExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BetweenExpressionStateObject.java index 62fdab0900a..b8c203bc791 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BetweenExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/BetweenExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -179,17 +179,11 @@ public BetweenExpressionStateObject(StateObject parent, this(parent, jpqlFragment, false, lowerBoundJpqlFragment, upperBoundJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -216,9 +210,6 @@ public BetweenExpressionStateObject addNot() { return this; } - /** - * {@inheritDoc} - */ @Override public BetweenExpression getExpression() { return (BetweenExpression) super.getExpression(); @@ -293,9 +284,6 @@ public boolean hasUpperBound() { return upperBoundStateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -419,9 +407,6 @@ public void toggleNot() { setNot(!not); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CaseExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CaseExpressionStateObject.java index b2d1b32716f..39182bb420c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CaseExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CaseExpressionStateObject.java @@ -120,17 +120,11 @@ public CaseExpressionStateObject(StateObject parent, this.caseOperandStateObject = parent(caseOperandStateObject); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { if (caseOperandStateObject != null) { @@ -142,9 +136,6 @@ protected void addChildren(List children) { } } - /** - * {@inheritDoc} - */ @Override protected void addProblems(List problems) { super.addProblems(problems); @@ -224,9 +215,6 @@ public StateObject getElse() { return elseStateObject; } - /** - * {@inheritDoc} - */ @Override public CaseExpression getExpression() { return (CaseExpression) super.getExpression(); @@ -252,9 +240,6 @@ public boolean hasElse() { return elseStateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -268,9 +253,6 @@ public boolean isEquivalent(StateObject stateObject) { return false; } - /** - * {@inheritDoc} - */ @Override protected String listName() { return WHEN_CLAUSE_STATE_OBJECT_LIST; @@ -343,9 +325,6 @@ public void setExpression(CaseExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CoalesceExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CoalesceExpressionStateObject.java index 12c4bbae3b3..b9cadc1709e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CoalesceExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CoalesceExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -110,43 +110,28 @@ public CoalesceExpressionStateObject(StateObject parent, String... items) { parseItemInternal(items); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); children.addAll(items); } - /** - * {@inheritDoc} - */ @Override public S addItem(S item) { getChangeSupport().addItem(this, items, STATE_OBJECTS_LIST, parent(item)); return item; } - /** - * {@inheritDoc} - */ @Override public void addItems(List items) { getChangeSupport().addItems(this, this.items, STATE_OBJECTS_LIST, parent(items)); } - /** - * {@inheritDoc} - */ @Override public void addListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().addListChangeListener(listName, listener); @@ -180,100 +165,64 @@ protected boolean areChildrenEquivalent(CoalesceExpressionStateObject stateObjec return true; } - /** - * {@inheritDoc} - */ @Override public boolean canMoveDown(StateObject item) { return getChangeSupport().canMoveDown(items, item); } - /** - * {@inheritDoc} - */ @Override public boolean canMoveUp(StateObject item) { return getChangeSupport().canMoveUp(items, item); } - /** - * {@inheritDoc} - */ @Override public CoalesceExpression getExpression() { return (CoalesceExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return COALESCE; } - /** - * {@inheritDoc} - */ @Override public StateObject getItem(int index) { return items.get(index); } - /** - * {@inheritDoc} - */ @Override public boolean hasItems() { return !items.isEmpty(); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); items = new ArrayList(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { return super.isEquivalent(stateObject) && areChildrenEquivalent((CoalesceExpressionStateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public ListIterable items() { return new SnapshotCloneListIterable(items); } - /** - * {@inheritDoc} - */ @Override public int itemsSize() { return items.size(); } - /** - * {@inheritDoc} - */ @Override public StateObject moveDown(StateObject item) { getChangeSupport().moveDown(this, items, STATE_OBJECTS_LIST, item); return item; } - /** - * {@inheritDoc} - */ @Override public StateObject moveUp(StateObject item) { getChangeSupport().moveUp(this, items, STATE_OBJECTS_LIST, item); @@ -330,25 +279,16 @@ public void parseItems(String... items) { } } - /** - * {@inheritDoc} - */ @Override public void removeItem(StateObject item) { getChangeSupport().removeItem(this, items, STATE_OBJECTS_LIST, item); } - /** - * {@inheritDoc} - */ @Override public void removeItems(Collection items) { getChangeSupport().removeItems(this, this.items, STATE_OBJECTS_LIST, items); } - /** - * {@inheritDoc} - */ @Override public void removeListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().removeListChangeListener(listName, listener); @@ -366,9 +306,6 @@ public void setExpression(CoalesceExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override protected void toTextEncapsulatedExpression(Appendable writer) throws IOException { toStringItems(writer, items, true); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionExpressionStateObject.java index a427b46070f..8e18a0dc72c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -50,17 +50,11 @@ public CollectionExpressionStateObject(StateObject parent, List children) { children.addAll(items); @@ -94,17 +88,11 @@ protected boolean areChildrenEquivalent(CollectionExpressionStateObject stateObj return true; } - /** - * {@inheritDoc} - */ @Override public CollectionExpression getExpression() { return (CollectionExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -128,9 +116,6 @@ public void setExpression(CollectionExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { toStringItems(writer, items, true); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberDeclarationStateObject.java index 31021ea2ed2..308b2dd7622 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberDeclarationStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberDeclarationStateObject.java @@ -139,9 +139,6 @@ public CollectionMemberDeclarationStateObject(SimpleFromClauseStateObject parent setPath(collectionValuedPath); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -159,9 +156,6 @@ public CollectionMemberDeclarationStateObject addAs() { return this; } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -180,9 +174,6 @@ public CollectionValuedPathExpressionStateObject getCollectionValuedPath() { return collectionValuedPath; } - /** - * {@inheritDoc} - */ @Override public CollectionMemberDeclaration getExpression() { return (CollectionMemberDeclaration) super.getExpression(); @@ -199,9 +190,6 @@ public IdentificationVariableStateObject getIdentificationVariable() { return identificationVariable; } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(StateObject stateObject) { @@ -212,9 +200,6 @@ public IManagedType getManagedType(StateObject stateObject) { return null; } - /** - * {@inheritDoc} - */ @Override public AbstractFromClauseStateObject getParent() { return (AbstractFromClauseStateObject) super.getParent(); @@ -239,17 +224,11 @@ public boolean hasIdentificationVariable() { return identificationVariable.hasText(); } - /** - * {@inheritDoc} - */ @Override public ListIterable identificationVariables() { return new SingleElementListIterable(identificationVariable); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); @@ -270,9 +249,6 @@ public boolean isDerived() { return derived; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -390,9 +366,6 @@ public void toggleAs() { setAs(!as); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java index 6aef04b1df2..a1d62a87a14 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionMemberExpressionStateObject.java @@ -124,17 +124,11 @@ public CollectionMemberExpressionStateObject(StateObject parent, this(parent, entityStateObject, false, false, collectionValuedPath); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -178,9 +172,6 @@ public StateObject getEntityStateObject() { return entityStateObject; } - /** - * {@inheritDoc} - */ @Override public CollectionMemberExpression getExpression() { return (CollectionMemberExpression) super.getExpression(); @@ -204,18 +195,12 @@ public boolean hasOf() { return of; } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); collectionValuedPath = new CollectionValuedPathExpressionStateObject(this); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -303,9 +288,6 @@ public void toggleOf() { setOf(!of); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionValuedPathExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionValuedPathExpressionStateObject.java index 5cf19f90506..a40aef11549 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionValuedPathExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CollectionValuedPathExpressionStateObject.java @@ -59,25 +59,16 @@ public CollectionValuedPathExpressionStateObject(StateObject parent, String path super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public CollectionValuedPathExpression getExpression() { return (CollectionValuedPathExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override protected IManagedType resolveManagedType() { @@ -107,9 +98,6 @@ protected IManagedType resolveManagedType() { return getManagedTypeProvider().getManagedType(type); } - /** - * {@inheritDoc} - */ @Override protected IType resolveType() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ComparisonExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ComparisonExpressionStateObject.java index feeab003b50..e6cacb52795 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ComparisonExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ComparisonExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -125,49 +125,31 @@ public ComparisonExpressionStateObject(StateObject parent, this.identifier = identifier; } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public ComparisonExpression getExpression() { return (ComparisonExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return identifier; } - /** - * {@inheritDoc} - */ @Override protected String getLeftQueryBNFId() { return ComparisonExpressionBNF.ID; } - /** - * {@inheritDoc} - */ @Override protected String getRightQueryBNFId() { return ComparisonExpressionBNF.ID; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CompoundExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CompoundExpressionStateObject.java index 7e1b021e90e..19e7e8131d7 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CompoundExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CompoundExpressionStateObject.java @@ -99,9 +99,6 @@ protected CompoundExpressionStateObject(StateObject parent, parseRight(rightJpqlFragment); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -113,9 +110,6 @@ protected void addChildren(List children) { } } - /** - * {@inheritDoc} - */ @Override public CompoundExpression getExpression() { return (CompoundExpression) super.getExpression(); @@ -182,9 +176,6 @@ public boolean hasRight() { return rightStateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -239,9 +230,6 @@ public void setRight(StateObject rightStateObject) { firePropertyChanged(RIGHT_STATE_OBJECT_PROPERTY, oldRightStateObject, rightStateObject); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConcatExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConcatExpressionStateObject.java index 18536e193b5..ca632c58732 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConcatExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConcatExpressionStateObject.java @@ -73,34 +73,22 @@ public ConcatExpressionStateObject(StateObject parent, StateObject... stateObjec super(parent, stateObjects); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public ConcatExpression getExpression() { return (ConcatExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { return super.isEquivalent(stateObject) && areChildrenEquivalent((ConcatExpressionStateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override protected String listName() { return STRING_PRIMARY_STATE_OBJECT_LIST; @@ -118,9 +106,6 @@ public void setExpression(ConcatExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { writer.append(CONCAT); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConstructorExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConstructorExpressionStateObject.java index 6501aaa090f..f185d5d03cb 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConstructorExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ConstructorExpressionStateObject.java @@ -154,9 +154,6 @@ public ConstructorExpressionStateObject(StateObject parent, parse(jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -171,9 +168,6 @@ public String getClassName() { return className; } - /** - * {@inheritDoc} - */ @Override public ConstructorExpression getExpression() { return (ConstructorExpression) super.getExpression(); @@ -203,9 +197,6 @@ public boolean isEquivalent(StateObject stateObject) { return false; } - /** - * {@inheritDoc} - */ @Override protected String listName() { return CONSTRUCTOR_ITEMS_LIST; @@ -287,9 +278,6 @@ public void setType(IType type) { setClassNameInternally((type != null) ? type.getName() : null); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CountFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CountFunctionStateObject.java index 20556e60f0d..7deeee07d74 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CountFunctionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/CountFunctionStateObject.java @@ -91,33 +91,21 @@ public CountFunctionStateObject(StateObject parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public CountFunction getExpression() { return (CountFunction) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return COUNT; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return InternalCountBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DateTimeStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DateTimeStateObject.java index 61df458b678..35aa6ac42a7 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DateTimeStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DateTimeStateObject.java @@ -65,17 +65,11 @@ public DateTimeStateObject(StateObject parent, String date) { super(parent, date); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public DateTime getExpression() { return (DateTime) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteClauseStateObject.java index c64d22b60e6..59a9934a1b9 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteClauseStateObject.java @@ -45,33 +45,21 @@ public DeleteClauseStateObject(DeleteStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public DeleteClause getExpression() { return (DeleteClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return DELETE_FROM; } - /** - * {@inheritDoc} - */ @Override public DeleteStatementStateObject getParent() { return (DeleteStatementStateObject) super.getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteStatementStateObject.java index 5b13bdffc92..37782ce9418 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteStatementStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DeleteStatementStateObject.java @@ -41,25 +41,16 @@ public DeleteStatementStateObject(JPQLQueryStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected AbstractModifyClauseStateObject buildModifyClause() { return new DeleteClauseStateObject(this); } - /** - * {@inheritDoc} - */ @Override public DeleteStatement getExpression() { return (DeleteStatement) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathIdentificationVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathIdentificationVariableDeclarationStateObject.java index d5d448d7d6a..cb3231899af 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathIdentificationVariableDeclarationStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathIdentificationVariableDeclarationStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -50,25 +50,16 @@ public DerivedPathIdentificationVariableDeclarationStateObject(SimpleFromClauseS super(parent, path, identificationVariable); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected AbstractRangeVariableDeclarationStateObject buildRangeVariableDeclarationStateObject() { return new DerivedPathVariableDeclarationStateObject(this); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(StateObject stateObject) { @@ -79,9 +70,6 @@ public IManagedType getManagedType(StateObject stateObject) { return null; } - /** - * {@inheritDoc} - */ @Override public SimpleFromClauseStateObject getParent() { return (SimpleFromClauseStateObject) super.getParent(); @@ -97,25 +85,16 @@ public String getPath() { return getRangeVariableDeclaration().getPath(); } - /** - * {@inheritDoc} - */ @Override public DerivedPathVariableDeclarationStateObject getRangeVariableDeclaration() { return (DerivedPathVariableDeclarationStateObject) super.getRangeVariableDeclaration(); } - /** - * {@inheritDoc} - */ @Override public CollectionValuedPathExpressionStateObject getRootStateObject() { return getRangeVariableDeclaration().getRootStateObject(); } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public ListIterable items() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathVariableDeclarationStateObject.java index db974084f32..e425ebb1290 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathVariableDeclarationStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DerivedPathVariableDeclarationStateObject.java @@ -55,25 +55,16 @@ public DerivedPathVariableDeclarationStateObject(DerivedPathIdentificationVariab super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected StateObject buildRootStateObject() { return new CollectionValuedPathExpressionStateObject(this); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(StateObject stateObject) { @@ -84,9 +75,6 @@ public IManagedType getManagedType(StateObject stateObject) { return null; } - /** - * {@inheritDoc} - */ @Override public DerivedPathIdentificationVariableDeclarationStateObject getParent() { return (DerivedPathIdentificationVariableDeclarationStateObject) super.getParent(); @@ -102,25 +90,16 @@ public String getPath() { return getRootStateObject().getPath(); } - /** - * {@inheritDoc} - */ @Override public String getRootPath() { return getPath(); } - /** - * {@inheritDoc} - */ @Override public CollectionValuedPathExpressionStateObject getRootStateObject() { return (CollectionValuedPathExpressionStateObject) super.getRootStateObject(); } - /** - * {@inheritDoc} - */ @Override public void setRootPath(String path) { getRootStateObject().setPath(path); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DivisionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DivisionExpressionStateObject.java index e1849abcdab..ceaf8656dd8 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DivisionExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/DivisionExpressionStateObject.java @@ -73,25 +73,16 @@ public DivisionExpressionStateObject(StateObject parent, super(parent, leftJpqlFragment, rightJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public DivisionExpression getExpression() { return (DivisionExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return DIVISION; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EmptyCollectionComparisonExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EmptyCollectionComparisonExpressionStateObject.java index 0928c5ce806..49ab48e08d5 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EmptyCollectionComparisonExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EmptyCollectionComparisonExpressionStateObject.java @@ -89,17 +89,11 @@ public EmptyCollectionComparisonExpressionStateObject(StateObject parent, String this(parent, false, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -118,9 +112,6 @@ public EmptyCollectionComparisonExpressionStateObject addNot() { return this; } - /** - * {@inheritDoc} - */ @Override public EmptyCollectionComparisonExpression getExpression() { return (EmptyCollectionComparisonExpression) super.getExpression(); @@ -147,18 +138,12 @@ public boolean hasNot() { return not; } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); stateObject = new CollectionValuedPathExpressionStateObject(this); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -211,9 +196,6 @@ public void toggleNot() { setNot(!not); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EncapsulatedIdentificationVariableExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EncapsulatedIdentificationVariableExpressionStateObject.java index a1e3bb85d38..a25a1bf8510 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EncapsulatedIdentificationVariableExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EncapsulatedIdentificationVariableExpressionStateObject.java @@ -108,9 +108,6 @@ protected void clearResolvedObjects() { typeDeclaration = null; } - /** - * {@inheritDoc} - */ @Override public EncapsulatedIdentificationVariableExpression getExpression() { return (EncapsulatedIdentificationVariableExpression) super.getExpression(); @@ -149,17 +146,11 @@ public IManagedType getManagedType() { return managedType; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return IdentificationVariableBNF.ID; } - /** - * {@inheritDoc} - */ @Override public IdentificationVariableStateObject getStateObject() { return (IdentificationVariableStateObject) super.getStateObject(); @@ -213,9 +204,6 @@ public boolean hasIdentificationVariable() { return ExpressionTools.stringIsNotEmpty(getIdentificationVariable()); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntityTypeLiteralStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntityTypeLiteralStateObject.java index e752287eed6..b41d1a2e55a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntityTypeLiteralStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntityTypeLiteralStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -51,26 +51,17 @@ public EntityTypeLiteralStateObject(StateObject parent, String entityTypeName) { super(parent, entityTypeName); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addProblems(List problems) { super.addProblems(problems); // TODO } - /** - * {@inheritDoc} - */ @Override public EntityTypeLiteral getExpression() { return (EntityTypeLiteral) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntryExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntryExpressionStateObject.java index 12ae1d6e916..e66ca09cc4b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntryExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EntryExpressionStateObject.java @@ -55,25 +55,16 @@ public EntryExpressionStateObject(StateObject parent, String identificationVaria super(parent, identificationVariable); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public EntryExpression getExpression() { return (EntryExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return ENTRY; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EnumTypeStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EnumTypeStateObject.java index f9659064b93..af8e3558fd9 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EnumTypeStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/EnumTypeStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -64,17 +64,11 @@ private static String toString(Enum> enumConstant) { return enumType.getName() + "." + enumConstant.name(); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public AbstractPathExpression getExpression() { return (AbstractPathExpression) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ExistsExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ExistsExpressionStateObject.java index 44fa017d982..397df4167b5 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ExistsExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ExistsExpressionStateObject.java @@ -105,9 +105,6 @@ public ExistsExpressionStateObject(StateObject parent, String jpqlFragment) { super(parent, jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -125,25 +122,16 @@ public ExistsExpressionStateObject addNot() { return this; } - /** - * {@inheritDoc} - */ @Override public ExistsExpression getExpression() { return (ExistsExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return EXISTS; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return SubqueryBNF.ID; @@ -159,9 +147,6 @@ public boolean hasNot() { return not; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -206,9 +191,6 @@ public void setNot(boolean not) { firePropertyChanged(NOT_PROPERTY, oldNot, not); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); @@ -221,9 +203,6 @@ public void toggleNot() { setNot(!not); } - /** - * {@inheritDoc} - */ @Override protected void toTextEncapsulatedExpression(Appendable writer) throws IOException { writer.append(not ? NOT_EXISTS : EXISTS); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FromClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FromClauseStateObject.java index 721de6b942c..9a37120c26c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FromClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FromClauseStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -52,42 +52,27 @@ public FromClauseStateObject(SelectStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected String declarationBNF() { return InternalFromClauseBNF.ID; } - /** - * {@inheritDoc} - */ @Override public IManagedType findManagedType(StateObject stateObject) { // This is the declaration clause of the top-level query return getManagedType(stateObject); } - /** - * {@inheritDoc} - */ @Override public FromClause getExpression() { return (FromClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public SelectStatementStateObject getParent() { return (SelectStatementStateObject) super.getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FunctionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FunctionExpressionStateObject.java index d78c9e2728e..3180ecd4f43 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FunctionExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/FunctionExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -91,43 +91,28 @@ public FunctionExpressionStateObject(StateObject parent, this.items.addAll(parent(arguments)); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { acceptUnknownVisitor(visitor); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); children.addAll(items); } - /** - * {@inheritDoc} - */ @Override public S addItem(S item) { getChangeSupport().addItem(this, items, ARGUMENTS_LIST, parent(item)); return item; } - /** - * {@inheritDoc} - */ @Override public void addItems(List items) { getChangeSupport().addItems(this, this.items, ARGUMENTS_LIST, parent(items)); } - /** - * {@inheritDoc} - */ @Override public void addListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().addListChangeListener(listName, listener); @@ -161,25 +146,16 @@ protected boolean areChildrenEquivalent(FunctionExpressionStateObject stateObjec return true; } - /** - * {@inheritDoc} - */ @Override public boolean canMoveDown(StateObject item) { return getChangeSupport().canMoveDown(items, item); } - /** - * {@inheritDoc} - */ @Override public boolean canMoveUp(StateObject item) { return getChangeSupport().canMoveUp(items, item); } - /** - * {@inheritDoc} - */ @Override public FunctionExpression getExpression() { return (FunctionExpression) super.getExpression(); @@ -203,9 +179,6 @@ public String getIdentifier() { return identifier; } - /** - * {@inheritDoc} - */ @Override public StateObject getItem(int index) { return items.get(index); @@ -230,26 +203,17 @@ public boolean hasFunctionName() { return functionName != null; } - /** - * {@inheritDoc} - */ @Override public boolean hasItems() { return !items.isEmpty(); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); items = new ArrayList(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -262,59 +226,38 @@ public boolean isEquivalent(StateObject stateObject) { return false; } - /** - * {@inheritDoc} - */ @Override public ListIterable items() { return new SnapshotCloneListIterable(items); } - /** - * {@inheritDoc} - */ @Override public int itemsSize() { return items.size(); } - /** - * {@inheritDoc} - */ @Override public StateObject moveDown(StateObject item) { getChangeSupport().moveDown(this, items, ARGUMENTS_LIST, item); return item; } - /** - * {@inheritDoc} - */ @Override public StateObject moveUp(StateObject item) { getChangeSupport().moveUp(this, items, ARGUMENTS_LIST, item); return item; } - /** - * {@inheritDoc} - */ @Override public void removeItem(StateObject item) { getChangeSupport().removeItem(this, items, ARGUMENTS_LIST, item); } - /** - * {@inheritDoc} - */ @Override public void removeItems(Collection items) { getChangeSupport().removeItems(this, this.items, ARGUMENTS_LIST, items); } - /** - * {@inheritDoc} - */ @Override public void removeListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().removeListChangeListener(listName, listener); @@ -342,9 +285,6 @@ public void setFunctionName(String functionName) { firePropertyChanged(FUNCTION_NAME_PROPERTY, oldFunctionName, functionName); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/GroupByClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/GroupByClauseStateObject.java index a2a01f9f321..a420441c7e6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/GroupByClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/GroupByClauseStateObject.java @@ -52,9 +52,6 @@ public GroupByClauseStateObject(AbstractSelectStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -73,34 +70,22 @@ public StateObject addGroupByItem(String path) { return stateObject; } - /** - * {@inheritDoc} - */ @Override public GroupByClause getExpression() { return (GroupByClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public AbstractSelectStatementStateObject getParent() { return (AbstractSelectStatementStateObject) super.getParent(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { return super.isEquivalent(stateObject) && areChildrenEquivalent((GroupByClauseStateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override protected String listName() { return GROUP_BY_ITEMS_LIST; @@ -129,9 +114,6 @@ public void setExpression(GroupByClause expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { writer.append(GROUP_BY); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/HavingClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/HavingClauseStateObject.java index 43202aca114..ec2ddd1d9e6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/HavingClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/HavingClauseStateObject.java @@ -42,33 +42,21 @@ public HavingClauseStateObject(AbstractSelectStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public HavingClause getExpression() { return (HavingClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return HAVING; } - /** - * {@inheritDoc} - */ @Override public AbstractSelectStatementStateObject getParent() { return (AbstractSelectStatementStateObject) super.getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableDeclarationStateObject.java index 1f30ce4fae6..c08c7a17e4d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableDeclarationStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableDeclarationStateObject.java @@ -79,9 +79,6 @@ public IdentificationVariableDeclarationStateObject(AbstractFromClauseStateObjec getRangeVariableDeclaration().setDeclaration(entityName, identificationVariable); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -172,9 +169,6 @@ public JoinStateObject addLeftOuterJoinFetch(String path) { return addJoinFetch(LEFT_OUTER_JOIN_FETCH, path); } - /** - * {@inheritDoc} - */ @Override protected AbstractRangeVariableDeclarationStateObject buildRangeVariableDeclarationStateObject() { return new RangeVariableDeclarationStateObject(this); @@ -198,9 +192,6 @@ public String getEntityName() { return getRootStateObject().getText(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(StateObject stateObject) { @@ -211,25 +202,16 @@ public IManagedType getManagedType(StateObject stateObject) { return null; } - /** - * {@inheritDoc} - */ @Override public RangeVariableDeclarationStateObject getRangeVariableDeclaration() { return (RangeVariableDeclarationStateObject) super.getRangeVariableDeclaration(); } - /** - * {@inheritDoc} - */ @Override public AbstractSchemaNameStateObject getRootStateObject() { return (AbstractSchemaNameStateObject) super.getRootStateObject(); } - /** - * {@inheritDoc} - */ @Override protected String listName() { return JOINS_LIST; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java index 690a2a82fba..824c9d4a75b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IdentificationVariableStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -90,17 +90,11 @@ public IdentificationVariableStateObject(StateObject parent, String variable) { super(parent, variable); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addProblems(List problems) { super.addProblems(problems); @@ -145,9 +139,6 @@ protected void clearResolvedObjects() { typeDeclaration = null; } - /** - * {@inheritDoc} - */ @Override public IdentificationVariable getExpression() { return (IdentificationVariable) super.getExpression(); @@ -208,9 +199,6 @@ public ITypeDeclaration getTypeDeclaration() { return typeDeclaration; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -285,9 +273,6 @@ public void setExpression(IdentificationVariable expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void setText(String text) { checkIntegrity(text); @@ -305,9 +290,6 @@ public void setVirtual(boolean virtual) { this.virtual = virtual; } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { if (!virtual) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java index d64d394f382..3021369cda7 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InExpressionStateObject.java @@ -183,17 +183,11 @@ public InExpressionStateObject(StateObject parent, this(parent, false, path, items); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { if (stateObject != null) { @@ -214,9 +208,6 @@ public InExpressionStateObject addNot() { return this; } - /** - * {@inheritDoc} - */ @Override public InExpression getExpression() { return (InExpression) super.getExpression(); @@ -250,9 +241,6 @@ public boolean hasStateObject() { return stateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -277,9 +265,6 @@ public boolean isSingleInputParameter() { return singleInputParameter; } - /** - * {@inheritDoc} - */ @Override protected String listName() { return ITEMS_LIST; @@ -357,9 +342,6 @@ public void toggleNot() { setNot(!not); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IndexExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IndexExpressionStateObject.java index dc84cd0b0d5..4b817fdee99 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IndexExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/IndexExpressionStateObject.java @@ -54,25 +54,16 @@ public IndexExpressionStateObject(StateObject parent, String identificationVaria super(parent, identificationVariable); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public IndexExpression getExpression() { return (IndexExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return INDEX; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InputParameterStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InputParameterStateObject.java index d1082f6f9bd..9c78d100bae 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InputParameterStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/InputParameterStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -51,17 +51,11 @@ public InputParameterStateObject(StateObject parent, String parameter) { super(parent, parameter); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public InputParameter getExpression() { return (InputParameter) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JPQLQueryStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JPQLQueryStateObject.java index f60940d067f..d9581159584 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JPQLQueryStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JPQLQueryStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -72,17 +72,11 @@ public JPQLQueryStateObject(IJPQLQueryBuilder queryBuilder, IManagedTypeProvider initialize(queryBuilder, provider); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -165,57 +159,36 @@ public UpdateStatementStateObject addUpdateStatement(String jpqlFragment) { return stateObject; } - /** - * {@inheritDoc} - */ @Override protected StateObject checkParent(StateObject parent) { return parent; } - /** - * {@inheritDoc} - */ @Override public DeclarationStateObject getDeclaration() { return (queryStatement == null) ? null : queryStatement.getDeclaration(); } - /** - * {@inheritDoc} - */ @Override public JPQLExpression getExpression() { return (JPQLExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public JPQLGrammar getGrammar() { return queryBuilder.getGrammar(); } - /** - * {@inheritDoc} - */ @Override public IManagedTypeProvider getManagedTypeProvider() { return provider; } - /** - * {@inheritDoc} - */ @Override public StateObject getParent() { return null; } - /** - * {@inheritDoc} - */ @Override public IJPQLQueryBuilder getQueryBuilder() { return queryBuilder; @@ -231,9 +204,6 @@ public StateObject getQueryStatement() { return queryStatement; } - /** - * {@inheritDoc} - */ @Override public JPQLQueryStateObject getRoot() { return this; @@ -264,9 +234,6 @@ protected void initialize(IJPQLQueryBuilder queryBuilder, IManagedTypeProvider p this.queryBuilder = queryBuilder; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -312,9 +279,6 @@ public void setQueryStatement(StateObject queryStatement) { firePropertyChanged(QUERY_STATEMENT_PROPERTY, oldStatement, queryStatement); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { if (queryStatement != null) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JoinStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JoinStateObject.java index d5c6444b5a2..41210092c40 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JoinStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/JoinStateObject.java @@ -103,9 +103,6 @@ public JoinStateObject(AbstractIdentificationVariableDeclarationStateObject pare this.as = as; } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -123,9 +120,6 @@ public JoinStateObject addAs() { return this; } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -143,9 +137,6 @@ public void addJoinAssociationPaths(List paths) { joinAssociationPath.addItems(paths); } - /** - * {@inheritDoc} - */ @Override public Join getExpression() { return (Join) super.getExpression(); @@ -199,9 +190,6 @@ public String getJoinType() { return joinType; } - /** - * {@inheritDoc} - */ @Override public AbstractIdentificationVariableDeclarationStateObject getParent() { return (AbstractIdentificationVariableDeclarationStateObject) super.getParent(); @@ -239,9 +227,6 @@ public boolean hasIdentificationVariable() { return identificationVariable.hasText(); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); @@ -249,9 +234,6 @@ protected void initialize() { identificationVariable = new IdentificationVariableStateObject(this); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -386,9 +368,6 @@ public void toggleAs() { setAs(!as); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeyExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeyExpressionStateObject.java index 4f77d99ee6f..a9a856fe804 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeyExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeyExpressionStateObject.java @@ -56,33 +56,21 @@ public KeyExpressionStateObject(StateObject parent, String identificationVariabl super(parent, identificationVariable); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public KeyExpression getExpression() { return (KeyExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return KEY; } - /** - * {@inheritDoc} - */ @Override protected IType resolveType() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeywordExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeywordExpressionStateObject.java index 476467d9066..fcdb7d73f0e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeywordExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/KeywordExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -55,17 +55,11 @@ public KeywordExpressionStateObject(StateObject parent, String text) { validateIdentifier(text); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public KeywordExpression getExpression() { return (KeywordExpression) super.getExpression(); @@ -83,9 +77,6 @@ public void setExpression(KeywordExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void setText(String text) { validateIdentifier(text); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LengthExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LengthExpressionStateObject.java index b4e9c12b809..6fd3d728b45 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LengthExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LengthExpressionStateObject.java @@ -64,33 +64,21 @@ public LengthExpressionStateObject(StateObject parent, String jpqlFragment) { super(parent, jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public LengthExpression getExpression() { return (LengthExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return LENGTH; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return StringPrimaryBNF.ID; @@ -108,9 +96,6 @@ public void setExpression(LengthExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LikeExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LikeExpressionStateObject.java index 1e91f4feaee..d47fc8dbc20 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LikeExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LikeExpressionStateObject.java @@ -150,17 +150,11 @@ public LikeExpressionStateObject(StateObject parent, this(parent, stringStateObject, false, patternValue, null); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -188,9 +182,6 @@ public String getEscapeCharacter() { return escapeCharacter.getText(); } - /** - * {@inheritDoc} - */ @Override public LikeExpression getExpression() { return (LikeExpression) super.getExpression(); @@ -226,18 +217,12 @@ public boolean hasStringStateObject() { return stringStateObject != null; } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); escapeCharacter = new StringLiteralStateObject(this); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -313,9 +298,6 @@ public void toggleNot() { setNot(!not); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LocateExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LocateExpressionStateObject.java index 71dcf84686d..e8f0dd527e2 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LocateExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LocateExpressionStateObject.java @@ -118,49 +118,31 @@ public LocateExpressionStateObject(StateObject parent, super(parent, firstJpqlFragment, secondJpqlFragment, thirdJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public LocateExpression getExpression() { return (LocateExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override protected String getFirstQueryBNFId() { return StringPrimaryBNF.ID; } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return LOCATE; } - /** - * {@inheritDoc} - */ @Override protected String getSecondQueryBNFId() { return StringPrimaryBNF.ID; } - /** - * {@inheritDoc} - */ @Override protected String getThirdQueryBNFId() { return SimpleArithmeticExpressionBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LogicalExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LogicalExpressionStateObject.java index 22650da936f..236e7749ffe 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LogicalExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LogicalExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -74,9 +74,6 @@ protected LogicalExpressionStateObject(StateObject parent, super(parent, leftJpqlFragment, rightJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public LogicalExpression getExpression() { return (LogicalExpression) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LowerExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LowerExpressionStateObject.java index 367fb7a549f..573d71a5d90 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LowerExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/LowerExpressionStateObject.java @@ -64,33 +64,21 @@ public LowerExpressionStateObject(StateObject parent, String jpqlFragment) { super(parent, jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public LowerExpression getExpression() { return (LowerExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return LOWER; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return StringPrimaryBNF.ID; @@ -108,9 +96,6 @@ public void setExpression(LowerExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MaxFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MaxFunctionStateObject.java index 11449fa2acd..3b3918575ba 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MaxFunctionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MaxFunctionStateObject.java @@ -92,33 +92,21 @@ public MaxFunctionStateObject(StateObject parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public MaxFunction getExpression() { return (MaxFunction) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return MAX; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return StateFieldPathExpressionBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MinFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MinFunctionStateObject.java index ac890bbf254..e09077c191a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MinFunctionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MinFunctionStateObject.java @@ -92,33 +92,21 @@ public MinFunctionStateObject(StateObject parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public MinFunction getExpression() { return (MinFunction) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return MIN; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return StateFieldPathExpressionBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ModExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ModExpressionStateObject.java index 4f6cc437ce0..74cdeba8474 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ModExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ModExpressionStateObject.java @@ -76,41 +76,26 @@ public ModExpressionStateObject(StateObject parent, super(parent, firstJpqlFragment, secondJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public ModExpression getExpression() { return (ModExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override protected String getFirstQueryBNFId() { return SimpleArithmeticExpressionBNF.ID; } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return MOD; } - /** - * {@inheritDoc} - */ @Override protected String getSecondQueryBNFId() { return SimpleArithmeticExpressionBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MultiplicationExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MultiplicationExpressionStateObject.java index c330a18983b..7ed80dff220 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MultiplicationExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/MultiplicationExpressionStateObject.java @@ -73,25 +73,16 @@ public MultiplicationExpressionStateObject(StateObject parent, super(parent, leftJpqlFragment, rightJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public MultiplicationExpression getExpression() { return (MultiplicationExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return MULTIPLICATION; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NotExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NotExpressionStateObject.java index 636d93aafd5..b386ec4ac69 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NotExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NotExpressionStateObject.java @@ -78,17 +78,11 @@ public NotExpressionStateObject(StateObject parent, String jpqlFragment) { parse(jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -97,9 +91,6 @@ protected void addChildren(List children) { } } - /** - * {@inheritDoc} - */ @Override public NotExpression getExpression() { return (NotExpression) super.getExpression(); @@ -125,9 +116,6 @@ public boolean hasStateObject() { return stateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -173,9 +161,6 @@ public void setStateObject(StateObject stateObject) { firePropertyChanged(STATE_OBJECT_PROPERTY, oldStateObject, stateObject); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { writer.append(NOT); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullComparisonExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullComparisonExpressionStateObject.java index acd521cef5c..8fdb28b37e7 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullComparisonExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullComparisonExpressionStateObject.java @@ -125,17 +125,11 @@ public NullComparisonExpressionStateObject(StateObject parent, String path) { parse(path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -156,9 +150,6 @@ public NullComparisonExpressionStateObject addNot() { return this; } - /** - * {@inheritDoc} - */ @Override public NullComparisonExpression getExpression() { return (NullComparisonExpression) super.getExpression(); @@ -194,9 +185,6 @@ public boolean hasStateObject() { return stateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -270,9 +258,6 @@ public void toggleNot() { setNot(!not); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullIfExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullIfExpressionStateObject.java index 11cbd6b390e..d0b24773190 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullIfExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NullIfExpressionStateObject.java @@ -81,41 +81,26 @@ public NullIfExpressionStateObject(StateObject parent, super(parent, firstJpqlFragment, secondJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public NullIfExpression getExpression() { return (NullIfExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override protected String getFirstQueryBNFId() { return ScalarExpressionBNF.ID; } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return NULLIF; } - /** - * {@inheritDoc} - */ @Override protected String getSecondQueryBNFId() { return ScalarExpressionBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NumericLiteralStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NumericLiteralStateObject.java index ace6248676a..92fe05159ed 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NumericLiteralStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/NumericLiteralStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -66,17 +66,11 @@ public NumericLiteralStateObject(StateObject parent, String numeric) { super(parent, numeric); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public NumericLiteral getExpression() { return (NumericLiteral) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ObjectExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ObjectExpressionStateObject.java index 10d1d035bd1..d6feef94242 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ObjectExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ObjectExpressionStateObject.java @@ -56,33 +56,21 @@ public ObjectExpressionStateObject(StateObject parent, String identificationVari super(parent, identificationVariable); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addProblems(List problems) { super.addProblems(problems); } - /** - * {@inheritDoc} - */ @Override public ObjectExpression getExpression() { return (ObjectExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return OBJECT; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrExpressionStateObject.java index 49a35d07e20..2f19545acc3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrExpressionStateObject.java @@ -94,41 +94,26 @@ public OrExpressionStateObject(StateObject parent, super(parent, leftJpqlFragment, rightJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public OrExpression getExpression() { return (OrExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return OR; } - /** - * {@inheritDoc} - */ @Override protected String getLeftQueryBNFId() { return ConditionalExpressionBNF.ID; } - /** - * {@inheritDoc} - */ @Override protected String getRightQueryBNFId() { return ConditionalTermBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByClauseStateObject.java index d5e01e6ad89..541ae89a811 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByClauseStateObject.java @@ -53,9 +53,6 @@ public OrderByClauseStateObject(SelectStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -151,34 +148,22 @@ public OrderByItemStateObject addOrderByItem(String[] paths, Ordering ordering) return updateItem; } - /** - * {@inheritDoc} - */ @Override public OrderByClause getExpression() { return (OrderByClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public SelectStatementStateObject getParent() { return (SelectStatementStateObject) super.getParent(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { return super.isEquivalent(stateObject) && areChildrenEquivalent((OrderByClauseStateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override protected String listName() { return ORDER_BY_ITEMS_LIST; @@ -207,9 +192,6 @@ public void setExpression(OrderByClause expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { writer.append(ORDER_BY); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByItemStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByItemStateObject.java index 10f11a61f7b..294494489f9 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByItemStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/OrderByItemStateObject.java @@ -134,17 +134,11 @@ public OrderByItemStateObject(OrderByClauseStateObject parent, parse(jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -153,9 +147,6 @@ protected void addChildren(List children) { } } - /** - * {@inheritDoc} - */ @Override public OrderByItem getExpression() { return (OrderByItem) super.getExpression(); @@ -171,9 +162,6 @@ public Ordering getOrdering() { return ordering; } - /** - * {@inheritDoc} - */ @Override public OrderByClauseStateObject getParent() { return (OrderByClauseStateObject) super.getParent(); @@ -225,9 +213,6 @@ public boolean isDescending() { return ordering == Ordering.DESC; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -296,9 +281,6 @@ public void setStateObject(StateObject stateObject) { firePropertyChanged(STATE_OBJECT_PROPERTY, oldStateObject, stateObject); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/RangeVariableDeclarationStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/RangeVariableDeclarationStateObject.java index 412dc01a730..4e8788ab6c3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/RangeVariableDeclarationStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/RangeVariableDeclarationStateObject.java @@ -68,25 +68,16 @@ public RangeVariableDeclarationStateObject(IdentificationVariableDeclarationStat super(parent, entityName); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public RangeVariableDeclarationStateObject addAs() { return (RangeVariableDeclarationStateObject) super.addAs(); } - /** - * {@inheritDoc} - */ @Override protected StateObject buildRootStateObject() { return new AbstractSchemaNameStateObject(this); @@ -110,9 +101,6 @@ public String getEntityName() { return getRootStateObject().getText(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(StateObject stateObject) { @@ -123,17 +111,11 @@ public IManagedType getManagedType(StateObject stateObject) { return null; } - /** - * {@inheritDoc} - */ @Override public String getRootPath() { return getEntityName(); } - /** - * {@inheritDoc} - */ @Override public AbstractSchemaNameStateObject getRootStateObject() { return (AbstractSchemaNameStateObject) super.getRootStateObject(); @@ -191,9 +173,6 @@ public void setEntityName(String abstractSchemaName) { getRootStateObject().setText(abstractSchemaName); } - /** - * {@inheritDoc} - */ @Override public void setRootPath(String root) { setEntityName(root); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ResultVariableStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ResultVariableStateObject.java index db069aa0415..b0dcffb78ed 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ResultVariableStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ResultVariableStateObject.java @@ -111,9 +111,6 @@ public ResultVariableStateObject(SelectClauseStateObject parent, this(parent, stateObject, false, resultVariable); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -131,9 +128,6 @@ public ResultVariableStateObject addAs() { return this; } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -143,17 +137,11 @@ protected void addChildren(List children) { children.add(resultVariable); } - /** - * {@inheritDoc} - */ @Override public ResultVariable getExpression() { return (ResultVariable) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public SelectClauseStateObject getParent() { return (SelectClauseStateObject) super.getParent(); @@ -207,18 +195,12 @@ public boolean hasStateObject() { return stateObject != null; } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); resultVariable = new IdentificationVariableStateObject(this); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -307,9 +289,6 @@ public void toggleAs() { setAs(!as); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectClauseStateObject.java index 0d2a2467d3b..5dc1167105f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectClauseStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -75,17 +75,11 @@ public SelectClauseStateObject(SelectStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -138,9 +132,6 @@ public ResultVariableStateObject addItem(String jpqlFragment, String resultVaria return item; } - /** - * {@inheritDoc} - */ @Override public S addItem(S item) { getChangeSupport().addItem(this, items, SELECT_ITEMS_LIST, parent(item)); @@ -181,17 +172,11 @@ public ResultVariableStateObject addItemAs(String jpqlFragment, String resultVar return item; } - /** - * {@inheritDoc} - */ @Override public void addItems(List items) { getChangeSupport().addItems(this, this.items, SELECT_ITEMS_LIST, parent(items)); } - /** - * {@inheritDoc} - */ @Override public void addListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().addListChangeListener(listName, listener); @@ -225,17 +210,11 @@ protected boolean areChildrenEquivalent(SelectClauseStateObject stateObject) { return true; } - /** - * {@inheritDoc} - */ @Override public boolean canMoveDown(StateObject item) { return getChangeSupport().canMoveDown(items, item); } - /** - * {@inheritDoc} - */ @Override public boolean canMoveUp(StateObject item) { return getChangeSupport().canMoveUp(items, item); @@ -256,134 +235,86 @@ public ISelectExpressionStateObjectBuilder getBuilder() { return builder; } - /** - * {@inheritDoc} - */ @Override public SelectClause getExpression() { return (SelectClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public FromClauseStateObject getFromClause() { return (FromClauseStateObject) super.getFromClause(); } - /** - * {@inheritDoc} - */ @Override public StateObject getItem(int index) { return items.get(index); } - /** - * {@inheritDoc} - */ @Override public SelectStatementStateObject getParent() { return (SelectStatementStateObject) super.getParent(); } - /** - * {@inheritDoc} - */ @Override public boolean hasItems() { return items.size() > 0; } - /** - * {@inheritDoc} - */ @Override public boolean hasSelectItem() { return hasItems(); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); items = new ArrayList(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { return super.isEquivalent(stateObject) && areChildrenEquivalent((SelectClauseStateObject) stateObject); } - /** - * {@inheritDoc} - */ @Override public ListIterable items() { return new SnapshotCloneListIterable(items); } - /** - * {@inheritDoc} - */ @Override public int itemsSize() { return items.size(); } - /** - * {@inheritDoc} - */ @Override public StateObject moveDown(StateObject item) { getChangeSupport().moveDown(this, items, SELECT_ITEMS_LIST, item); return item; } - /** - * {@inheritDoc} - */ @Override public StateObject moveUp(StateObject item) { getChangeSupport().moveUp(this, items, SELECT_ITEMS_LIST, item); return item; } - /** - * {@inheritDoc} - */ @Override public void parse(String jpqlFragment) { List stateObjects = buildStateObjects(jpqlFragment, InternalSelectExpressionBNF.ID); addItems(stateObjects); } - /** - * {@inheritDoc} - */ @Override public void removeItem(StateObject stateObject) { getChangeSupport().removeItem(this, items, SELECT_ITEMS_LIST, stateObject); } - /** - * {@inheritDoc} - */ @Override public void removeItems(Collection items) { getChangeSupport().removeItems(this, this.items, SELECT_ITEMS_LIST, items); } - /** - * {@inheritDoc} - */ @Override public void removeListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().removeListChangeListener(listName, listener); @@ -412,9 +343,6 @@ public void setItems(List stateObjects) { getChangeSupport().replaceItems(this, items, SELECT_ITEMS_LIST, stateObjects); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectStatementStateObject.java index e4cd9114e9f..f3b2eb7cbf9 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectStatementStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SelectStatementStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -63,17 +63,11 @@ public SelectStatementStateObject(JPQLQueryStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -172,33 +166,21 @@ public ResultVariableStateObject addSelectItemAs(String jpqlFragment, String res return getSelectClause().addItemAs(jpqlFragment, resultVariable); } - /** - * {@inheritDoc} - */ @Override protected AbstractFromClauseStateObject buildFromClause() { return new FromClauseStateObject(this); } - /** - * {@inheritDoc} - */ @Override protected AbstractSelectClauseStateObject buildSelectClause() { return new SelectClauseStateObject(this); } - /** - * {@inheritDoc} - */ @Override public SelectStatement getExpression() { return (SelectStatement) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public FromClauseStateObject getFromClause() { return (FromClauseStateObject) super.getFromClause(); @@ -214,9 +196,6 @@ public OrderByClauseStateObject getOrderByClause() { return orderByClause; } - /** - * {@inheritDoc} - */ @Override public JPQLQueryStateObject getParent() { return (JPQLQueryStateObject) super.getParent(); @@ -234,9 +213,6 @@ public ISelectExpressionStateObjectBuilder getSelectBuilder() { return getSelectClause().getBuilder(); } - /** - * {@inheritDoc} - */ @Override public SelectClauseStateObject getSelectClause() { return (SelectClauseStateObject) super.getSelectClause(); @@ -252,9 +228,6 @@ public boolean hasOrderByClause() { return orderByClause != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -303,9 +276,6 @@ public void toggleOrderByClause() { } } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleFromClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleFromClauseStateObject.java index b40ff378931..3c294826cf7 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleFromClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleFromClauseStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -47,9 +47,6 @@ public SimpleFromClauseStateObject(SimpleSelectStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -118,17 +115,11 @@ public DerivedPathIdentificationVariableDeclarationStateObject addDerivedPathDec return stateObject; } - /** - * {@inheritDoc} - */ @Override public String declarationBNF() { return InternalSimpleFromClauseBNF.ID; } - /** - * {@inheritDoc} - */ @Override public IManagedType findManagedType(StateObject stateObject) { IManagedType managedType = getManagedType(stateObject); @@ -138,17 +129,11 @@ public IManagedType findManagedType(StateObject stateObject) { return managedType; } - /** - * {@inheritDoc} - */ @Override public SimpleFromClause getExpression() { return (SimpleFromClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public SimpleSelectStatementStateObject getParent() { return (SimpleSelectStatementStateObject) super.getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java index cbf6d32d643..613dfc1c24e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectClauseStateObject.java @@ -62,17 +62,11 @@ public SimpleSelectClauseStateObject(SimpleSelectStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -96,25 +90,16 @@ public ISimpleSelectExpressionStateObjectBuilder getBuilder() { return builder; } - /** - * {@inheritDoc} - */ @Override public SimpleSelectClause getExpression() { return (SimpleSelectClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public SimpleFromClauseStateObject getFromClause() { return (SimpleFromClauseStateObject) super.getFromClause(); } - /** - * {@inheritDoc} - */ @Override public SimpleSelectStatementStateObject getParent() { return (SimpleSelectStatementStateObject) super.getParent(); @@ -129,17 +114,11 @@ public StateObject getSelectItem() { return stateObject; } - /** - * {@inheritDoc} - */ @Override public boolean hasSelectItem() { return stateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -151,9 +130,6 @@ public boolean isEquivalent(StateObject stateObject) { return false; } - /** - * {@inheritDoc} - */ @Override public void parse(String jpqlFragment) { StateObject stateObject = buildStateObject(jpqlFragment, SimpleSelectExpressionBNF.ID); @@ -183,9 +159,6 @@ public void setSelectItem(StateObject stateObject) { firePropertyChanged(SELECT_ITEM_PROPERTY, oldStateObject, stateObject); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectStatementStateObject.java index a64ac9d6529..13c4f23300d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectStatementStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleSelectStatementStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -42,9 +42,6 @@ public SimpleSelectStatementStateObject(StateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -95,33 +92,21 @@ public DerivedPathIdentificationVariableDeclarationStateObject addDerivedPathDec return getFromClause().addDerivedPathDeclaration(path, identificationVariable); } - /** - * {@inheritDoc} - */ @Override protected AbstractFromClauseStateObject buildFromClause() { return new SimpleFromClauseStateObject(this); } - /** - * {@inheritDoc} - */ @Override protected AbstractSelectClauseStateObject buildSelectClause() { return new SimpleSelectClauseStateObject(this); } - /** - * {@inheritDoc} - */ @Override public SimpleSelectStatement getExpression() { return (SimpleSelectStatement) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public SimpleFromClauseStateObject getFromClause() { return (SimpleFromClauseStateObject) super.getFromClause(); @@ -139,9 +124,6 @@ public ISimpleSelectExpressionStateObjectBuilder getSelectBuilder() { return getSelectClause().getBuilder(); } - /** - * {@inheritDoc} - */ @Override public SimpleSelectClauseStateObject getSelectClause() { return (SimpleSelectClauseStateObject) super.getSelectClause(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleStateObject.java index 0022be43552..52ef0f238a1 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SimpleStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -78,9 +78,6 @@ public boolean hasText() { return !ExpressionTools.stringIsEmpty(text); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -112,9 +109,6 @@ protected void setTextInternally(String text) { this.text = text; } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { if (text != null) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SizeExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SizeExpressionStateObject.java index f03fe2190d5..ccac9cd7990 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SizeExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SizeExpressionStateObject.java @@ -65,33 +65,21 @@ public SizeExpressionStateObject(StateObject parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public SizeExpression getExpression() { return (SizeExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return SIZE; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return CollectionValuedPathExpressionBNF.ID; @@ -109,9 +97,6 @@ public void setExpression(SizeExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SqrtExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SqrtExpressionStateObject.java index 3a79eb20f66..6a4a27f8656 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SqrtExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SqrtExpressionStateObject.java @@ -64,33 +64,21 @@ public SqrtExpressionStateObject(StateObject parent, String jpqlFragment) { super(parent, jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public SqrtExpression getExpression() { return (SqrtExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return SQRT; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return SimpleArithmeticExpressionBNF.ID; @@ -108,9 +96,6 @@ public void setExpression(SqrtExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateFieldPathExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateFieldPathExpressionStateObject.java index fc56adedde8..46238317131 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateFieldPathExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StateFieldPathExpressionStateObject.java @@ -63,25 +63,16 @@ public StateFieldPathExpressionStateObject(StateObject parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public StateFieldPathExpression getExpression() { return (StateFieldPathExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override protected IManagedType resolveManagedType() { @@ -116,9 +107,6 @@ else if (typeHelper.isMapType(type)) { return getManagedTypeProvider().getManagedType(type); } - /** - * {@inheritDoc} - */ @Override protected IType resolveType() { return getTypeHelper().convertPrimitive(getTypeDeclaration().getType()); @@ -147,56 +135,35 @@ protected MapManagedType(IManagedTypeProvider provider, IType mapType) { this.provider = provider; } - /** - * {@inheritDoc} - */ @Override public void accept(IManagedTypeVisitor visitor) { } - /** - * {@inheritDoc} - */ @Override public int compareTo(IManagedType managedType) { return getType().getName().compareTo(managedType.getType().getName()); } - /** - * {@inheritDoc} - */ @Override public IMapping getMappingNamed(String name) { return null; } - /** - * {@inheritDoc} - */ @Override public IManagedTypeProvider getProvider() { return provider; } - /** - * {@inheritDoc} - */ @Override public IType getType() { return mapType; } - /** - * {@inheritDoc} - */ @Override public Iterable mappings() { return EmptyIterable.instance(); } - /** - * {@inheritDoc} - */ @Override public String toString() { return getType().getName(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StringLiteralStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StringLiteralStateObject.java index 66f72808849..378708d119b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StringLiteralStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/StringLiteralStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -58,17 +58,11 @@ public StringLiteralStateObject(StateObject parent, String literal) { super(parent, literal); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public StringLiteral getExpression() { return (StringLiteral) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubExpressionStateObject.java index 572b43016be..4eb74531053 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubExpressionStateObject.java @@ -75,33 +75,21 @@ public SubExpressionStateObject(StateObject parent, String jpqlFragment, String parse(jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public SubExpression getExpression() { return (SubExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return ExpressionTools.EMPTY_STRING; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return queryBNFId; @@ -131,9 +119,6 @@ public void setQueryBNFId(String queryBNFId) { this.queryBNFId = queryBNFId; } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubstringExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubstringExpressionStateObject.java index 59eab2c60e1..0abef4dba79 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubstringExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubstringExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -117,49 +117,31 @@ public SubstringExpressionStateObject(StateObject parent, super(parent, firstJpqlFragment, secondJpqlFragment, thirdJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public SubstringExpression getExpression() { return (SubstringExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override protected String getFirstQueryBNFId() { return StringPrimaryBNF.ID; } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return SUBSTRING; } - /** - * {@inheritDoc} - */ @Override protected String getSecondQueryBNFId() { return SimpleArithmeticExpressionBNF.ID; } - /** - * {@inheritDoc} - */ @Override protected String getThirdQueryBNFId() { return SimpleArithmeticExpressionBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubtractionExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubtractionExpressionStateObject.java index cfd914e1d56..89f3d7a8998 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubtractionExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SubtractionExpressionStateObject.java @@ -73,25 +73,16 @@ public SubtractionExpressionStateObject(StateObject parent, super(parent, leftJpqlFragment, rightJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public SubtractionExpression getExpression() { return (SubtractionExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return MINUS; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SumFunctionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SumFunctionStateObject.java index a06ac4346f2..23d3bd03c19 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SumFunctionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/SumFunctionStateObject.java @@ -100,33 +100,21 @@ public SumFunctionStateObject(StateObject parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public SumFunction getExpression() { return (SumFunction) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return SUM; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return StateFieldPathExpressionBNF.ID; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TreatExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TreatExpressionStateObject.java index 46d0a514a44..44c583369c2 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TreatExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TreatExpressionStateObject.java @@ -55,7 +55,7 @@ public class TreatExpressionStateObject extends AbstractStateObject { private EntityTypeLiteralStateObject entityTypeName; /** - * Keeps a reference onto the {@link JoinStateObject} since it owns the {@link IStatObject} + * Keeps a reference onto the {@link JoinStateObject} since it owns the {@link StateObject} * representing the collection-valued path expression. */ private JoinStateObject joinStateObject; @@ -107,9 +107,6 @@ public TreatExpressionStateObject(JoinStateObject parent, String entityTypeName) this(parent, false, entityTypeName); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { acceptUnknownVisitor(visitor); @@ -127,9 +124,6 @@ public TreatExpressionStateObject addAs() { return this; } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -179,9 +173,6 @@ public String getEntityTypeName() { return entityTypeName.getText(); } - /** - * {@inheritDoc} - */ @Override public TreatExpression getExpression() { return (TreatExpression) super.getExpression(); @@ -237,18 +228,12 @@ public boolean hasEntityTypeName() { return entityTypeName != null; } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); entityTypeName = new EntityTypeLiteralStateObject(this); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -331,9 +316,6 @@ public void toggleAs() { setAs(!as); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TrimExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TrimExpressionStateObject.java index c94d711b148..acc035614b1 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TrimExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TrimExpressionStateObject.java @@ -128,33 +128,21 @@ public TrimExpressionStateObject(StateObject parent, String jpqlFragment) { super(parent, jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public TrimExpression getExpression() { return (TrimExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return TRIM; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return StringPrimaryBNF.ID; @@ -199,9 +187,6 @@ public boolean hasTrimCharacter() { return trimCharacter != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -214,9 +199,6 @@ public boolean isEquivalent(StateObject stateObject) { return false; } - /** - * {@inheritDoc} - */ @Override public void parse(String jpqlFragment) { @@ -295,9 +277,6 @@ public void setSpecification(Specification specification) { firePropertyChanged(SPECIFICATION_PROPERTY, oldSpecification, specification); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); @@ -316,9 +295,6 @@ public void setTrimCharacter(StateObject trimCharacter) { firePropertyChanged(TRIM_CHARACTER_PROPERTY, oldTrimCharacter, trimCharacter); } - /** - * {@inheritDoc} - */ @Override protected void toTextEncapsulatedExpression(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TypeExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TypeExpressionStateObject.java index 27224578747..7150a4da846 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TypeExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/TypeExpressionStateObject.java @@ -70,33 +70,21 @@ public TypeExpressionStateObject(StateObject parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public TypeExpression getExpression() { return (TypeExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return TYPE; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return InternalEntityTypeExpressionBNF.ID; @@ -114,9 +102,6 @@ public void setExpression(TypeExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UnknownExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UnknownExpressionStateObject.java index e8b2070dcee..ab477e3834d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UnknownExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UnknownExpressionStateObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -39,17 +39,11 @@ public UnknownExpressionStateObject(StateObject parent, String text) { super(parent, text); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public UnknownExpression getExpression() { return (UnknownExpression) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateClauseStateObject.java index 8c00b79c6c2..606de8d8c9b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateClauseStateObject.java @@ -66,17 +66,11 @@ public UpdateClauseStateObject(UpdateStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -200,9 +194,6 @@ public UpdateItemStateObject addItem(String[] paths, String newValue) { return updateItem; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public UpdateItemStateObject addItem(UpdateItemStateObject item) { @@ -210,17 +201,11 @@ public UpdateItemStateObject addItem(UpdateItemStateObject item) { return item; } - /** - * {@inheritDoc} - */ @Override public void addItems(List items) { getChangeSupport().addItems(this, this.items, UPDATE_ITEMS_LIST, parent(items)); } - /** - * {@inheritDoc} - */ @Override public void addListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().addListChangeListener(listName, listener); @@ -254,74 +239,47 @@ protected boolean areChildrenEquivalent(UpdateClauseStateObject stateObject) { return true; } - /** - * {@inheritDoc} - */ @Override public boolean canMoveDown(UpdateItemStateObject item) { return getChangeSupport().canMoveDown(items, item); } - /** - * {@inheritDoc} - */ @Override public boolean canMoveUp(UpdateItemStateObject item) { return getChangeSupport().canMoveUp(items, item); } - /** - * {@inheritDoc} - */ @Override public UpdateClause getExpression() { return (UpdateClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return UPDATE; } - /** - * {@inheritDoc} - */ @Override public UpdateItemStateObject getItem(int index) { return items.get(index); } - /** - * {@inheritDoc} - */ @Override public UpdateStatementStateObject getParent() { return (UpdateStatementStateObject) super.getParent(); } - /** - * {@inheritDoc} - */ @Override public boolean hasItems() { return !items.isEmpty(); } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); items = new ArrayList(); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { return super.isEquivalent(stateObject) && @@ -338,34 +296,22 @@ public boolean isIdentificationVariableDefined() { return !getIdentificationVariableStateObject().isVirtual(); } - /** - * {@inheritDoc} - */ @Override public ListIterable items() { return new SnapshotCloneListIterable(items); } - /** - * {@inheritDoc} - */ @Override public int itemsSize() { return items.size(); } - /** - * {@inheritDoc} - */ @Override public UpdateItemStateObject moveDown(UpdateItemStateObject item) { getChangeSupport().moveDown(this, items, UPDATE_ITEMS_LIST, item); return item; } - /** - * {@inheritDoc} - */ @Override public UpdateItemStateObject moveUp(UpdateItemStateObject item) { getChangeSupport().moveUp(this, items, UPDATE_ITEMS_LIST, item); @@ -383,25 +329,16 @@ public void parse(String jpqlFragment) { addItem(stateObject); } - /** - * {@inheritDoc} - */ @Override public void removeItem(UpdateItemStateObject stateObject) { getChangeSupport().removeItem(this, this.items, UPDATE_ITEMS_LIST, stateObject); } - /** - * {@inheritDoc} - */ @Override public void removeItems(Collection items) { getChangeSupport().removeItems(this, this.items, UPDATE_ITEMS_LIST, items); } - /** - * {@inheritDoc} - */ @Override public void removeListChangeListener(String listName, IListChangeListener listener) { getChangeSupport().removeListChangeListener(listName, listener); @@ -419,9 +356,6 @@ public void setExpression(UpdateClause expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { super.toTextInternal(writer); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java index 01dec0aba0f..66577ec48a5 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateItemStateObject.java @@ -103,17 +103,11 @@ public UpdateItemStateObject(UpdateClauseStateObject parent, setPath(path); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -151,9 +145,6 @@ public INewValueStateObjectBuilder getBuilder() { return builder; } - /** - * {@inheritDoc} - */ @Override public UpdateItem getExpression() { return (UpdateItem) super.getExpression(); @@ -168,9 +159,6 @@ public StateObject getNewValue() { return newValue; } - /** - * {@inheritDoc} - */ @Override public UpdateClauseStateObject getParent() { return (UpdateClauseStateObject) super.getParent(); @@ -204,18 +192,12 @@ public boolean hasNewValue() { return newValue != null; } - /** - * {@inheritDoc} - */ @Override protected void initialize() { super.initialize(); stateFieldPath = new StateFieldPathExpressionStateObject(this); } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -326,9 +308,6 @@ public void setVirtualIdentificationVariable(String identificationVariable) { stateFieldPath.setIdentificationVariableInternally(variable); } - /** - * {@inheritDoc} - */ @Override protected void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateStatementStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateStatementStateObject.java index fb7c95af556..80561cb1327 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateStatementStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpdateStatementStateObject.java @@ -42,9 +42,6 @@ public UpdateStatementStateObject(JPQLQueryStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); @@ -83,17 +80,11 @@ public UpdateItemStateObject addItem(String path, String newValue) { return getModifyClause().addItem(path, newValue); } - /** - * {@inheritDoc} - */ @Override protected AbstractModifyClauseStateObject buildModifyClause() { return new UpdateClauseStateObject(this); } - /** - * {@inheritDoc} - */ @Override public UpdateStatement getExpression() { return (UpdateStatement) super.getExpression(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpperExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpperExpressionStateObject.java index 0ec9b74ad98..0adf4153730 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpperExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/UpperExpressionStateObject.java @@ -64,33 +64,21 @@ public UpperExpressionStateObject(StateObject parent, String jpqlFragment) { super(parent, jpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public UpperExpression getExpression() { return (UpperExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return UPPER; } - /** - * {@inheritDoc} - */ @Override protected String getQueryBNFId() { return StringPrimaryBNF.ID; @@ -108,9 +96,6 @@ public void setExpression(UpperExpression expression) { super.setExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void setStateObject(StateObject stateObject) { super.setStateObject(stateObject); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ValueExpressionStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ValueExpressionStateObject.java index 2a390a08579..b7a8ab558d6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ValueExpressionStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/ValueExpressionStateObject.java @@ -56,33 +56,21 @@ public ValueExpressionStateObject(StateObject parent, String identificationVaria super(parent, identificationVariable); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public ValueExpression getExpression() { return (ValueExpression) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return VALUE; } - /** - * {@inheritDoc} - */ @Override protected IType resolveType() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhenClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhenClauseStateObject.java index 439505542c9..9897263e51e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhenClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhenClauseStateObject.java @@ -99,17 +99,11 @@ public WhenClauseStateObject(CaseExpressionStateObject parent, parseThen(thenJpqlFragment); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override protected void addChildren(List children) { super.addChildren(children); @@ -118,9 +112,6 @@ protected void addChildren(List children) { } } - /** - * {@inheritDoc} - */ @Override protected void addProblems(List problems) { @@ -135,25 +126,16 @@ protected void addProblems(List problems) { } } - /** - * {@inheritDoc} - */ @Override public WhenClause getExpression() { return (WhenClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return WHEN; } - /** - * {@inheritDoc} - */ @Override public CaseExpressionStateObject getParent() { return (CaseExpressionStateObject) super.getParent(); @@ -179,9 +161,6 @@ public boolean hasThen() { return thenStateObject != null; } - /** - * {@inheritDoc} - */ @Override public boolean isEquivalent(StateObject stateObject) { @@ -240,9 +219,6 @@ public void setThen(StateObject thenStateObject) { firePropertyChanged(THEN_STATE_OBJECT_PROPERTY, oldThenStateObject, thenStateObject); } - /** - * {@inheritDoc} - */ @Override public void toTextInternal(Appendable writer) throws IOException { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhereClauseStateObject.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhereClauseStateObject.java index c3f236c2bb9..1b33625af06 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhereClauseStateObject.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/model/query/WhereClauseStateObject.java @@ -53,25 +53,16 @@ public WhereClauseStateObject(AbstractSelectStatementStateObject parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override public void accept(StateObjectVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public WhereClause getExpression() { return (WhereClause) super.getExpression(); } - /** - * {@inheritDoc} - */ @Override public String getIdentifier() { return WHERE; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbsFunctionResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbsFunctionResolver.java index b43841bac75..ae8621c00a7 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbsFunctionResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbsFunctionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -40,9 +40,6 @@ public AbsFunctionResolver(Resolver parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { @@ -56,9 +53,6 @@ protected IType buildType() { return type; } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getParentTypeDeclaration(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractPathResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractPathResolver.java index 6125fdd3187..cd2bd9fd2fa 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractPathResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractPathResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -71,9 +71,6 @@ protected AbstractPathResolver(Resolver parent, String path) { parent.addChild(path, this); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { IMapping mapping = getMapping(); @@ -83,9 +80,6 @@ protected ITypeDeclaration buildTypeDeclaration() { return getTypeHelper().unknownTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType() { @@ -102,9 +96,6 @@ public IManagedType getManagedType() { return managedType; } - /** - * {@inheritDoc} - */ @Override public final IMapping getMapping() { if ((mapping == null) && !mappingResolved) { @@ -146,9 +137,6 @@ protected IMapping resolveMapping() { return null; } - /** - * {@inheritDoc} - */ @Override public String toString() { return path; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractRangeDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractRangeDeclaration.java index df7839cf68f..a48b33b2acc 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractRangeDeclaration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/AbstractRangeDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -57,9 +57,6 @@ protected void addJoin(Join join) { joins.add(join); } - /** - * {@inheritDoc} - */ @Override public List getJoins() { if (joins == null) { @@ -68,9 +65,6 @@ public List getJoins() { return joins; } - /** - * {@inheritDoc} - */ @Override public boolean hasJoins() { return (joins != null); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassNameResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassNameResolver.java index 7723e72cbd8..3bfa8e12861 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassNameResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassNameResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -43,25 +43,16 @@ public ClassNameResolver(Resolver parent, String className) { this.className = className; } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { return getType(className); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getType().getTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public String toString() { return className; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassResolver.java index 2e2ef2d0f89..f0d930aa2d8 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ClassResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -43,25 +43,16 @@ public ClassResolver(Resolver parent, Class javaType) { this.javaType = javaType; } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { return getType(javaType); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getType().getTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public String toString() { return javaType.getName(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionDeclaration.java index e4e8dabb97c..f5683f31bd3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionDeclaration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -35,9 +35,6 @@ public CollectionDeclaration() { super(); } - /** - * {@inheritDoc} - */ @Override public Type getType() { return Type.COLLECTION; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionEquivalentResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionEquivalentResolver.java index 239ebc7bfc4..f9109955f5c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionEquivalentResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionEquivalentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -50,9 +50,6 @@ public CollectionEquivalentResolver(Resolver parent, List resolvers) { this.resolvers = resolvers; } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { @@ -83,9 +80,6 @@ else if (!type.equals(anotherType)) { return type; } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getType().getTypeDeclaration(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionValuedFieldResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionValuedFieldResolver.java index f168299dbec..11f635601ca 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionValuedFieldResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/CollectionValuedFieldResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -42,9 +42,6 @@ public CollectionValuedFieldResolver(Resolver parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { @@ -72,9 +69,6 @@ else if (getTypeHelper().isMapType(type)) { return getTypeHelper().convertPrimitive(type); } - /** - * {@inheritDoc} - */ @Override protected IManagedType resolveManagedType(IMapping mapping) { @@ -115,56 +109,35 @@ protected MapManagedType(IManagedTypeProvider provider, IType mapType) { this.mapType = mapType; } - /** - * {@inheritDoc} - */ @Override public void accept(IManagedTypeVisitor visitor) { } - /** - * {@inheritDoc} - */ @Override public int compareTo(IManagedType managedType) { return getType().getName().compareTo(managedType.getType().getName()); } - /** - * {@inheritDoc} - */ @Override public IMapping getMappingNamed(String name) { return null; } - /** - * {@inheritDoc} - */ @Override public IManagedTypeProvider getProvider() { return provider; } - /** - * {@inheritDoc} - */ @Override public IType getType() { return mapType; } - /** - * {@inheritDoc} - */ @Override public Iterable mappings() { return EmptyIterable.instance(); } - /** - * {@inheritDoc} - */ @Override public String toString() { return getType().getName(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/Declaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/Declaration.java index 4f71f942a11..5700d3b4786 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/Declaration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/Declaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -68,17 +68,11 @@ protected Declaration() { super(); } - /** - * {@inheritDoc} - */ @Override public Expression getBaseExpression() { return baseExpression; } - /** - * {@inheritDoc} - */ @Override public Expression getDeclarationExpression() { return declarationExpression; @@ -93,9 +87,6 @@ public IdentificationVariable getIdentificationVariable() { return identificationVariable; } - /** - * {@inheritDoc} - */ @Override public List getJoins() { return Collections.emptyList(); @@ -114,9 +105,6 @@ public String getRootPath() { return rootPath; } - /** - * {@inheritDoc} - */ @Override public String getVariableName() { if (identificationVariable == null) { @@ -125,17 +113,11 @@ public String getVariableName() { return identificationVariable.getVariableName(); } - /** - * {@inheritDoc} - */ @Override public boolean hasJoins() { return false; } - /** - * {@inheritDoc} - */ @Override public String toString() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DeclarationResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DeclarationResolver.java index 323b4a48978..08e934a3da4 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DeclarationResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DeclarationResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -167,25 +167,16 @@ protected RootObjectExpressionVisitor buildRootObjectExpressionVisitor() { return new RootObjectExpressionVisitor(); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { return getTypeHelper().unknownType(); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getTypeHelper().unknownTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override protected void checkParent(Resolver parent) { // Don't do anything, this is the root @@ -265,17 +256,11 @@ protected DeclarationVisitor getDeclarationVisitor() { return declarationVisitor; } - /** - * {@inheritDoc} - */ @Override public DeclarationResolver getParent() { return (DeclarationResolver) super.getParent(); } - /** - * {@inheritDoc} - */ @Override public IQuery getQuery() { return queryContext.getQuery(); @@ -602,9 +587,6 @@ protected class DeclarationVisitor extends AbstractExpressionVisitor { */ protected Declaration currentDeclaration; - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaName expression) { currentDeclaration = new RangeDeclaration(); @@ -612,17 +594,11 @@ public void visit(AbstractSchemaName expression) { declarations.add(currentDeclaration); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionExpression expression) { expression.acceptChildren(this); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberDeclaration expression) { @@ -641,9 +617,6 @@ public void visit(CollectionMemberDeclaration expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpression expression) { currentDeclaration = new DerivedDeclaration(); @@ -651,9 +624,6 @@ public void visit(CollectionValuedPathExpression expression) { declarations.add(currentDeclaration); } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteClause expression) { @@ -669,25 +639,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(IdentificationVariable expression) { if (collectResultVariable) { @@ -695,9 +656,6 @@ public void visit(IdentificationVariable expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclaration expression) { @@ -711,9 +669,6 @@ public void visit(IdentificationVariableDeclaration expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(Join expression) { @@ -723,17 +678,11 @@ public void visit(Join expression) { rangeDeclaration.addJoin(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(JPQLExpression expression) { expression.getQueryStatement().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(NullExpression expression) { if (buildingDeclaration) { @@ -744,9 +693,6 @@ public void visit(NullExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclaration expression) { @@ -768,9 +714,6 @@ public void visit(RangeVariableDeclaration expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariable expression) { collectResultVariable = true; @@ -778,50 +721,32 @@ public void visit(ResultVariable expression) { collectResultVariable = false; } - /** - * {@inheritDoc} - */ @Override public void visit(SelectClause expression) { expression.getSelectExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatement expression) { expression.getFromClause().accept(this); expression.getSelectClause().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleFromClause expression) { expression.getDeclaration().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectClause expression) { expression.getSelectExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { expression.getFromClause().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateClause expression) { @@ -837,9 +762,6 @@ public void visit(UpdateClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateStatement expression) { expression.getUpdateClause().accept(this); @@ -863,26 +785,17 @@ protected static class QualifyRangeDeclarationVisitor extends AbstractExpression */ protected String outerVariableName; - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpression expression) { newDeclaration.rootPath = expression.toActualText(); newDeclaration.baseExpression = expression; } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclaration expression) { expression.getRangeVariableDeclaration().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclaration expression) { @@ -903,17 +816,11 @@ protected class RootObjectExpressionVisitor extends AnonymousExpressionVisitor { */ protected Resolver resolver; - /** - * {@inheritDoc} - */ @Override protected void visit(Expression expression) { resolver = queryContext.getResolver(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { resolver = new FromSubqueryResolver( @@ -923,9 +830,6 @@ public void visit(SimpleSelectStatement expression) { ); } - /** - * {@inheritDoc} - */ @Override public void visit(SubExpression expression) { expression.getExpression().accept(this); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DerivedDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DerivedDeclaration.java index e8152c1978b..cb015a6b17e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DerivedDeclaration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/DerivedDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -50,9 +50,6 @@ public String getSuperqueryVariableName() { return (index > -1) ? rootPath.substring(0, index) : ExpressionTools.EMPTY_STRING; } - /** - * {@inheritDoc} - */ @Override public Type getType() { return Type.DERIVED; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EclipseLinkDeclarationResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EclipseLinkDeclarationResolver.java index 12fc4583965..b9d8c81b198 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EclipseLinkDeclarationResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EclipseLinkDeclarationResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -44,9 +44,6 @@ public EclipseLinkDeclarationResolver(DeclarationResolver parent, JPQLQueryConte super(parent, queryContext); } - /** - * {@inheritDoc} - */ @Override protected DeclarationVisitor buildDeclarationVisitor() { return new DeclarationVisitor(); @@ -54,9 +51,6 @@ protected DeclarationVisitor buildDeclarationVisitor() { protected class DeclarationVisitor extends DeclarationResolver.DeclarationVisitor { - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { @@ -73,17 +67,11 @@ public void visit(SimpleSelectStatement expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SubExpression expression) { expression.getExpression().accept(this); } - /** - * {@inheritDoc} - */ public void visit(TableVariableDeclaration expression) { currentDeclaration = new TableDeclaration(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EntityResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EntityResolver.java index 61e4e40c7a6..07532bd15c7 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EntityResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EntityResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -49,18 +49,12 @@ public EntityResolver(Resolver parent, String abstractSchemaName) { this.abstractSchemaName = abstractSchemaName; } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { IManagedType entity = getManagedType(); return (entity != null) ? entity.getType() : getTypeHelper().objectType(); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getType().getTypeDeclaration(); @@ -75,9 +69,6 @@ public String getAbstractSchemaName() { return abstractSchemaName; } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType() { if (managedType == null) { @@ -86,9 +77,6 @@ public IManagedType getManagedType() { return managedType; } - /** - * {@inheritDoc} - */ @Override public String toString() { return abstractSchemaName; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EnumLiteralResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EnumLiteralResolver.java index 7a691b74014..21ef0fcb2c6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EnumLiteralResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/EnumLiteralResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -52,17 +52,11 @@ public EnumLiteralResolver(Resolver parent, IType type, String enumLiteral) { this.enumLiteral = enumLiteral; } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { return type; } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return type.getTypeDeclaration(); @@ -78,9 +72,6 @@ public String getConstantName() { return enumLiteral.substring(index + 1); } - /** - * {@inheritDoc} - */ @Override public String toString() { return enumLiteral; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java index 2b43c78afc5..fa2530d5216 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/FromSubqueryResolver.java @@ -109,25 +109,16 @@ public FromSubqueryResolver(Resolver parent, this.queryContext = queryContext; } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { return getManagedType().getType(); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getType().getTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType() { if (managedType == null) { @@ -153,41 +144,26 @@ protected class VirtualManagedType implements IManagedType { */ private Map mappings; - /** - * {@inheritDoc} - */ @Override public void accept(IManagedTypeVisitor visitor) { } - /** - * {@inheritDoc} - */ @Override public int compareTo(IManagedType managedType) { return getType().getName().compareTo(managedType.getType().getName()); } - /** - * {@inheritDoc} - */ @Override public IMapping getMappingNamed(String name) { initializeMappings(); return mappings.get(name); } - /** - * {@inheritDoc} - */ @Override public IManagedTypeProvider getProvider() { return FromSubqueryResolver.this.getProvider(); } - /** - * {@inheritDoc} - */ @Override public IType getType() { return getProvider().getTypeRepository().getType(IType.UNRESOLVABLE_TYPE); @@ -207,9 +183,6 @@ private void initializeMappings() { } } - /** - * {@inheritDoc} - */ @Override public Iterable mappings() { initializeMappings(); @@ -239,67 +212,43 @@ protected VirtualMapping(IManagedType parent, this.mappingType = mappingType; } - /** - * {@inheritDoc} - */ @Override public int compareTo(IMapping mapping) { return getName().compareTo(mapping.getName()); } - /** - * {@inheritDoc} - */ @Override public int getMappingType() { IMapping mapping = resolver.getMapping(); return (mapping != null) ? mapping.getMappingType() : IMappingType.TRANSIENT; } - /** - * {@inheritDoc} - */ @Override public String getName() { return name; } - /** - * {@inheritDoc} - */ @Override public IManagedType getParent() { return parent; } - /** - * {@inheritDoc} - */ @Override public IType getType() { return resolver.getType(); } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration getTypeDeclaration() { return resolver.getTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public boolean hasAnnotation(Class annotationType) { // TODO: Can we do this??? return getType().hasAnnotation(annotationType); } - /** - * {@inheritDoc} - */ @Override public boolean isCollection() { IMapping mapping = resolver.getMapping(); @@ -312,36 +261,24 @@ public boolean isEmbeddable() { return (mapping != null) ? mapping.isEmbeddable() : false; } - /** - * {@inheritDoc} - */ @Override public boolean isProperty() { IMapping mapping = resolver.getMapping(); return (mapping != null) ? mapping.isProperty() : (mappingType == MappingType.PROPERTY); } - /** - * {@inheritDoc} - */ @Override public boolean isRelationship() { IMapping mapping = resolver.getMapping(); return (mapping != null) ? mapping.isRelationship() : (mappingType == MappingType.RELATIONSHIP); } - /** - * {@inheritDoc} - */ @Override public boolean isTransient() { IMapping mapping = resolver.getMapping(); return (mapping != null) ? mapping.isTransient() : false; } - /** - * {@inheritDoc} - */ @Override public String toString() { return name; @@ -389,113 +326,71 @@ protected IMapping buildMapping(String name, Resolver resolver) { return new VirtualMapping(parent, name, resolver, mappingType); } - /** - * {@inheritDoc} - */ @Override public void visit(AbsExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(AdditionExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(AvgFunction expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionExpression expression) { expression.acceptChildren(this); } - /** - * {@inheritDoc} - */ @Override public void visit(ConcatExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(CountFunction expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(DivisionExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(IndexExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(LengthExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(LocateExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(LowerExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(MaxFunction expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(MinFunction expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariable expression) { @@ -514,41 +409,26 @@ public void visit(ResultVariable expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectClause expression) { expression.getSelectExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { expression.getSelectClause().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SizeExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(SqrtExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpression expression) { @@ -565,41 +445,26 @@ public void visit(StateFieldPathExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SubstringExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(SubtractionExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(SumFunction expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(TrimExpression expression) { mappingType = MappingType.PROPERTY; } - /** - * {@inheritDoc} - */ @Override public void visit(UpperExpression expression) { mappingType = MappingType.PROPERTY; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/IdentificationVariableResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/IdentificationVariableResolver.java index 43184c229e1..d88ec0444de 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/IdentificationVariableResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/IdentificationVariableResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -47,33 +47,21 @@ public IdentificationVariableResolver(Resolver parent, String variableName) { this.variableName = variableName; } - /** - * {@inheritDoc} - */ @Override public IType buildType() { return getParentType(); } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration buildTypeDeclaration() { return getParentTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType() { return getParentManagedType(); } - /** - * {@inheritDoc} - */ @Override public IMapping getMapping() { return getParentMapping(); @@ -88,9 +76,6 @@ public String getVariableName() { return variableName; } - /** - * {@inheritDoc} - */ @Override public String toString() { return variableName + " -> " + getParent(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/KeyResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/KeyResolver.java index 8fab5444302..09159abd2b8 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/KeyResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/KeyResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -42,9 +42,6 @@ public KeyResolver(Resolver parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { @@ -61,25 +58,16 @@ protected IType buildType() { return getTypeHelper().objectType(); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getParentTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType() { return getProvider().getManagedType(getType()); } - /** - * {@inheritDoc} - */ @Override public String toString() { return "KEY(" + getParent() + ")"; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NullResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NullResolver.java index d46ea23e18f..daec1878fbc 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NullResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NullResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,17 +36,11 @@ public NullResolver(Resolver parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { return getTypeHelper().unknownType(); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getTypeHelper().unknownTypeDeclaration(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NumericResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NumericResolver.java index 8d270c63199..50b4fac42b2 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NumericResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/NumericResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -81,9 +81,6 @@ public NumericResolver(Resolver parent, Resolver resolver) { this(parent, Collections.singleton(resolver)); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { @@ -117,9 +114,6 @@ protected IType buildType() { return types.get(0); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getType().getTypeDeclaration(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/RangeDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/RangeDeclaration.java index 2ef57aac972..b3dcdeee90b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/RangeDeclaration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/RangeDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,9 +36,6 @@ public RangeDeclaration() { super(); } - /** - * {@inheritDoc} - */ @Override public Type getType() { return Type.RANGE; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ResolverBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ResolverBuilder.java index 8829ea4f7fc..2ad2d2bb873 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ResolverBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ResolverBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -383,9 +383,6 @@ public Resolver getResolver() { return resolver; } - /** - * {@inheritDoc} - */ @Override public void visit(AbsExpression expression) { @@ -397,9 +394,6 @@ public void visit(AbsExpression expression) { resolver = new AbsFunctionResolver(resolver); } - /** - * {@inheritDoc} - */ @Override public void visit(AbstractSchemaName expression) { @@ -421,33 +415,21 @@ public void visit(AbstractSchemaName expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(AdditionExpression expression) { visitArithmeticExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(AllOrAnyExpression expression) { expression.getExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(AndExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ArithmeticFactor expression) { @@ -459,33 +441,21 @@ public void visit(ArithmeticFactor expression) { resolver = new NumericResolver(parent, resolver); } - /** - * {@inheritDoc} - */ @Override public void visit(AvgFunction expression) { resolver = buildClassResolver(Double.class); } - /** - * {@inheritDoc} - */ @Override public void visit(BadExpression expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(BetweenExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(CaseExpression expression) { visitCollectionEquivalentExpression( @@ -494,41 +464,26 @@ public void visit(CaseExpression expression) { ); } - /** - * {@inheritDoc} - */ @Override public void visit(CoalesceExpression expression) { visitCollectionEquivalentExpression(expression.getExpression(), null); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionExpression expression) { expression.acceptChildren(this); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberDeclaration expression) { expression.getCollectionValuedPathExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionMemberExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionValuedPathExpression expression) { @@ -562,25 +517,16 @@ public void visit(CollectionValuedPathExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(ComparisonExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ConcatExpression expression) { resolver = buildClassResolver(String.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ConstructorExpression expression) { @@ -594,17 +540,11 @@ public void visit(ConstructorExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(CountFunction expression) { resolver = buildClassResolver(Long.class); } - /** - * {@inheritDoc} - */ @Override public void visit(DateTime expression) { @@ -635,41 +575,26 @@ else if (text.startsWith("{t")) { } } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(DeleteStatement expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(DivisionExpression expression) { visitArithmeticExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(EmptyCollectionComparisonExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(EntityTypeLiteral expression) { @@ -684,115 +609,73 @@ public void visit(EntityTypeLiteral expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(EntryExpression expression) { resolver = buildClassResolver(Map.Entry.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ExistsExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(FromClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(FunctionExpression expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(GroupByClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(HavingClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariable expression) { DeclarationResolver parent = getDeclarationResolver(expression); resolver = parent.getResolver(expression.getVariableName()); } - /** - * {@inheritDoc} - */ @Override public void visit(IdentificationVariableDeclaration expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(IndexExpression expression) { resolver = buildClassResolver(Integer.class); } - /** - * {@inheritDoc} - */ @Override public void visit(InExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(InputParameter expression) { resolver = buildClassNameResolver(IType.UNRESOLVABLE_TYPE); } - /** - * {@inheritDoc} - */ @Override public void visit(Join expression) { expression.getJoinAssociationPath().accept(this); resolver.setNullAllowed(expression.isLeftJoin()); } - /** - * {@inheritDoc} - */ @Override public void visit(JPQLExpression expression) { expression.getQueryStatement().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(KeyExpression expression) { @@ -804,9 +687,6 @@ public void visit(KeyExpression expression) { resolver = new KeyResolver(resolver); } - /** - * {@inheritDoc} - */ @Override public void visit(KeywordExpression expression) { @@ -822,107 +702,68 @@ public void visit(KeywordExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(LengthExpression expression) { resolver = buildClassResolver(Integer.class); } - /** - * {@inheritDoc} - */ @Override public void visit(LikeExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(LocateExpression expression) { resolver = buildClassResolver(Integer.class); } - /** - * {@inheritDoc} - */ @Override public void visit(LowerExpression expression) { resolver = buildClassResolver(String.class); } - /** - * {@inheritDoc} - */ @Override public void visit(MaxFunction expression) { // Visit the state field path expression in order to create the resolver expression.getExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(MinFunction expression) { // Visit the state field path expression in order to create the resolver expression.getExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(ModExpression expression) { resolver = buildClassResolver(Integer.class); } - /** - * {@inheritDoc} - */ @Override public void visit(MultiplicationExpression expression) { visitArithmeticExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(NotExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(NullComparisonExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(NullExpression expression) { resolver = buildClassNameResolver(IType.UNRESOLVABLE_TYPE); } - /** - * {@inheritDoc} - */ @Override public void visit(NullIfExpression expression) { expression.getFirstExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(NumericLiteral expression) { @@ -957,65 +798,41 @@ 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) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(OrderByItem expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(OrExpression expression) { resolver = buildClassResolver(Boolean.class); } - /** - * {@inheritDoc} - */ @Override public void visit(RangeVariableDeclaration expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ResultVariable expression) { expression.getSelectExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SelectClause expression) { @@ -1033,33 +850,21 @@ public void visit(SelectClause expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SelectStatement expression) { expression.getSelectClause().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleFromClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectClause expression) { expression.getSelectExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SimpleSelectStatement expression) { queryContext.newSubqueryContext(expression); @@ -1071,25 +876,16 @@ public void visit(SimpleSelectStatement expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(SizeExpression expression) { resolver = buildClassResolver(Integer.class); } - /** - * {@inheritDoc} - */ @Override public void visit(SqrtExpression expression) { resolver = buildClassResolver(Double.class); } - /** - * {@inheritDoc} - */ @Override public void visit(StateFieldPathExpression expression) { @@ -1118,41 +914,26 @@ public void visit(StateFieldPathExpression expression) { } } - /** - * {@inheritDoc} - */ @Override public void visit(StringLiteral expression) { resolver = buildClassResolver(String.class); } - /** - * {@inheritDoc} - */ @Override public void visit(SubExpression expression) { expression.getExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(SubstringExpression expression) { resolver = buildClassResolver(String.class); } - /** - * {@inheritDoc} - */ @Override public void visit(SubtractionExpression expression) { visitArithmeticExpression(expression); } - /** - * {@inheritDoc} - */ @Override public void visit(SumFunction expression) { @@ -1164,9 +945,6 @@ public void visit(SumFunction expression) { resolver = new SumFunctionResolver(resolver); } - /** - * {@inheritDoc} - */ @Override public void visit(TreatExpression expression) { @@ -1183,65 +961,41 @@ public void visit(TreatExpression expression) { resolver = new TreatResolver(resolver, entityTypeName); } - /** - * {@inheritDoc} - */ @Override public void visit(TrimExpression expression) { resolver = buildClassResolver(String.class); } - /** - * {@inheritDoc} - */ @Override public void visit(TypeExpression expression) { expression.getExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(UnknownExpression expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateClause expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateItem expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(UpdateStatement expression) { resolver = buildClassResolver(Object.class); } - /** - * {@inheritDoc} - */ @Override public void visit(UpperExpression expression) { resolver = buildClassResolver(String.class); } - /** - * {@inheritDoc} - */ @Override public void visit(ValueExpression expression) { @@ -1253,17 +1007,11 @@ public void visit(ValueExpression expression) { resolver = new ValueResolver(resolver); } - /** - * {@inheritDoc} - */ @Override public void visit(WhenClause expression) { expression.getThenExpression().accept(this); } - /** - * {@inheritDoc} - */ @Override public void visit(WhereClause expression) { expression.getConditionalExpression().accept(this); @@ -1346,9 +1094,6 @@ public CollectionExpressionVisitor() { super(); } - /** - * {@inheritDoc} - */ @Override public void visit(CollectionExpression expression) { this.expression = expression; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/StateFieldResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/StateFieldResolver.java index d32f8de89ff..b5facdc8d8d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/StateFieldResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/StateFieldResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -41,17 +41,11 @@ public StateFieldResolver(Resolver parent, String path) { super(parent, path); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { return getTypeHelper().convertPrimitive(super.buildType()); } - /** - * {@inheritDoc} - */ @Override protected IManagedType resolveManagedType(IMapping mapping) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryDeclaration.java index 2e95b8558ca..8f84ee3d7f7 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryDeclaration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -32,9 +32,6 @@ public SubqueryDeclaration() { super(); } - /** - * {@inheritDoc} - */ @Override public Type getType() { return Type.SUBQUERY; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryEntityResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryEntityResolver.java index eb848bee487..e6f6716cb2e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryEntityResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SubqueryEntityResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -90,18 +90,12 @@ public SubqueryEntityResolver(Resolver parent, this.entityName = abstractSchemaName.getText(); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { IManagedType entity = getManagedType(); return (entity != null) ? entity.getType() : getTypeHelper().objectType(); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getType().getTypeDeclaration(); @@ -116,9 +110,6 @@ public String getAbstractSchemaName() { return entityName; } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType() { @@ -136,9 +127,6 @@ public IManagedType getManagedType() { return managedType; } - /** - * {@inheritDoc} - */ @Override public IMapping getMapping() { @@ -194,9 +182,6 @@ protected Resolver resolveDerivePathResolver() { return derivedPathResolver; } - /** - * {@inheritDoc} - */ @Override public String toString() { return entityName; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SumFunctionResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SumFunctionResolver.java index b87189c9853..8ece1c4dd98 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SumFunctionResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/SumFunctionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -37,9 +37,6 @@ public SumFunctionResolver(Resolver parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { @@ -74,9 +71,6 @@ protected IType buildType() { return helper.objectType(); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getParentTypeDeclaration(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TableDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TableDeclaration.java index 0710bae9926..49a15e6789f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TableDeclaration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TableDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -42,9 +42,6 @@ public String getTableName() { return ExpressionTools.unquote(rootPath); } - /** - * {@inheritDoc} - */ @Override public Type getType() { return Type.TABLE; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TreatResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TreatResolver.java index 77ac85e7709..7b2a091ba1d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TreatResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/TreatResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -44,9 +44,6 @@ public TreatResolver(Resolver parent, String entityTypeName) { this.entityTypeName = entityTypeName; } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { IManagedType managedType = getManagedType(); @@ -65,26 +62,17 @@ public String getEntityTypeName() { return entityTypeName; } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType() { return getProvider().getEntityNamed(entityTypeName); } - /** - * {@inheritDoc} - */ @Override public void setNullAllowed(boolean nullAllowed) { super.setNullAllowed(nullAllowed); getParent().setNullAllowed(nullAllowed); } - /** - * {@inheritDoc} - */ @Override public String toString() { return "TREAT(" + getParent() + ") AS " + entityTypeName; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/UnknownDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/UnknownDeclaration.java index 4c3e8d59c6f..12ae14695ef 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/UnknownDeclaration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/UnknownDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -32,9 +32,6 @@ public UnknownDeclaration() { super(); } - /** - * {@inheritDoc} - */ @Override public Type getType() { return Type.UNKNOWN; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ValueResolver.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ValueResolver.java index 78f025e59d2..220f02db371 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ValueResolver.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/resolver/ValueResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -42,9 +42,6 @@ public ValueResolver(Resolver parent) { super(parent); } - /** - * {@inheritDoc} - */ @Override protected IType buildType() { @@ -61,25 +58,16 @@ protected IType buildType() { return getTypeHelper().objectType(); } - /** - * {@inheritDoc} - */ @Override protected ITypeDeclaration buildTypeDeclaration() { return getParentTypeDeclaration(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType() { return getProvider().getManagedType(getType()); } - /** - * {@inheritDoc} - */ @Override public String toString() { return "VALUE(" + getParent() + ")"; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/AndFilter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/AndFilter.java index e2d907108cd..4bffa01ef5b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/AndFilter.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/AndFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -76,25 +76,16 @@ public static Filter and(Filter... filters) { return filter; } - /** - * {@inheritDoc} - */ @Override public boolean accept(T value) { return filter1.accept(value) && filter2.accept(value); } - /** - * {@inheritDoc} - */ @Override public AndFilter clone() { return (AndFilter) super.clone(); } - /** - * {@inheritDoc} - */ @Override protected String operatorString() { return "AND"; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/CompoundFilter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/CompoundFilter.java index 896d5f7a881..12fd283c5ec 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/CompoundFilter.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/filter/CompoundFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -75,9 +75,6 @@ private void checkFilter2(Filter filter) { } } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public CompoundFilter clone() { @@ -89,9 +86,6 @@ public CompoundFilter clone() { } } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object object) { if (!(object instanceof CompoundFilter)) { @@ -122,9 +116,6 @@ public Filter getFilter2() { return filter2; } - /** - * {@inheritDoc} - */ @Override public int hashCode() { return filter1.hashCode() ^ filter2.hashCode(); @@ -137,9 +128,6 @@ public int hashCode() { */ protected abstract String operatorString(); - /** - * {@inheritDoc} - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/EmptyIterable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/EmptyIterable.java index d25943dfd92..0823380cf53 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/EmptyIterable.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/EmptyIterable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -62,9 +62,6 @@ public static Iterable instance() { return (Iterable) INSTANCE; } - /** - * {@inheritDoc} - */ @Override public Iterator iterator() { return EmptyIterator.instance(); @@ -75,9 +72,6 @@ private Object readResolve() { return INSTANCE; } - /** - * {@inheritDoc} - */ @Override public String toString() { return "[]"; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/SingleElementListIterable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/SingleElementListIterable.java index dfbcf2ee734..c4910dd1628 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/SingleElementListIterable.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterable/SingleElementListIterable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -51,17 +51,11 @@ public SingleElementListIterable(E element) { this.element = element; } - /** - * {@inheritDoc} - */ @Override public ListIterator iterator() { return new SingleElementListIterator(this.element); } - /** - * {@inheritDoc} - */ @Override public String toString() { return "[" + this.element + "]"; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/EmptyIterator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/EmptyIterator.java index aab418048ed..d89c5536e2b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/EmptyIterator.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/EmptyIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -49,33 +49,21 @@ public static synchronized Iterator instance() { return (Iterator) INSTANCE; } - /** - * {@inheritDoc} - */ @Override public boolean hasNext() { return false; } - /** - * {@inheritDoc} - */ @Override public Object next() { throw new NoSuchElementException("A NullIterator is read-only."); } - /** - * {@inheritDoc} - */ @Override public void remove() { throw new UnsupportedOperationException("A NullIterator is read-only."); } - /** - * {@inheritDoc} - */ @Override public String toString() { return getClass().getSimpleName(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/SingleElementListIterator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/SingleElementListIterator.java index af01b1d1a38..509655d61d8 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/SingleElementListIterator.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/tools/utility/iterator/SingleElementListIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -57,40 +57,25 @@ public SingleElementListIterator(E element) { this.element = element; } - /** - * {@inheritDoc} - */ @Override public void add(E item) { throw new UnsupportedOperationException("This SingleElementListIterator is read-only."); } - /** - * {@inheritDoc} - */ @Override public boolean hasNext() { return next == element; } - /** - * {@inheritDoc} - */ @Override public boolean hasPrevious() { return next == END; } - /** - * {@inheritDoc} - */ public ListIterator iterator() { return this; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public E next() { @@ -103,17 +88,11 @@ public E next() { return element; } - /** - * {@inheritDoc} - */ @Override public int nextIndex() { return (next == element) ? 0 : 1; } - /** - * {@inheritDoc} - */ @Override public E previous() { @@ -125,25 +104,16 @@ public E previous() { return element; } - /** - * {@inheritDoc} - */ @Override public int previousIndex() { return (next == END) ? 0 : -1; } - /** - * {@inheritDoc} - */ @Override public void remove() { throw new UnsupportedOperationException("This SingleElementListIterator is read-only."); } - /** - * {@inheritDoc} - */ @Override public void set(E item) { throw new UnsupportedOperationException("This SingleElementListIterator is read-only."); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/filter/NullFilter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/filter/NullFilter.java index 281398da857..aed0d5567ef 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/filter/NullFilter.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/filter/NullFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -47,17 +47,11 @@ public static Filter instance() { return (Filter) INSTANCE; } - /** - * {@inheritDoc} - */ @Override public boolean accept(Object value) { return true; } - /** - * {@inheritDoc} - */ @Override public String toString() { return getClass().getSimpleName(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterable/ListIterable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterable/ListIterable.java index 65940cd558f..33f46ff9196 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterable/ListIterable.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterable/ListIterable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -26,9 +26,6 @@ */ public interface ListIterable extends Iterable { - /** - * {@inheritDoc} - */ @Override ListIterator iterator(); } diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterator/ArrayIterator.java b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterator/ArrayIterator.java index e33e2e8839f..255b363834e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterator/ArrayIterator.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/main/java/org/eclipse/persistence/jpa/jpql/utility/iterator/ArrayIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -77,17 +77,11 @@ public ArrayIterator(T[] array, int start, int length) { this.maxIndex = start + length; } - /** - * {@inheritDoc} - */ @Override public boolean hasNext() { return nextIndex < maxIndex; } - /** - * {@inheritDoc} - */ @Override public E next() { @@ -98,17 +92,11 @@ public E next() { throw new NoSuchElementException("No more elements can be retrieved."); } - /** - * {@inheritDoc} - */ @Override public void remove() { throw new UnsupportedOperationException("An ArrayIterator is read-only."); } - /** - * {@inheritDoc} - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractValidatorTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractValidatorTest.java index f3cb1e492bf..031b411e2f3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractValidatorTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/AbstractValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -122,9 +122,6 @@ private ResourceBundle loadResourceBundle() { return ResourceBundle.getBundle(JPQLQueryProblemResourceBundle.class.getName()); } - /** - * {@inheritDoc} - */ @Override protected void setUpClass() throws Exception { super.setUpClass(); @@ -137,9 +134,6 @@ protected void setUpClass() throws Exception { validator = buildValidator(); } - /** - * {@inheritDoc} - */ @Override protected void tearDown() throws Exception { if (validator != null) { @@ -148,9 +142,6 @@ protected void tearDown() throws Exception { super.tearDown(); } - /** - * {@inheritDoc} - */ @Override protected void tearDownClass() throws Exception { jpqlGrammar = null; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/DefaultJavaJPQLQueryTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/DefaultJavaJPQLQueryTestHelper.java index 37fc00018be..92b37f1bb8d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/DefaultJavaJPQLQueryTestHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/DefaultJavaJPQLQueryTestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -26,9 +26,6 @@ */ public final class DefaultJavaJPQLQueryTestHelper extends JavaJPQLQueryTestHelper { - /** - * {@inheritDoc} - */ @Override protected IMappingBuilder buildMappingBuilder() { return new JavaMappingBuilder(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest.java index f93ddf1ae6f..776500f8146 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -34,25 +34,16 @@ @SuppressWarnings("nls") public class EclipseLinkGrammarValidatorTest extends AbstractGrammarValidatorTest { - /** - * {@inheritDoc} - */ @Override protected AbstractGrammarValidator buildValidator() { return new EclipseLinkGrammarValidator(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { return EclipseLinkVersionTools.isNewerThanOrEqual2_4(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected boolean isSubqueryAllowedAnywhere() { return EclipseLinkVersionTools.isNewerThanOrEqual2_4(jpqlGrammar); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_4.java index 8eae0b71c07..2335e4db247 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_4.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_4.java @@ -85,17 +85,11 @@ public String format(String query) { }; } - /** - * {@inheritDoc} - */ @Override protected AbstractGrammarValidator buildValidator() { return new EclipseLinkGrammarValidator(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { return true; @@ -106,9 +100,6 @@ protected boolean isNewerThanOrEqual(EclipseLinkVersion version) { return currentVersion.isNewerThanOrEqual(version); } - /** - * {@inheritDoc} - */ @Override protected boolean isSubqueryAllowedAnywhere() { return isNewerThanOrEqual(EclipseLinkVersion.VERSION_2_4); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_5.java index c9ba21a115b..e5497aff1df 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_5.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkGrammarValidatorTest2_5.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,17 +36,11 @@ @SuppressWarnings("nls") public final class EclipseLinkGrammarValidatorTest2_5 extends AbstractGrammarValidatorTest { - /** - * {@inheritDoc} - */ @Override protected AbstractGrammarValidator buildValidator() { return new EclipseLinkGrammarValidator(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { return true; @@ -57,9 +51,6 @@ protected boolean isNewerThanOrEqual(EclipseLinkVersion version) { return currentVersion.isNewerThanOrEqual(version); } - /** - * {@inheritDoc} - */ @Override protected boolean isSubqueryAllowedAnywhere() { return isNewerThanOrEqual(EclipseLinkVersion.VERSION_2_4); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkJavaJPQLQueryTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkJavaJPQLQueryTestHelper.java index 83a6c88653b..5a86185b8c3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkJavaJPQLQueryTestHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkJavaJPQLQueryTestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -26,9 +26,6 @@ */ public final class EclipseLinkJavaJPQLQueryTestHelper extends JavaJPQLQueryTestHelper { - /** - * {@inheritDoc} - */ @Override protected IMappingBuilder buildMappingBuilder() { return new EclipseLinkMappingBuilder(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorExtensionTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorExtensionTest2_4.java index 7adbbae8b8e..62968eba4fa 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorExtensionTest2_4.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorExtensionTest2_4.java @@ -38,9 +38,6 @@ @SuppressWarnings("nls") public final class EclipseLinkSemanticValidatorExtensionTest2_4 extends AbstractSemanticValidatorTest { - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildQueryContext() { return new EclipseLinkJPQLQueryContext(jpqlGrammar); @@ -66,9 +63,6 @@ public boolean tableExists(String tableName) { }; } - /** - * {@inheritDoc} - */ @Override protected AbstractSemanticValidator buildValidator() { return new EclipseLinkSemanticValidator( @@ -99,17 +93,11 @@ else if ("ADDRESS".equals(tableName)) { return columnNames; } - /** - * {@inheritDoc} - */ @Override protected boolean isComparisonTypeChecked() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean isPathExpressionToCollectionMappingAllowed() { return true; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest.java index 4c50ff89184..32d57ef5c8a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest.java @@ -47,9 +47,6 @@ public String format(String query) { }; } - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildQueryContext() { return new EclipseLinkJPQLQueryContext(jpqlGrammar); @@ -59,9 +56,6 @@ protected EclipseLinkSemanticValidatorExtension buildSemanticExtension() { return EclipseLinkSemanticValidatorExtension.NULL_EXTENSION; } - /** - * {@inheritDoc} - */ @Override protected AbstractSemanticValidator buildValidator() { return new EclipseLinkSemanticValidator( @@ -70,17 +64,11 @@ protected AbstractSemanticValidator buildValidator() { ); } - /** - * {@inheritDoc} - */ @Override protected boolean isComparisonTypeChecked() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean isPathExpressionToCollectionMappingAllowed() { return true; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_4.java index b3fefad4e0b..1d544e2835a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_4.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_4.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -37,17 +37,11 @@ @SuppressWarnings("nls") public final class EclipseLinkSemanticValidatorTest2_4 extends AbstractSemanticValidatorTest { - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildQueryContext() { return new EclipseLinkJPQLQueryContext(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected AbstractSemanticValidator buildValidator() { return new EclipseLinkSemanticValidator( @@ -56,17 +50,11 @@ protected AbstractSemanticValidator buildValidator() { ); } - /** - * {@inheritDoc} - */ @Override protected boolean isComparisonTypeChecked() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean isPathExpressionToCollectionMappingAllowed() { return true; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_5.java index 36f58b1aa6b..a8dadb87d79 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_5.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/EclipseLinkSemanticValidatorTest2_5.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -37,9 +37,6 @@ @SuppressWarnings("nls") public class EclipseLinkSemanticValidatorTest2_5 extends AbstractSemanticValidatorTest { - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildQueryContext() { return new EclipseLinkJPQLQueryContext(jpqlGrammar); @@ -49,9 +46,6 @@ protected EclipseLinkSemanticValidatorExtension buildSemanticExtension() { return EclipseLinkSemanticValidatorExtension.NULL_EXTENSION; } - /** - * {@inheritDoc} - */ @Override protected AbstractSemanticValidator buildValidator() { return new EclipseLinkSemanticValidator( @@ -60,17 +54,11 @@ protected AbstractSemanticValidator buildValidator() { ); } - /** - * {@inheritDoc} - */ @Override protected boolean isComparisonTypeChecked() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean isPathExpressionToCollectionMappingAllowed() { return true; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLCoreTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLCoreTest.java index 022e8baa944..f191214e84d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLCoreTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLCoreTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -72,9 +72,6 @@ protected JPQLQueryTestHelper getQueryTestHelper() { return jpqlQueryTestHelper; } - /** - * {@inheritDoc} - */ @Override protected void setUp() throws Exception { super.setUp(); @@ -83,9 +80,6 @@ protected void setUp() throws Exception { } } - /** - * {@inheritDoc} - */ @Override protected void setUpClass() throws Exception { super.setUpClass(); @@ -94,9 +88,6 @@ protected void setUpClass() throws Exception { } } - /** - * {@inheritDoc} - */ @Override protected void tearDown() throws Exception { super.tearDown(); @@ -105,9 +96,6 @@ protected void tearDown() throws Exception { } } - /** - * {@inheritDoc} - */ @Override protected void tearDownClass() throws Exception { super.tearDownClass(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryHelperTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryHelperTestHelper.java index bfa3b6bb609..255e26f0a9b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryHelperTestHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryHelperTestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -25,7 +25,6 @@ * This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql. * AbstractJPQLQueryHelper AbstractJPQLQueryHelper} into the unit-test before it is run. It allows * using multiple instances and the unit-tests are run with each of them separately. - *

*

    *
  • Method in a test suite: Request the concrete instances that will be injected into the * unit-tests before they are run.
    • diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryTestHelperTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryTestHelperTestHelper.java index 2b7d9c77df8..1b17c881ba0 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryTestHelperTestHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLQueryTestHelperTestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -25,7 +25,6 @@ * This annotation is used to inject a concrete instance of {@link JPQLQueryTestHelper} into the * unit-test before it is run. It allows using multiple instances and the unit-tests are run with * each of them separately. - *

    *

      *
    • Method in a test suite: Request the concrete instances that will be injected into the * unit-tests before they are run.
      • diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLTestRunner.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLTestRunner.java index 5354364bb4a..685b7d53e77 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLTestRunner.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JPQLTestRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -125,7 +125,7 @@ public JPQLTestRunner(Class testClass) throws InitializationError { * Creates a new JPQLTestRunner. * * @param testClass The class that is either a test suite or a unit-tests - * @param suiteHelper The parent {@link SuiteHelper} or {@link null} if none was defined yet + * @param suiteHelper The parent {@link SuiteHelper} or {@code null} if none was defined yet * @throws InitializationError If the given test class is malformed */ public JPQLTestRunner(Class testClass, SuiteHelper suiteHelper) throws InitializationError { @@ -253,7 +253,7 @@ private Runner buildRunner(Class testClass, SuiteHelper suiteHelper) { } // Create the default runner - return new AllDefaultPossibilitiesBuilder(true).runnerForClass(testClass); + return new AllDefaultPossibilitiesBuilder().runnerForClass(testClass); } catch (Throwable e) { return new ErrorReportingRunner(testClass, e); @@ -326,18 +326,12 @@ else if (multipleHelpers.size() == 1) { return suiteHelpers; } - /** - * {@inheritDoc} - */ @Override protected void collectInitializationErrors(List errors) { super.collectInitializationErrors(errors); initializeDescriptionHelper(errors); } - /** - * {@inheritDoc} - */ @Override protected Description describeChild(Runner child) { return child.getDescription(); @@ -358,9 +352,6 @@ private SuiteClasses findSuiteClasses(Class testClass) { return findSuiteClasses(testClass.getSuperclass()); } - /** - * {@inheritDoc} - */ @Override protected List getChildren() { // Cache the Description since JUnit always recreate it, this will increase performance @@ -370,9 +361,6 @@ protected List getChildren() { return runners; } - /** - * {@inheritDoc} - */ @Override public Description getDescription() { // Cache the Description since JUnit always recreate it, this will increase performance @@ -382,9 +370,6 @@ public Description getDescription() { return description; } - /** - * {@inheritDoc} - */ @Override protected String getName() { // Cache the Description since JUnit always recreate it, this will increase performance and @@ -445,9 +430,6 @@ private Collection> retrieveMultipleHelpers() { return keys; } - /** - * {@inheritDoc} - */ @Override protected void runChild(Runner child, RunNotifier notifier) { child.run(notifier); @@ -525,9 +507,6 @@ public int compare(FrameworkMethod method1, FrameworkMethod method2) { }; } - /** - * {@inheritDoc} - */ @Override protected Statement classBlock(RunNotifier notifier) { Statement statement = new CreateTestStatement(); @@ -537,9 +516,6 @@ protected Statement classBlock(RunNotifier notifier) { return statement; } - /** - * {@inheritDoc} - */ @Override protected Object createTest() throws Exception { return test; @@ -552,9 +528,6 @@ protected List getChildren() { return methods; } - /** - * {@inheritDoc} - */ @Override public Description getDescription() { if (description == null) { @@ -576,9 +549,6 @@ private void instantiateTest() throws Throwable { } } - /** - * {@inheritDoc} - */ @Override protected Statement methodBlock(FrameworkMethod method) { Statement statement = new SetUpStatement(); @@ -587,18 +557,12 @@ protected Statement methodBlock(FrameworkMethod method) { return statement; } - /** - * {@inheritDoc} - */ @Override protected Statement methodInvoker(FrameworkMethod method, Object test) { this.test = (JPQLBasicTest) test; return super.methodInvoker(method, test); } - /** - * {@inheritDoc} - */ @Override protected String testName(FrameworkMethod method) { @@ -631,9 +595,7 @@ private class CompositeStatement extends Statement { this.statement2 = statement2; } - /** - * {@inheritDoc} - */ + @Override public void evaluate() throws Throwable { statement1.evaluate(); @@ -665,9 +627,7 @@ private class SetUpClassStatement extends Statement { this.statement = statement; } - /** - * {@inheritDoc} - */ + @Override public void evaluate() throws Throwable { statement.evaluate(); @@ -699,9 +659,7 @@ private class TearDownClassStatement extends Statement { this.statement = statement; } - /** - * {@inheritDoc} - */ + @Override public void evaluate() throws Throwable { try { @@ -728,9 +686,7 @@ private class TearDownStatement extends Statement { this.statement = statement; } - /** - * {@inheritDoc} - */ + @Override public void evaluate() throws Throwable { try { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaJPQLQueryTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaJPQLQueryTestHelper.java index 0af26bf8813..c0fb40abc8a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaJPQLQueryTestHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaJPQLQueryTestHelper.java @@ -60,13 +60,10 @@ public abstract class JavaJPQLQueryTestHelper implements JPQLQueryTestHelper { /** * Creates * - * @return + * @return mapping builder */ protected abstract IMappingBuilder buildMappingBuilder(); - /** - * {@inheritDoc} - */ @Override public IORMConfiguration getORMConfiguration(String ormXmlFileName) throws Exception { @@ -84,9 +81,6 @@ public IORMConfiguration getORMConfiguration(String ormXmlFileName) throws Excep return ormConfiguration; } - /** - * {@inheritDoc} - */ @Override public IManagedTypeProvider getPersistenceUnit() throws Exception { if (persistenceUnit == null) { @@ -116,30 +110,18 @@ private void initializeManagedTypeProvider() { persistenceUnit.addEmbeddable(ZipCode.class); } - /** - * {@inheritDoc} - */ @Override public void setUp() throws Exception { } - /** - * {@inheritDoc} - */ @Override public void setUpBefore() throws Exception { } - /** - * {@inheritDoc} - */ @Override public void tearDown() throws Exception { } - /** - * {@inheritDoc} - */ @Override public void tearDownAfter() throws Exception { } diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java index aa6d3627870..d1e003f2c56 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/JavaORMConfiguration.java @@ -80,45 +80,30 @@ protected String buildLocation() throws Exception { return url.toURI().toString(); } - /** - * {@inheritDoc} - */ @Override public Iterable entities() { populate(); return super.entities(); } - /** - * {@inheritDoc} - */ @Override public IEntity getEntity(String entityName) { populate(); return super.getEntity(entityName); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(IType type) { populate(); return super.getManagedType(type); } - /** - * {@inheritDoc} - */ @Override public IQuery getNamedQuery(String queryName) { populate(); return queries.get(queryName); } - /** - * {@inheritDoc} - */ @Override public Iterable managedTypes() { populate(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ORMJPQLQueryHelperTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ORMJPQLQueryHelperTest.java index 1f86812afb1..62634880164 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ORMJPQLQueryHelperTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/ORMJPQLQueryHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -32,9 +32,6 @@ @RunWith(JPQLTestRunner.class) public final class ORMJPQLQueryHelperTest extends AbstractJPQLQueryHelperTest { - /** - * {@inheritDoc} - */ @Override protected IQuery namedQuery(String entityName, String queryName) throws Exception { IORMConfiguration ormConfiguration = getORMConfiguration("orm2.xml"); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLGrammarTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLGrammarTestHelper.java index 131f2c95121..642d957907d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLGrammarTestHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLGrammarTestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -22,10 +22,9 @@ import java.lang.annotation.Target; /** - * This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql. - * parser.JPQLGrammar JPQLGrammar} into the unit-test before it is run. It allows using multiple + * This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar + * JPQLGrammar} into the unit-test before it is run. It allows using multiple * instances and the unit-tests are run with each of them separately. - *

      *

        *
      • Method in a test suite: Request the concrete instances that will be injected into the * unit-tests before they are run.
        • diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLParserTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLParserTest.java index 4c77266d6b8..8435bd53ca2 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLParserTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLParserTest.java @@ -203,7 +203,6 @@ protected void testInvalidQuery(String jpqlQuery, ExpressionTester expressionTes * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query * @param jpqlGrammar The {@link JPQLGrammar} used to determine how to parse the JPQL query - * @param formatter This formatter is used to personalized the formatting of the JPQL query * before it is used to test the generated string */ protected void testInvalidQuery(String jpqlQuery, @@ -241,7 +240,7 @@ protected void testInvalidQuery(String jpqlQuery, * @param jpqlQuery The JPQL query to parse and to test the parsed tree representation * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query - * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. + * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. * JPQLQueryBNF JPQLQueryBNF} */ protected void testInvalidQuery(String jpqlQuery, @@ -260,7 +259,7 @@ protected void testInvalidQuery(String jpqlQuery, * @param jpqlQuery The JPQL query to parse and to test the parsed tree representation * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query - * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. + * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. * JPQLQueryBNF JPQLQueryBNF} * @param formatter This formatter is used to personalized the formatting of the JPQL query * before it is used to test the generated string @@ -352,7 +351,7 @@ protected void testQuery(String jpqlQuery, * @param jpqlQuery The JPQL query to parse and to test the parsed tree representation * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query - * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. + * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. * JPQLQueryBNF JPQLQueryBNF} * @param formatter This formatter is used to personalized the formatting of the JPQL query * before it is used to test the generated string @@ -375,7 +374,7 @@ protected void testQuery(String jpqlQuery, * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query * @param jpqlGrammar The {@link JPQLGrammar} used to determine how to parse the JPQL query - * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. + * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. * JPQLQueryBNF JPQLQueryBNF} * @param formatter This formatter is used to personalized the formatting of the JPQL query * before it is used to test the generated string @@ -433,8 +432,7 @@ protected void testQuery(String jpqlQuery, * @param jpqlQuery The JPQL query to parse and to test the parsed tree representation * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query - * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. - * JPQLQueryBNF JPQLQueryBNF} + * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.JPQLQueryBNF JPQLQueryBNF} */ protected void testQuery(String jpqlQuery, ExpressionTester expressionTester, @@ -456,8 +454,7 @@ protected void testQuery(String jpqlQuery, * @param jpqlQuery The JPQL query to parse and to test the parsed tree representation * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query - * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. - * JPQLQueryBNF JPQLQueryBNF} + * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser.JPQLQueryBNF JPQLQueryBNF} * @param formatter This formatter is used to personalized the formatting of the JPQL query * before it is used to test the generated string */ @@ -477,7 +474,7 @@ protected void testQuery(String jpqlQuery, * @param jpqlQuery The JPQL query to parse and to test the parsed tree representation * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query - * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. + * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. * JPQLQueryBNF JPQLQueryBNF} * @param formatter This formatter is used to personalized the formatting of the JPQL query * before it is used to test the generated string @@ -535,7 +532,7 @@ protected void testValidQuery(String jpqlQuery, * @param jpqlQuery The JPQL query to parse and to test the parsed tree representation * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query - * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. + * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. * JPQLQueryBNF JPQLQueryBNF} */ protected void testValidQuery(String jpqlQuery, @@ -554,7 +551,7 @@ protected void testValidQuery(String jpqlQuery, * @param jpqlQuery The JPQL query to parse and to test the parsed tree representation * @param expressionTester The tester used to verify the parsed tree is correctly representing the * JPQL query - * @param queryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. + * @param jpqlQueryBNFId The unique identifier of the {@link org.eclipse.persistence.jpa.jpql.parser. * JPQLQueryBNF JPQLQueryBNF} * @param formatter This formatter is used to personalized the formatting of the JPQL query * before it is used to test the generated string diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBNFAccessor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBNFAccessor.java index 859577af6ca..0d7195db3ef 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBNFAccessor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryBNFAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -62,7 +62,7 @@ public class JPQLQueryBNFAccessor { /** * Creates a new JPQLQueryBNFAccessor. * - * @param registry + * @param registry registry */ public JPQLQueryBNFAccessor(ExpressionRegistry registry) { super(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryStringFormatter.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryStringFormatter.java index b0dd264202e..563e5cf4389 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryStringFormatter.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/parser/JPQLQueryStringFormatter.java @@ -32,9 +32,6 @@ public interface JPQLQueryStringFormatter { */ public static JPQLQueryStringFormatter DEFAULT = new JPQLQueryStringFormatter() { - /** - * {@inheritDoc} - */ @Override public String format(String query) { return query; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/AbstractSemanticValidatorTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/AbstractSemanticValidatorTest.java index 2fff91fb1c0..8eb7539c793 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/AbstractSemanticValidatorTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/AbstractSemanticValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -77,9 +77,6 @@ protected SemanticValidatorHelper buildSemanticValidatorHelper() { return new GenericSemanticValidatorHelper(queryContext); } - /** - * {@inheritDoc} - */ @Override protected abstract AbstractSemanticValidator buildValidator(); @@ -87,9 +84,6 @@ protected final JPQLQueryContext getQueryContext() { return queryContext; } - /** - * {@inheritDoc} - */ @Override protected AbstractSemanticValidator getValidator() { return (AbstractSemanticValidator) super.getValidator(); @@ -99,27 +93,18 @@ protected AbstractSemanticValidator getValidator() { protected abstract boolean isPathExpressionToCollectionMappingAllowed(); - /** - * {@inheritDoc} - */ @Override protected void setUpClass() throws Exception { queryContext = buildQueryContext(); super.setUpClass(); } - /** - * {@inheritDoc} - */ @Override protected void tearDown() throws Exception { queryContext.dispose(); super.tearDown(); } - /** - * {@inheritDoc} - */ @Override protected void tearDownClass() throws Exception { queryContext = null; @@ -1838,9 +1823,6 @@ public final void test_ValidQuery_05() throws Exception { testHasNoProblems(problems); } - /** - * {@inheritDoc} - */ @Override protected List validate(String jpqlQuery, JPQLExpression jpqlExpression) throws Exception { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ContentAssistTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ContentAssistTest.java index 6c50a43800c..181b223ea9f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ContentAssistTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ContentAssistTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -428,9 +428,6 @@ else if (mappingType == MappingType.SINGLE_VALUED_OBJECT_FIELD) { return names; } - /** - * {@inheritDoc} - */ @Override protected void setUpClass() throws Exception { super.setUpClass(); @@ -468,9 +465,6 @@ protected List tableNames() { return tableNames; } - /** - * {@inheritDoc} - */ @Override protected void tearDown() throws Exception { queryHelper.dispose(); @@ -478,9 +472,6 @@ protected void tearDown() throws Exception { super.tearDown(); } - /** - * {@inheritDoc} - */ @Override protected void tearDownClass() throws Exception { bnfAccessor = null; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DeclarationTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DeclarationTest.java index 9dcb00cda49..3bd65e1b245 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DeclarationTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DeclarationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -186,27 +186,18 @@ protected final RangeDeclarationTester rangeDeclarationWithJoins(String entityNa return rangeDeclaration(entityName, variableName, null, joins); } - /** - * {@inheritDoc} - */ @Override protected void setUpClass() throws Exception { super.setUpClass(); virtualQuery = new JavaQuery(getPersistenceUnit(), null); } - /** - * {@inheritDoc} - */ @Override protected void tearDown() throws Exception { super.tearDown(); virtualQuery.setExpression(null); } - /** - * {@inheritDoc} - */ @Override protected void tearDownClass() throws Exception { virtualQuery = null; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistExtensionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistExtensionTest.java index ece2aa8df54..777b04353a3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistExtensionTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistExtensionTest.java @@ -31,17 +31,11 @@ @UniqueSignature public final class DefaultContentAssistExtensionTest extends AbstractContentAssistExtensionTest { - /** - * {@inheritDoc} - */ @Override protected Class acceptableType(String identifier) { return defaultAcceptableType(identifier); } - /** - * {@inheritDoc} - */ @Override protected ContentAssistExtension buildContentAssistExtension() { return new ContentAssistExtension() { @@ -63,33 +57,21 @@ public Iterable tableNames(String prefix) { }; } - /** - * {@inheritDoc} - */ @Override protected List classNames() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List columnNames(String tableName) { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List enumTypes() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List tableNames() { return Collections.emptyList(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistTest.java index 484e8448e37..e287cac26e8 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultContentAssistTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -30,57 +30,36 @@ @UniqueSignature public final class DefaultContentAssistTest extends AbstractContentAssistTest { - /** - * {@inheritDoc} - */ @Override protected Class acceptableType(String identifier) { return defaultAcceptableType(identifier); } - /** - * {@inheritDoc} - */ @Override protected List classNames() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List columnNames(String tableName) { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List enumConstants() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List enumTypes() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { return false; } - /** - * {@inheritDoc} - */ @Override protected List tableNames() { return Collections.emptyList(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultDefaultContentAssistExtensionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultDefaultContentAssistExtensionTest.java index 1184120bf57..bf1c179545f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultDefaultContentAssistExtensionTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultDefaultContentAssistExtensionTest.java @@ -29,17 +29,11 @@ @UniqueSignature public final class DefaultDefaultContentAssistExtensionTest extends AbstractContentAssistTest { - /** - * {@inheritDoc} - */ @Override protected Class acceptableType(String identifier) { return defaultAcceptableType(identifier); } - /** - * {@inheritDoc} - */ @Override protected ContentAssistExtension buildContentAssistExtension() { return new ContentAssistExtension() { @@ -61,49 +55,31 @@ public Iterable tableNames(String prefix) { }; } - /** - * {@inheritDoc} - */ @Override protected List classNames() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List columnNames(String tableName) { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List enumConstants() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List enumTypes() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { return false; } - /** - * {@inheritDoc} - */ @Override protected List tableNames() { return Collections.emptyList(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_0.java index 31355bb9c44..bc087e4595a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_0.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_0.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -35,25 +35,16 @@ @SuppressWarnings("nls") public final class DefaultGrammarValidatorTest2_0 extends AbstractGrammarValidatorTest { - /** - * {@inheritDoc} - */ @Override protected AbstractGrammarValidator buildValidator() { return new DefaultGrammarValidator(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean isSubqueryAllowedAnywhere() { return jpqlGrammar.getJPAVersion().isNewerThanOrEqual(JPAVersion.VERSION_2_1); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_1.java index 6084e8f8393..052edb69561 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_1.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultGrammarValidatorTest2_1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -34,17 +34,11 @@ @SuppressWarnings("nls") public class DefaultGrammarValidatorTest2_1 extends AbstractGrammarValidatorTest { - /** - * {@inheritDoc} - */ @Override protected AbstractGrammarValidator buildValidator() { return new DefaultGrammarValidator(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { return false; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest.java index 04017fc64ea..9f1177373eb 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -38,9 +38,6 @@ protected IEntity entity(String entityName) throws Exception { return entity; } - /** - * {@inheritDoc} - */ @Override protected IQuery namedQuery(String entityName, String queryName) throws Exception { IEntity entity = entity(entityName); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest2_1.java index ff27883d102..28ece89f55c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest2_1.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultJPQLQueryHelperTest2_1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -39,9 +39,6 @@ protected IEntity entity(String entityName) throws Exception { return entity; } - /** - * {@inheritDoc} - */ @Override protected IQuery namedQuery(String entityName, String queryName) throws Exception { IEntity entity = entity(entityName); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_0.java index fdd43ece3bc..e44c8834f60 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_0.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_0.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -35,33 +35,21 @@ @SuppressWarnings("nls") public final class DefaultSemanticValidatorTest2_0 extends AbstractSemanticValidatorTest { - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildQueryContext() { return new DefaultJPQLQueryContext(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected AbstractSemanticValidator buildValidator() { return new DefaultSemanticValidator(buildSemanticValidatorHelper()); } - /** - * {@inheritDoc} - */ @Override protected boolean isComparisonTypeChecked() { return true; } - /** - * {@inheritDoc} - */ @Override protected boolean isPathExpressionToCollectionMappingAllowed() { return false; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_1.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_1.java index 4bb753b516b..afc5ffba2c5 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_1.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/DefaultSemanticValidatorTest2_1.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -34,33 +34,21 @@ @SuppressWarnings("nls") public final class DefaultSemanticValidatorTest2_1 extends AbstractSemanticValidatorTest { - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildQueryContext() { return new DefaultJPQLQueryContext(jpqlGrammar); } - /** - * {@inheritDoc} - */ @Override protected AbstractSemanticValidator buildValidator() { return new DefaultSemanticValidator(buildSemanticValidatorHelper()); } - /** - * {@inheritDoc} - */ @Override protected boolean isComparisonTypeChecked() { return true; } - /** - * {@inheritDoc} - */ @Override protected boolean isPathExpressionToCollectionMappingAllowed() { return false; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistExtensionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistExtensionTest.java index 4fb0b6d4dd1..35a8a00fc0b 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistExtensionTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistExtensionTest.java @@ -37,9 +37,6 @@ public final class EclipseLinkContentAssistExtensionTest extends AbstractContentAssistExtensionTest { - /** - * {@inheritDoc} - */ @Override protected ContentAssistExtension buildContentAssistExtension() { return new ContentAssistExtension() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_4.java index 4caeed24aa6..6b7926e03bd 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_4.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_4.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,17 +36,11 @@ @SuppressWarnings("nls") public final class EclipseLinkContentAssistTest2_4 extends AbstractContentAssistTest { - /** - * {@inheritDoc} - */ @Override protected List classNames() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List clauses(String afterIdentifier, String beforeIdentifier, boolean subquery) { @@ -141,33 +135,21 @@ else if (afterIdentifier == ORDER_BY) { return proposals; } - /** - * {@inheritDoc} - */ @Override protected List columnNames(String tableName) { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List enumConstants() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List enumTypes() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List fromClauseInternalClauses(String afterIdentifier) { @@ -206,18 +188,12 @@ else if (afterIdentifier == ORDER_SIBLINGS_BY) { return super.fromClauseInternalClauses(afterIdentifier); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { EclipseLinkVersion currentVersion = EclipseLinkVersion.value(getGrammar().getProviderVersion()); return currentVersion.isNewerThanOrEqual(EclipseLinkJPQLGrammar2_4.VERSION); } - /** - * {@inheritDoc} - */ @Override protected List tableNames() { return Collections.emptyList(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_5.java index 633aa67d43e..46191d6addb 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_5.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkContentAssistTest2_5.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,17 +36,11 @@ @SuppressWarnings("nls") public final class EclipseLinkContentAssistTest2_5 extends AbstractContentAssistTest { - /** - * {@inheritDoc} - */ @Override protected List classNames() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List clauses(String afterIdentifier, String beforeIdentifier, boolean subquery) { @@ -141,33 +135,21 @@ else if (afterIdentifier == ORDER_BY) { return proposals; } - /** - * {@inheritDoc} - */ @Override protected List columnNames(String tableName) { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List enumConstants() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List enumTypes() { return Collections.emptyList(); } - /** - * {@inheritDoc} - */ @Override protected List fromClauseInternalClauses(String afterIdentifier) { @@ -206,18 +188,12 @@ else if (afterIdentifier == ORDER_SIBLINGS_BY) { return super.fromClauseInternalClauses(afterIdentifier); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { EclipseLinkVersion currentVersion = EclipseLinkVersion.value(getGrammar().getProviderVersion()); return currentVersion.isNewerThanOrEqual(EclipseLinkJPQLGrammar2_4.VERSION); } - /** - * {@inheritDoc} - */ @Override protected List tableNames() { return Collections.emptyList(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkDeclarationTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkDeclarationTest.java index af4863b4c80..8e907db30bb 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkDeclarationTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkDeclarationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -32,9 +32,6 @@ @SuppressWarnings("nls") public class EclipseLinkDeclarationTest extends DeclarationTest { - /** - * {@inheritDoc} - */ @Override protected JPQLQueryContext buildQueryContext() { return new EclipseLinkJPQLQueryContext(jpqlGrammar); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkEclipseLinkContentAssistExtensionTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkEclipseLinkContentAssistExtensionTest.java index c36592153b3..e250e2e2548 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkEclipseLinkContentAssistExtensionTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkEclipseLinkContentAssistExtensionTest.java @@ -29,9 +29,6 @@ */ public final class EclipseLinkEclipseLinkContentAssistExtensionTest extends AbstractContentAssistTest { - /** - * {@inheritDoc} - */ @Override protected ContentAssistExtension buildContentAssistExtension() { return new ContentAssistExtension() { @@ -53,9 +50,6 @@ public Iterable tableNames(String prefix) { }; } - /** - * {@inheritDoc} - */ @Override protected List clauses(String afterIdentifier, String beforeIdentifier, boolean subquery) { @@ -150,9 +144,6 @@ else if (afterIdentifier == ORDER_BY) { return proposals; } - /** - * {@inheritDoc} - */ @Override protected List fromClauseInternalClauses(String afterIdentifier) { @@ -191,9 +182,6 @@ else if (afterIdentifier == ORDER_SIBLINGS_BY) { return super.fromClauseInternalClauses(afterIdentifier); } - /** - * {@inheritDoc} - */ @Override protected boolean isJoinFetchIdentifiable() { return true; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest.java index 2278ac119e0..92ca3ab52e8 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,9 +36,6 @@ protected IEntity entity(String entityName) throws Exception { return entity; } - /** - * {@inheritDoc} - */ @Override protected IQuery namedQuery(String entityName, String queryName) throws Exception { IEntity entity = entity(entityName); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_4.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_4.java index 3771639a534..ed8f3a1306e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_4.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_4.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -36,9 +36,6 @@ protected IEntity entity(String entityName) throws Exception { return entity; } - /** - * {@inheritDoc} - */ @Override protected IQuery namedQuery(String entityName, String queryName) throws Exception { IEntity entity = entity(entityName); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_5.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_5.java index f27076e4d3b..848715b073e 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_5.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/EclipseLinkJPQLQueryHelperTest2_5.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -33,9 +33,6 @@ protected IEntity entity(String entityName) throws Exception { return entity; } - /** - * {@inheritDoc} - */ @Override protected IQuery namedQuery(String entityName, String queryName) throws Exception { IEntity entity = entity(entityName); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ORMEntityJPQLQueryHelperTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ORMEntityJPQLQueryHelperTest.java index 08a448326f9..6b2b80f595f 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ORMEntityJPQLQueryHelperTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/ORMEntityJPQLQueryHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -39,9 +39,6 @@ private IEntity entity(String entityName) throws Exception { return entity; } - /** - * {@inheritDoc} - */ @Override protected IQuery namedQuery(String entityName, String queryName) throws Exception { IEntity entity = entity(entityName); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/RefactoringToolTest2_0.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/RefactoringToolTest2_0.java index 16c0098d9d5..cabf2e91252 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/RefactoringToolTest2_0.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/RefactoringToolTest2_0.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -23,8 +23,8 @@ import static org.junit.Assert.*; /** - * The abstract definition of a unit-test that tests {@link org.eclipse.persistence.jpa.jpql. - * RefactoringTool RefactoringTool} when the JPA version is 2.0. + * The abstract definition of a unit-test that tests {@link org.eclipse.persistence.jpa.jpql.tools.RefactoringTool + * RefactoringTool} when the JPA version is 2.0. * * @version 2.6 * @since 2.4 diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/AbstractStateObjectTest.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/AbstractStateObjectTest.java index 55dc32695f3..bbd4a4834ed 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/AbstractStateObjectTest.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/AbstractStateObjectTest.java @@ -2280,8 +2280,8 @@ protected void test(StateObjectTester tester, JPQLQueryStateObject stateObject, * Tests the injected {@link IJPQLQueryFormatter} and make sure the generated string will be * the same as the given JPQL query. * - * @param jpqlStateObject - * @param jpqlQuery + * @param jpqlStateObject state object + * @param jpqlQuery query */ protected void testFormatter(JPQLQueryStateObject jpqlStateObject, String jpqlQuery) { @@ -2344,8 +2344,6 @@ protected void testQuery(String query, StateObjectTester queryStatement) throws * @param jpqlQuery The JPQL query to parse and to test the parsed tree representation * @param queryStatement The tester used to verify the parsed tree is correctly representing the * JPQL query - * @param formatter This formatter is used to personalized the formatting of the JPQL query - * before it is used to test the generated string * @param tolerant Determines if the parsing system should be tolerant, meaning if it should try * to parse grammatically invalid or incomplete queries */ diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryBuilderTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryBuilderTestHelper.java index a9b53163ace..8760e489b98 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryBuilderTestHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryBuilderTestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -25,7 +25,6 @@ * This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql. * model.IJPQLQueryBuilder IJPQLQueryBuilder} into the unit-test before it is run. It allows using * multiple instances and the unit-tests are run with each of them separately. - *

        *

          *
        • Method in a test suite: Request the concrete instances that will be injected into the * unit-tests before they are run.
          • diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryFormatterTestHelper.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryFormatterTestHelper.java index 7c924848bcc..710f4d7a33c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryFormatterTestHelper.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/model/IJPQLQueryFormatterTestHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -25,7 +25,6 @@ * This annotation is used to inject a concrete instance of {@link org.eclipse.persistence.jpa.jpql. * model.IJPQLQueryFormatter IJPQLQueryFormatter} into the unit-test before it is run. It allows * using multiple instances and the unit-tests are run with each of them separately. - *

          *

            *
          • Method in a test suite: Request the concrete instances that will be injected into the * unit-tests before they are run.
            • diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractFieldMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractFieldMapping.java index 1492a8dd64d..be83da7d622 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractFieldMapping.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractFieldMapping.java @@ -44,33 +44,21 @@ protected AbstractFieldMapping(IManagedType parent, Field field) { super(parent, field); } - /** - * {@inheritDoc} - */ @Override public Field getMember() { return (Field) super.getMember(); } - /** - * {@inheritDoc} - */ @Override protected Annotation[] getMemberAnnotations() { return getMember().getAnnotations(); } - /** - * {@inheritDoc} - */ @Override protected Type getMemberGenericType() { return getMember().getGenericType(); } - /** - * {@inheritDoc} - */ @Override protected Class getMemberType() { @@ -115,9 +103,6 @@ protected Class getMemberType() { return field.getType(); } - /** - * {@inheritDoc} - */ @Override public boolean hasAnnotation(Class annotationType) { return getMember().isAnnotationPresent(annotationType); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMapping.java index 85db625ce7e..e7d33dfa09a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMapping.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMapping.java @@ -182,17 +182,11 @@ protected int calculateMappingType(Annotation[] annotations) { return BASIC; } - /** - * {@inheritDoc} - */ @Override public int compareTo(IMapping mapping) { return getName().compareTo(mapping.getName()); } - /** - * {@inheritDoc} - */ @Override public int getMappingType() { if (mappingType == -1) { @@ -216,25 +210,16 @@ public Member getMember() { protected abstract Class getMemberType(); - /** - * {@inheritDoc} - */ @Override public String getName() { return member.getName(); } - /** - * {@inheritDoc} - */ @Override public IManagedType getParent() { return parent; } - /** - * {@inheritDoc} - */ @Override public IType getType() { if (type == null) { @@ -243,9 +228,6 @@ public IType getType() { return type; } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration getTypeDeclaration() { if (typeDeclaration == null) { @@ -280,9 +262,6 @@ protected boolean hasAnnotation(Annotation[] annotations, String annotationType) return false; } - /** - * {@inheritDoc} - */ @Override public boolean isCollection() { switch (getMappingType()) { @@ -302,9 +281,6 @@ public boolean isEmbeddable() { } } - /** - * {@inheritDoc} - */ @Override public boolean isProperty() { switch (getMappingType()) { @@ -315,9 +291,6 @@ public boolean isProperty() { } } - /** - * {@inheritDoc} - */ @Override public boolean isRelationship() { switch (getMappingType()) { @@ -331,17 +304,11 @@ public boolean isRelationship() { } } - /** - * {@inheritDoc} - */ @Override public boolean isTransient() { return getMappingType() == TRANSIENT; } - /** - * {@inheritDoc} - */ @Override public String toString() { return getName() + " : " + getTypeDeclaration(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMethodMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMethodMapping.java index dba8e813155..bb0193e7c6c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMethodMapping.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/AbstractMethodMapping.java @@ -44,33 +44,21 @@ protected AbstractMethodMapping(IManagedType parent, Method method) { super(parent, method); } - /** - * {@inheritDoc} - */ @Override public Method getMember() { return (Method) super.getMember(); } - /** - * {@inheritDoc} - */ @Override protected Annotation[] getMemberAnnotations() { return getMember().getAnnotations(); } - /** - * {@inheritDoc} - */ @Override protected Type getMemberGenericType() { return getMember().getGenericReturnType(); } - /** - * {@inheritDoc} - */ @Override protected Class getMemberType() { @@ -122,9 +110,6 @@ protected Class getMemberType() { } } - /** - * {@inheritDoc} - */ @Override public boolean hasAnnotation(Class annotationType) { return getMember().isAnnotationPresent(annotationType); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkFieldMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkFieldMapping.java index 0e18fbf86c9..eb99028390d 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkFieldMapping.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkFieldMapping.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -42,9 +42,6 @@ public EclipseLinkFieldMapping(IManagedType parent, Field field) { super(parent, field); } - /** - * {@inheritDoc} - */ @Override protected int calculateMappingType(Annotation[] annotations) { @@ -67,9 +64,6 @@ protected int calculateMappingType(Annotation[] annotations) { return super.calculateMappingType(annotations); } - /** - * {@inheritDoc} - */ @Override public boolean isCollection() { switch (getMappingType()) { @@ -79,9 +73,6 @@ public boolean isCollection() { } } - /** - * {@inheritDoc} - */ @Override public boolean isRelationship() { switch (getMappingType()) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkMappingBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkMappingBuilder.java index e7d168b71af..97b12a232a3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkMappingBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkMappingBuilder.java @@ -40,9 +40,6 @@ public EclipseLinkMappingBuilder() { super(); } - /** - * {@inheritDoc} - */ @Override public IMapping buildMapping(IManagedType parent, Member value) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkPropertyMapping.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkPropertyMapping.java index 89d08f69d1e..fc8899aed01 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkPropertyMapping.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/EclipseLinkPropertyMapping.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -42,9 +42,6 @@ public EclipseLinkPropertyMapping(IManagedType parent, Method method) { super(parent, method); } - /** - * {@inheritDoc} - */ @Override protected int calculateMappingType(Annotation[] annotations) { @@ -67,9 +64,6 @@ protected int calculateMappingType(Annotation[] annotations) { return super.calculateMappingType(annotations); } - /** - * {@inheritDoc} - */ @Override public boolean isCollection() { switch (getMappingType()) { @@ -79,9 +73,6 @@ public boolean isCollection() { } } - /** - * {@inheritDoc} - */ @Override public boolean isRelationship() { switch (getMappingType()) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaConstructor.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaConstructor.java index b92f8f7a28c..6f56645fdb3 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaConstructor.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaConstructor.java @@ -77,9 +77,6 @@ protected ITypeDeclaration buildTypeDeclaration(Class javaType, Type genericT return new JavaTypeDeclaration(typeRepository, type, genericType, javaType.isArray()); } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration[] getParameterTypes() { if (parameterTypes == null) { @@ -92,9 +89,6 @@ protected ITypeRepository getTypeRepository() { return type.getTypeRepository(); } - /** - * {@inheritDoc} - */ @Override public String toString() { return constructor.toGenericString(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEmbeddable.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEmbeddable.java index e948ae77363..273fc46557a 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEmbeddable.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEmbeddable.java @@ -47,17 +47,11 @@ public JavaEmbeddable(IManagedTypeProvider provider, super(provider, type, mappingBuilder); } - /** - * {@inheritDoc} - */ @Override public void accept(IManagedTypeVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public String toString() { return getType().getName(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEntity.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEntity.java index b3cd438677c..1c3b7466361 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEntity.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaEntity.java @@ -65,9 +65,6 @@ public JavaEntity(IManagedTypeProvider provider, super(provider, type, mappingBuilder); } - /** - * {@inheritDoc} - */ @Override public void accept(IManagedTypeVisitor visitor) { visitor.visit(this); @@ -133,9 +130,6 @@ protected T getAnnotation(Annotation[] annotations, return null; } - /** - * {@inheritDoc} - */ @Override public String getName() { if (name == null) { @@ -144,9 +138,6 @@ public String getName() { return name; } - /** - * {@inheritDoc} - */ @Override public IQuery getNamedQuery(String queryName) { initializeQueries(); @@ -168,9 +159,6 @@ protected void initializeQueries() { } } - /** - * {@inheritDoc} - */ @Override public String toString() { return getName(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedType.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedType.java index 34a9b65588c..224ec2db3f6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedType.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedType.java @@ -82,9 +82,6 @@ protected IMapping buildMapping(Member member) { return mappingBuilder.buildMapping(this, member); } - /** - * {@inheritDoc} - */ @Override public int compareTo(IManagedType managedType) { return getType().getName().compareTo(managedType.getType().getName()); @@ -98,26 +95,17 @@ protected AccessType getAccessType() { return accessType.value(); } - /** - * {@inheritDoc} - */ @Override public IMapping getMappingNamed(String name) { initializeMappings(); return mappings.get(name); } - /** - * {@inheritDoc} - */ @Override public IManagedTypeProvider getProvider() { return provider; } - /** - * {@inheritDoc} - */ @Override public JavaType getType() { return type; @@ -182,9 +170,6 @@ protected boolean isProperty(Method method) { Modifier.isProtected(modifiers)); } - /** - * {@inheritDoc} - */ @Override public final Iterable mappings() { initializeMappings(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedTypeProvider.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedTypeProvider.java index 10dd68d00ea..22acdbc68cf 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedTypeProvider.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaManagedTypeProvider.java @@ -133,49 +133,31 @@ protected IMappedSuperclass buildMappedSuperclass(Class type) { return new JavaMappedSuperclass(this, getTypeRepository().getType(type), mappingBuilder); } - /** - * {@inheritDoc} - */ @Override public Iterable entities() { return new SnapshotCloneIterable(entities.values()); } - /** - * {@inheritDoc} - */ @Override public IEmbeddable getEmbeddable(IType type) { return getEmbeddable(type.getName()); } - /** - * {@inheritDoc} - */ @Override public IEmbeddable getEmbeddable(String typeName) { return embeddables.get(typeName); } - /** - * {@inheritDoc} - */ @Override public IEntity getEntity(IType type) { return getEntity(type.getName()); } - /** - * {@inheritDoc} - */ @Override public IEntity getEntity(String typeName) { return entities.get(typeName); } - /** - * {@inheritDoc} - */ @Override public IEntity getEntityNamed(String entityName) { @@ -188,33 +170,21 @@ public IEntity getEntityNamed(String entityName) { return null; } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(IType type) { return getManagedType(type.getName()); } - /** - * {@inheritDoc} - */ @Override public IManagedType getManagedType(String typeName) { return managedTypes.get(typeName); } - /** - * {@inheritDoc} - */ @Override public IMappedSuperclass getMappedSuperclass(IType type) { return getMappedSuperclass(type.getName()); } - /** - * {@inheritDoc} - */ @Override public IMappedSuperclass getMappedSuperclass(String typeName) { return mappedSuperclasses.get(typeName); @@ -224,9 +194,6 @@ protected IMappingBuilder getMappingBuilder() { return mappingBuilder; } - /** - * {@inheritDoc} - */ @Override public JavaTypeRepository getTypeRepository() { if (typeRepository == null) { @@ -254,9 +221,6 @@ private void initialize(IMappingBuilder mappingBuilder) { initialize(); } - /** - * {@inheritDoc} - */ @Override public Iterable managedTypes() { return new SnapshotCloneIterable(managedTypes.values()); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappedSuperclass.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappedSuperclass.java index 0b6a54fdc30..4f4ede45258 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappedSuperclass.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappedSuperclass.java @@ -47,17 +47,11 @@ public JavaMappedSuperclass(IManagedTypeProvider provider, super(provider, type, mappingBuilder); } - /** - * {@inheritDoc} - */ @Override public void accept(IManagedTypeVisitor visitor) { visitor.visit(this); } - /** - * {@inheritDoc} - */ @Override public String toString() { return getType().getName(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappingBuilder.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappingBuilder.java index 9272c0c762e..239d4343bd8 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappingBuilder.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaMappingBuilder.java @@ -39,9 +39,6 @@ public JavaMappingBuilder() { super(); } - /** - * {@inheritDoc} - */ @Override public IMapping buildMapping(IManagedType parent, Member value) { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaQuery.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaQuery.java index 4af4f474ab0..84c58b85e99 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaQuery.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaQuery.java @@ -52,17 +52,11 @@ public JavaQuery(IManagedTypeProvider provider, CharSequence jpqlQuery) { setExpression(jpqlQuery); } - /** - * {@inheritDoc} - */ @Override public String getExpression() { return jpqlQuery; } - /** - * {@inheritDoc} - */ @Override public IManagedTypeProvider getProvider() { return provider; @@ -77,9 +71,6 @@ public void setExpression(CharSequence jpqlQuery) { this.jpqlQuery = (jpqlQuery != null) ? jpqlQuery.toString() : ExpressionTools.EMPTY_STRING; } - /** - * {@inheritDoc} - */ @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaType.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaType.java index 031eac0f76b..e087d787349 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaType.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaType.java @@ -126,9 +126,6 @@ protected String[] buildEnumConstants() { return names; } - /** - * {@inheritDoc} - */ @Override public Iterable constructors() { if (constructors == null) { @@ -137,25 +134,16 @@ public Iterable constructors() { return new SnapshotCloneIterable(constructors); } - /** - * {@inheritDoc} - */ @Override public boolean equals(IType type) { return (this == type) || typeName.equals(type.getName()); } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object object) { return equals((IType) object); } - /** - * {@inheritDoc} - */ @Override public String[] getEnumConstants() { if (enumConstants == null) { @@ -164,9 +152,6 @@ public String[] getEnumConstants() { return enumConstants; } - /** - * {@inheritDoc} - */ @Override public String getName() { return typeName; @@ -181,9 +166,6 @@ public Class getType() { return type; } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration getTypeDeclaration() { if (typeDeclaration == null) { @@ -206,25 +188,16 @@ protected ITypeRepository getTypeRepository() { return typeRepository; } - /** - * {@inheritDoc} - */ @Override public boolean hasAnnotation(Class annotationType) { return (type != null) && type.isAnnotationPresent(annotationType); } - /** - * {@inheritDoc} - */ @Override public int hashCode() { return typeName.hashCode(); } - /** - * {@inheritDoc} - */ @Override public boolean isAssignableTo(IType otherType) { @@ -248,25 +221,16 @@ public boolean isAssignableTo(IType otherType) { return otherClass.isAssignableFrom(thisClass); } - /** - * {@inheritDoc} - */ @Override public boolean isEnum() { return (type != null) && type.isEnum(); } - /** - * {@inheritDoc} - */ @Override public boolean isResolvable() { return (type != null); } - /** - * {@inheritDoc} - */ @Override public String toString() { return typeName; diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeDeclaration.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeDeclaration.java index fdd5749dc7f..a33419781c6 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeDeclaration.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeDeclaration.java @@ -215,9 +215,6 @@ protected String elementType(String typeName) { return "L"; } - /** - * {@inheritDoc} - */ @Override public int getDimensionality() { if (array) { @@ -231,9 +228,6 @@ public int getDimensionality() { return 0; } - /** - * {@inheritDoc} - */ @Override public IType getType() { return type; @@ -243,9 +237,6 @@ protected IType getType(Class type) { return typeRepository.getType(type); } - /** - * {@inheritDoc} - */ @Override public ITypeDeclaration[] getTypeParameters() { if (genericTypes == null) { @@ -259,17 +250,11 @@ public ITypeDeclaration[] getTypeParameters() { return genericTypes; } - /** - * {@inheritDoc} - */ @Override public boolean isArray() { return array; } - /** - * {@inheritDoc} - */ @Override public String toString() { diff --git a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeRepository.java b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeRepository.java index f7a89d74220..54738bd343c 100644 --- a/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeRepository.java +++ b/jpa/org.eclipse.persistence.jpa.jpql/src/test/java/org/eclipse/persistence/jpa/tests/jpql/tools/spi/java/JavaTypeRepository.java @@ -107,9 +107,6 @@ public ClassLoader getClassLoader() { return classLoader; } - /** - * {@inheritDoc} - */ @Override public IType getEnumType(String enumTypeName) { @@ -128,17 +125,11 @@ public IType getEnumType(String enumTypeName) { return type.isEnum() ? type : null; } - /** - * {@inheritDoc} - */ @Override public JavaType getType(Class javaClass) { return getType(javaClass.getName()); } - /** - * {@inheritDoc} - */ @Override public JavaType getType(String typeName) { @@ -153,9 +144,6 @@ public JavaType getType(String typeName) { return loadTypeImp(typeName); } - /** - * {@inheritDoc} - */ @Override public TypeHelper getTypeHelper() { if (typeHelper == null) { diff --git a/jpa/org.eclipse.persistence.jpa.modelgen/src/main/java/org/eclipse/persistence/internal/jpa/modelgen/visitors/ElementVisitor.java b/jpa/org.eclipse.persistence.jpa.modelgen/src/main/java/org/eclipse/persistence/internal/jpa/modelgen/visitors/ElementVisitor.java index e7380b25fe6..8e4729a970d 100644 --- a/jpa/org.eclipse.persistence.jpa.modelgen/src/main/java/org/eclipse/persistence/internal/jpa/modelgen/visitors/ElementVisitor.java +++ b/jpa/org.eclipse.persistence.jpa.modelgen/src/main/java/org/eclipse/persistence/internal/jpa/modelgen/visitors/ElementVisitor.java @@ -194,7 +194,7 @@ public MetadataMethod visitExecutable(ExecutableElement executableElement, Metad */ @Override public MetadataClass visitPackage(PackageElement packageElement, MetadataClass metadataClass) { - MetadataLogger logger = ((MetadataMirrorFactory) metadataClass.getMetadataFactory()).getLogger(); + MetadataLogger logger = metadataClass.getMetadataFactory().getLogger(); logger.getSession().getSessionLog().log(SessionLog.FINE, SessionLog.PROCESSOR, "ElementVisitor Package NOT IMPLEMENTED : {0}", new Object[] {packageElement}, false); diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EJBQueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EJBQueryImpl.java index a184dbba18a..10f1edc3836 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EJBQueryImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EJBQueryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -164,7 +164,7 @@ public static DatabaseQuery buildEJBQLDatabaseQuery(String queryName, String jpq throw new PersistenceException(ExceptionLocalization.buildMessage("ejb30-wrong-lock_called_without_version_locking-index", null)); } } else { - throw new IllegalArgumentException(ExceptionLocalization.buildMessage("invalid_lock_query", (Object[]) null)); + throw new IllegalArgumentException(ExceptionLocalization.buildMessage("invalid_lock_query", null)); } } diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityGraphImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityGraphImpl.java index 11a5d60ffc5..d039f6d4da3 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityGraphImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityGraphImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -213,7 +213,7 @@ public Subgraph addKeySubgraph(String attributeName, Class type) { localGroup = new AttributeGroup(attributeName, type, true); - ClassDescriptor targetDesc = ((MappedKeyMapContainerPolicy) mapping.getContainerPolicy()).getDescriptorForMapKey(); + ClassDescriptor targetDesc = mapping.getContainerPolicy().getDescriptorForMapKey(); if (type != null && targetDesc.hasInheritance()) { targetDesc = targetDesc.getInheritancePolicy().getDescriptor(type); if (targetDesc == null) { diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryImpl.java index 4f187793d23..8805627bc9f 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerFactoryImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -173,7 +173,7 @@ public static Boolean isLoaded(Object entity, String attributeName, AbstractSess */ public static boolean isLoaded(Object entity, String attributeName, DatabaseMapping mapping) { if (mapping.isForeignReferenceMapping()) { - if (((ForeignReferenceMapping) mapping).isLazy()) { + if (mapping.isLazy()) { Object value = mapping.getAttributeValueFromObject(entity); IndirectionPolicy policy = ((ForeignReferenceMapping) mapping).getIndirectionPolicy(); return policy.objectIsInstantiated(value); diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java index bcc30382a3b..3edbb51f86d 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerImpl.java @@ -1,6 +1,6 @@ /* * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 1998, 2019 IBM Corporation and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 IBM Corporation and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -1202,7 +1202,7 @@ public boolean contains(Object entity) { * Check if the instance belongs to the current persistence context. */ protected boolean contains(Object entity, UnitOfWork uow) { - return ((UnitOfWorkImpl) uow).isObjectRegistered(entity) && !((UnitOfWorkImpl) uow).isObjectDeleted(entity); + return uow.isObjectRegistered(entity) && !((UnitOfWorkImpl) uow).isObjectDeleted(entity); } @Override @@ -1606,7 +1606,7 @@ public SessionBroker getSessionBroker() { @Override public DatabaseSessionImpl getMemberDatabaseSession(Class cls) { if(this.databaseSession.isBroker()) { - return (DatabaseSessionImpl)((SessionBroker)this.databaseSession).getSessionForClass(cls); + return (DatabaseSessionImpl) this.databaseSession.getSessionForClass(cls); } else { return null; } @@ -1620,7 +1620,7 @@ public DatabaseSessionImpl getMemberDatabaseSession(Class cls) { @Override public ServerSession getMemberServerSession(Class cls) { if(this.databaseSession.isBroker()) { - return (ServerSession)((SessionBroker)this.databaseSession).getSessionForClass(cls); + return (ServerSession) this.databaseSession.getSessionForClass(cls); } else { return null; } @@ -1634,7 +1634,7 @@ public ServerSession getMemberServerSession(Class cls) { @Override public String getMemberSessionName(Class cls) { if(this.databaseSession.isBroker()) { - return ((SessionBroker)this.databaseSession).getSessionForClass(cls).getName(); + return this.databaseSession.getSessionForClass(cls).getName(); } else { return null; } diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java index 709ceeb6325..98dd233004c 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/EntityManagerSetupImpl.java @@ -1664,10 +1664,10 @@ protected void updateConnectionSettings(ServerSession serverSession, Map propert ((DatabaseLogin)pool.getLogin()).useDataSource((String)entry.getValue()); } else if (attribute.equals(PersistenceUnitProperties.CONNECTION_POOL_USER)) { pool.setLogin(pool.getLogin().clone()); - ((DatabaseLogin)pool.getLogin()).setUserName((String)entry.getValue()); + pool.getLogin().setUserName((String)entry.getValue()); } else if (attribute.equals(PersistenceUnitProperties.CONNECTION_POOL_PASSWORD)) { pool.setLogin(pool.getLogin().clone()); - ((DatabaseLogin)pool.getLogin()).setPassword((String)entry.getValue()); + pool.getLogin().setPassword((String)entry.getValue()); } else if (attribute.equals(PersistenceUnitProperties.CONNECTION_POOL_WAIT)) { pool.setWaitTimeout(Integer.parseInt((String)entry.getValue())); } else if (attribute.equals(PersistenceUnitProperties.CONNECTION_POOL_FAILOVER)) { @@ -1828,7 +1828,7 @@ public synchronized ClassTransformer predeploy(PersistenceUnitInfo info, Map ext // predeploy is used for static weaving Writer writer = this.staticWeaveInfo.getLogWriter(); if (writer != null) { - ((DefaultSessionLog)session.getSessionLog()).setWriter(writer); + session.getSessionLog().setWriter(writer); } session.setLogLevel(this.staticWeaveInfo.getLogLevel()); } diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/IsolatedHashMap.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/IsolatedHashMap.java index dafde341c82..bf521605467 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/IsolatedHashMap.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/IsolatedHashMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2018 IBM Corporation. All rights reserved. * * This program and the accompanying materials are made available under the @@ -119,73 +119,73 @@ private Map getMap() { } // All Map interface methods are delegated to Map mapped to current partition. - /** {@inheritDoc} */ + @Override public int size() { return getMap().size(); } - /** {@inheritDoc} */ + @Override public boolean isEmpty() { return getMap().isEmpty(); } - /** {@inheritDoc} */ + @Override public boolean containsKey(Object key) { return getMap().containsKey(key); } - /** {@inheritDoc} */ + @Override public boolean containsValue(Object value) { return getMap().containsValue(value); } - /** {@inheritDoc} */ + @Override public V get(Object key) { return getMap().get(key); } - /** {@inheritDoc} */ + @Override public V put(K key, V value) { return getMap().put(key, value); } - /** {@inheritDoc} */ + @Override public V remove(Object key) { return getMap().remove(key); } - /** {@inheritDoc} */ + @Override public void putAll(Map m) { getMap().putAll(m); } - /** {@inheritDoc} */ + @Override public void clear() { getMap().clear(); } - /** {@inheritDoc} */ + @Override public Set keySet() { return getMap().keySet(); } - /** {@inheritDoc} */ + @Override public Collection values() { return getMap().values(); } - /** {@inheritDoc} */ + @Override public Set> entrySet() { return getMap().entrySet(); diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java index 406adf80dff..daf95a8e464 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryHintsHandler.java @@ -870,8 +870,8 @@ DatabaseQuery applyToDatabaseQuery(Object valueToApply, DatabaseQuery query, Cla if (query.isObjectBuildingQuery()) { ((ObjectBuildingQuery)query).setShouldRefreshIdentityMapResult(((Boolean)valueToApply).booleanValue()); // Set default cascade to be by mapping. - if (!((ObjectBuildingQuery)query).shouldCascadeParts()) { - ((ObjectBuildingQuery)query).cascadeByMapping(); + if (!query.shouldCascadeParts()) { + query.cascadeByMapping(); } } else { throw new IllegalArgumentException(ExceptionLocalization.buildMessage("ejb30-wrong-type-for-query-hint",new Object[]{getQueryId(query), name, getPrintValue(valueToApply)})); @@ -1607,7 +1607,7 @@ DatabaseQuery applyToDatabaseQuery(Object valueToApply, DatabaseQuery query, Cla while (mapping.isAggregateObjectMapping() && tokenizer.hasMoreTokens()){ expression = expression.get(token); token = tokenizer.nextToken(); - descriptor = ((org.eclipse.persistence.mappings.AggregateObjectMapping)mapping).getReferenceDescriptor(); + descriptor = mapping.getReferenceDescriptor(); mapping = descriptor.getObjectBuilder().getMappingForAttributeName(token); } if (!mapping.isForeignReferenceMapping()){ @@ -1660,7 +1660,7 @@ DatabaseQuery applyToDatabaseQuery(Object valueToApply, DatabaseQuery query, Cla while (mapping.isAggregateObjectMapping() && tokenizer.hasMoreTokens()){ expression = expression.get(token); token = tokenizer.nextToken(); - descriptor = ((org.eclipse.persistence.mappings.AggregateObjectMapping)mapping).getReferenceDescriptor(); + descriptor = mapping.getReferenceDescriptor(); mapping = descriptor.getObjectBuilder().getMappingForAttributeName(token); } if (!mapping.isForeignReferenceMapping()){ diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java index 4e6076e8ba5..5da220d603e 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/QueryImpl.java @@ -443,7 +443,7 @@ public LockModeType getLockMode() { entityManager.verifyOpen(); if (!getDatabaseQueryInternal().isObjectLevelReadQuery()) { - throw new IllegalStateException(ExceptionLocalization.buildMessage("invalid_lock_query", (Object[]) null)); + throw new IllegalStateException(ExceptionLocalization.buildMessage("invalid_lock_query", null)); } return this.lockMode; @@ -532,16 +532,16 @@ public Object getSingleResult() { List results = (List) result; if (results.isEmpty()) { rollbackOnException = false; - throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", (Object[]) null)); + throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", null)); } else if (results.size() > 1) { rollbackOnException = false; - throwNonUniqueResultException(ExceptionLocalization.buildMessage("too_many_results_for_get_single_result", (Object[]) null)); + throwNonUniqueResultException(ExceptionLocalization.buildMessage("too_many_results_for_get_single_result", null)); } return results.get(0); } else { if (result == null) { rollbackOnException = false; - throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", (Object[]) null)); + throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", null)); } return result; } @@ -661,7 +661,7 @@ public QueryImpl setFlushMode(FlushModeType flushMode) { */ protected void setFirstResultInternal(int startPosition) { if (startPosition < 0) { - throw new IllegalArgumentException(ExceptionLocalization.buildMessage("negative_start_position", (Object[]) null)); + throw new IllegalArgumentException(ExceptionLocalization.buildMessage("negative_start_position", null)); } // bug 362804 firstResultIndex = startPosition; @@ -791,7 +791,7 @@ public QueryImpl setLockMode(LockModeType lockMode) { entityManager.verifyOpen(); if (!getDatabaseQueryInternal().isObjectLevelReadQuery()) { - throw new IllegalStateException(ExceptionLocalization.buildMessage("invalid_lock_query", (Object[]) null)); + throw new IllegalStateException(ExceptionLocalization.buildMessage("invalid_lock_query", null)); } this.lockMode = lockMode; @@ -824,7 +824,7 @@ protected void cloneSharedQuery() { * @return an object representing the given TemporalType. */ protected Object convertTemporalType(Object value, TemporalType type) { - ConversionManager conversionManager = ((org.eclipse.persistence.internal.sessions.AbstractSession) getEntityManager().getActiveSession()).getDatasourcePlatform().getConversionManager(); + ConversionManager conversionManager = getEntityManager().getActiveSession().getDatasourcePlatform().getConversionManager(); if (type == TemporalType.TIME) { return conversionManager.convertObject(value, ClassConstants.TIME); } else if (type == TemporalType.TIMESTAMP) { @@ -879,7 +879,7 @@ public int getMaxResultsInternal() { */ public void setMaxResultsInternal(int maxResult) { if (maxResult < 0) { - throw new IllegalArgumentException(ExceptionLocalization.buildMessage("negative_max_result", (Object[]) null)); + throw new IllegalArgumentException(ExceptionLocalization.buildMessage("negative_max_result", null)); } if (maxResult == Integer.MAX_VALUE) { this.maxResults = UNDEFINED; diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java index c2f2447c07d..3cf7d7b7ef1 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/StoredProcedureQueryImpl.java @@ -667,9 +667,9 @@ public Object getSingleResult() { } if (results.size() > 1) { - throwNonUniqueResultException(ExceptionLocalization.buildMessage("too_many_results_for_get_single_result", (Object[]) null)); + throwNonUniqueResultException(ExceptionLocalization.buildMessage("too_many_results_for_get_single_result", null)); } else if (results.isEmpty()) { - throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", (Object[]) null)); + throwNoResultException(ExceptionLocalization.buildMessage("no_entities_retrieved_for_get_single_result", null)); } // TODO: if hasMoreResults is true, we 'could' and maybe should throw an exception here. diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java index 7643f396836..3ac7eb042ed 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2018 IBM Corporation. All rights reserved. * * This program and the accompanying materials are made available under the @@ -98,7 +98,7 @@ public static JavaSECMPInitializer getJavaSECMPInitializer(ClassLoader classLoad if(!isInitialized) { initializeTopLinkLoggingFile(); if(fromAgent) { - AbstractSessionLog.getLog().log(SessionLog.FINER, SessionLog.WEAVER, "cmp_init_initialize_from_agent", (Object[])null); + AbstractSessionLog.getLog().log(SessionLog.FINER, SessionLog.WEAVER, "cmp_init_initialize_from_agent", null); } usesAgent = true; initializer = new JavaSECMPInitializer(classLoader); diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/xml/parser/XPathEngine.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/xml/parser/XPathEngine.java index 36c9bfe0508..135cd700ad0 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/xml/parser/XPathEngine.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/deployment/xml/parser/XPathEngine.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -199,7 +199,7 @@ private Node selectSingleText(Node contextNode) { for (int i = 0; i < childrenNodes.getLength(); i++) { Node next = childrenNodes.item(i); if (next.getNodeType() == Node.TEXT_NODE) { - String val = ((Text)next).getNodeValue(); + String val = next.getNodeValue(); if (val != null) { if (returnVal == null) { returnVal = ""; diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/ElementCollectionAccessor.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/ElementCollectionAccessor.java index 87ac7b6a957..80ee6d0c616 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/ElementCollectionAccessor.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/accessors/mappings/ElementCollectionAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2018 IBM Corporation. All rights reserved. * * This program and the accompanying materials are made available under the @@ -922,7 +922,7 @@ protected void processCollectionTable(CollectionMapping mapping) { // Add the reference key field for the direct collection mapping. ((DirectCollectionMapping) mapping).addReferenceKeyField(fkField, pkField); } else { - ((AggregateCollectionMapping) mapping).addTargetForeignKeyField(fkField, pkField); + mapping.addTargetForeignKeyField(fkField, pkField); } } diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java index 65213a2db6e..37f17eb4937 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metadata/queries/PLSQLParameterMetadata.java @@ -230,8 +230,8 @@ public void process(PLSQLStoredProcedureCall call, boolean functionReturn) { // check for cursor return type if (Direction.OUT_CURSOR.name().equals(m_direction)) { // the constructor by default adds a RETURN argument, so remove it - ((PLSQLStoredFunctionCall)call).getArguments().remove(0); - ((PLSQLStoredFunctionCall)call).useNamedCursorOutputAsResultSet(Direction.OUT_CURSOR.name(), type); + call.getArguments().remove(0); + call.useNamedCursorOutputAsResultSet(Direction.OUT_CURSOR.name(), type); } else { if (getLength() != null) { ((PLSQLStoredFunctionCall)call).setResult(type, getLength()); diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/IdentifiableTypeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/IdentifiableTypeImpl.java index 4596b144385..153ca6b9630 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/IdentifiableTypeImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/IdentifiableTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -248,7 +248,7 @@ public Type getIdType() { // There already is an instance of the PKclass on the policy if (cmpPolicy != null && cmpPolicy.isCMP3Policy()) { // BasicType, EntityType or IdentifiableType are handled here, lookup the class in the types map and create a wrapper if it does not exist yet - return this.getMetamodel().getType(((CMP3Policy) cmpPolicy).getPKClass()); + return this.getMetamodel().getType(cmpPolicy.getPKClass()); } // Non-specification mandated exception throw new IllegalArgumentException(ExceptionLocalization.buildMessage( @@ -342,7 +342,7 @@ public boolean hasSingleIdAttribute() { // Optional: Verify the mapping on the each field and whether it is an IdClass Class pkClass = null; if(this.getDescriptor().hasCMPPolicy()) { - pkClass = ((CMP3Policy)this.getDescriptor().getCMPPolicy()).getPKClass(); + pkClass = this.getDescriptor().getCMPPolicy().getPKClass(); if(null == pkClass) { return false; } diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/ManagedTypeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/ManagedTypeImpl.java index c9e17264550..d1792571e99 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/ManagedTypeImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/ManagedTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -1232,7 +1232,7 @@ protected void initialize() { // Future: Check all is*Policy() calls * The following call will perform a getMethod call for us. * If no getMethod exists, we will secondarily check the getMethodName below. */ - aType = ((MethodAttributeAccessor)colMapping.getAttributeAccessor()).getAttributeClass(); + aType = colMapping.getAttributeAccessor().getAttributeClass(); if((aType != null) && List.class.isAssignableFrom(aType)) { member = new ListAttributeImpl(this, colMapping, true); } else if((aType != null) && Collection.class.isAssignableFrom(aType)) { diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/MappedSuperclassTypeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/MappedSuperclassTypeImpl.java index a851f7a9a93..0e86b691ecd 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/MappedSuperclassTypeImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/MappedSuperclassTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -102,7 +102,7 @@ public AttributeImpl getMemberFromInheritingType(String name) { Map inheritingTypeMembers = inheritingType.getMembers(); if ((null == inheritingTypeMembers) && inheritingType.isMappedSuperclass()) { //not initialized - ((ManagedTypeImpl) inheritingType).initialize(); + inheritingType.initialize(); inheritingTypeMembers = inheritingType.getMembers(); } diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/PluralAttributeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/PluralAttributeImpl.java index 706b8856872..9db85dc6295 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/PluralAttributeImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/PluralAttributeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -118,7 +118,7 @@ protected PluralAttributeImpl(ManagedTypeImpl managedType, CollectionMapping attributeClass = mapping.getReferenceClass(); } else if (mapping.isAggregateCollectionMapping()) { // get reference class and check if managedType is a MappedSuperclass - attributeClass = ((AggregateCollectionMapping)mapping).getReferenceClass(); + attributeClass = mapping.getReferenceClass(); } // TODO: refactor exception handling diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/SingularAttributeImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/SingularAttributeImpl.java index 537183c1c06..2d5b6998d4e 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/SingularAttributeImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/metamodel/SingularAttributeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -193,7 +193,7 @@ public boolean isVersion() { if (getDescriptor().usesOptimisticLocking() && getMapping().isDirectToFieldMapping()) { OptimisticLockingPolicy policy = getDescriptor().getOptimisticLockingPolicy(); - return policy.getWriteLockField().equals(((AbstractDirectMapping) getMapping()).getField()); + return policy.getWriteLockField().equals(getMapping().getField()); } return false; } diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CompoundSelectionImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CompoundSelectionImpl.java index 9913f01d356..a501a702dfc 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CompoundSelectionImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CompoundSelectionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -55,7 +55,7 @@ public CompoundSelectionImpl(Class javaType, Selection[] subSelections, boolean java.util.Map tempMap = new java.util.TreeMap(); for (Selection sel : subSelections) { if (validate) { - if (((SelectionImpl)sel).isCompoundSelection() && !((SelectionImpl)sel).isConstructor()) { + if (sel.isCompoundSelection() && !((SelectionImpl)sel).isConstructor()) { throw new IllegalArgumentException(ExceptionLocalization.buildMessage("jpa_criteriaapi_illegal_tuple_or_array_value", new Object[] { sel })); } } diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/ConstructorSelectionImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/ConstructorSelectionImpl.java index a10079e71af..ee0c52ccbf9 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/ConstructorSelectionImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/ConstructorSelectionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -49,7 +49,7 @@ public ConstructorReportItem translate(){ item.setResultType(this.getJavaType()); item.setConstructor(constructor); for(Selection selection : this.getCompoundSelectionItems()){ - if (((SelectionImpl)selection).isCompoundSelection()){ + if (selection.isCompoundSelection()){ item.addItem(((ConstructorSelectionImpl)selection).translate()); }else{ ReportItem reportItem = new ReportItem(item.getName()+item.getReportItems().size(), diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaQueryImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaQueryImpl.java index 9cd12a993f6..c76116fe7d9 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaQueryImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaQueryImpl.java @@ -533,7 +533,7 @@ protected ObjectLevelReadQuery createCompoundQuery() { for (Selection nested : this.selection.getCompoundSelectionItems()) { if (((SelectionImpl) nested).isConstructor()) { reportQuery.addConstructorReportItem(((ConstructorSelectionImpl) nested).translate()); - } else if (((SelectionImpl) nested).isCompoundSelection()) { + } else if (nested.isCompoundSelection()) { throw new IllegalStateException(ExceptionLocalization.buildMessage("NESTED_COMPOUND_SELECTION_OTHER_THAN_CONSTRUCTOR_NOT_SUPPORTED")); } else { if (((InternalSelection) nested).isFrom()) { @@ -631,7 +631,7 @@ protected ObjectLevelReadQuery createSimpleQuery() { } else { query = new ReportQuery(); - query.setReferenceClass(((SelectionImpl) this.selection).getCurrentNode().getBuilder().getQueryClass()); + query.setReferenceClass(this.selection.getCurrentNode().getBuilder().getQueryClass()); if (!this.selection.isCompoundSelection() && ((InternalExpression) this.selection).isCompoundExpression()) { if (((FunctionExpressionImpl) this.selection).getOperation() == CriteriaBuilderImpl.SIZE) { //selecting size not all databases support subselect in select clause so convert to count/groupby @@ -640,10 +640,10 @@ protected ObjectLevelReadQuery createSimpleQuery() { ((ReportQuery) query).addAttribute(this.selection.getAlias(), collectionExpression.getCurrentNode().count(), ClassConstants.INTEGER); ((ReportQuery) query).addGrouping(fromExpression.getCurrentNode()); } - ((ReportQuery) query).addAttribute(this.selection.getAlias(), ((FunctionExpressionImpl) this.selection).getCurrentNode(), this.selection.getJavaType()); + ((ReportQuery) query).addAttribute(this.selection.getAlias(), this.selection.getCurrentNode(), this.selection.getJavaType()); } else { - ((ReportQuery) query).addItem(this.selection.getAlias(), ((SelectionImpl) this.selection).getCurrentNode()); + ((ReportQuery) query).addItem(this.selection.getAlias(), this.selection.getCurrentNode()); ((ReportQuery) query).setShouldReturnSingleAttribute(true); } } @@ -653,7 +653,7 @@ protected ObjectLevelReadQuery createSimpleQuery() { if (this.selection != null && (!((InternalSelection) this.selection).isRoot())) { query = new ReportQuery(); query.setReferenceClass(this.queryType); - ((ReportQuery) query).addItem(this.selection.getAlias(), ((SelectionImpl) this.selection).getCurrentNode(), ((FromImpl) this.selection).findJoinFetches()); + ((ReportQuery) query).addItem(this.selection.getAlias(), this.selection.getCurrentNode(), ((FromImpl) this.selection).findJoinFetches()); ((ReportQuery) query).setShouldReturnSingleAttribute(true); } else { query = new ReadAllQuery(this.queryType); @@ -689,13 +689,13 @@ protected ObjectLevelReadQuery createSimpleQuery() { reportQuery.addAttribute(this.selection.getAlias(), collectionExpression.getCurrentNode().count(), ClassConstants.INTEGER); reportQuery.addGrouping(fromExpression.getCurrentNode()); }else{ - reportQuery.addAttribute(this.selection.getAlias(), ((FunctionExpressionImpl)this.selection).getCurrentNode(), this.selection.getJavaType()); + reportQuery.addAttribute(this.selection.getAlias(), this.selection.getCurrentNode(), this.selection.getJavaType()); }}else{ if (((InternalSelection) selection).isFrom()) { - reportQuery.addItem(selection.getAlias(), ((SelectionImpl) selection).getCurrentNode(), ((FromImpl) selection).findJoinFetches()); + reportQuery.addItem(selection.getAlias(), selection.getCurrentNode(), ((FromImpl) selection).findJoinFetches()); } else { - reportQuery.addAttribute(selection.getAlias(), ((SelectionImpl) selection).getCurrentNode(), selection.getJavaType()); + reportQuery.addAttribute(selection.getAlias(), selection.getCurrentNode(), selection.getJavaType()); }} reportQuery.setReferenceClass(((InternalSelection) this.selection).getCurrentNode().getBuilder().getQueryClass()); reportQuery.setExpressionBuilder(((InternalSelection) this.selection).getCurrentNode().getBuilder()); diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java index 22fd73b2e5d..c0ce99c2de1 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/FromImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -503,11 +503,11 @@ public Join join(String attributeName, JoinType jt) { if (attribute.isCollection()) { org.eclipse.persistence.expressions.Expression node; if (jt.equals(JoinType.INNER)) { - node = this.currentNode.anyOf(((PluralAttribute) attribute).getName()); + node = this.currentNode.anyOf(attribute.getName()); } else if (jt.equals(JoinType.RIGHT)) { throw new UnsupportedOperationException(ExceptionLocalization.buildMessage("RIGHT_JOIN_NOT_SUPPORTED")); } else { - node = this.currentNode.anyOfAllowingNone(((PluralAttribute) attribute).getName()); + node = this.currentNode.anyOfAllowingNone(attribute.getName()); } Join join; if (((PluralAttribute) attribute).getElementType().getPersistenceType().equals(PersistenceType.BASIC)) { diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/RootImpl.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/RootImpl.java index 9754d58c4c4..c7cecebb967 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/RootImpl.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/RootImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -39,11 +39,11 @@ public class RootImpl extends FromImpl implements Root { public RootImpl(ManagedType managedType, Metamodel metamodel, Class javaClass, org.eclipse.persistence.expressions.Expression expressionNode, Bindable modelArtifact) { - super((Path) null, managedType, metamodel, javaClass, expressionNode, modelArtifact); + super(null, managedType, metamodel, javaClass, expressionNode, modelArtifact); } public RootImpl(ManagedType managedType, Metamodel metamodel, Class javaClass, org.eclipse.persistence.expressions.Expression expressionNode, Bindable modelArtifact, FromImpl correlatedParent) { - super((Path) null, managedType, metamodel, javaClass, expressionNode, modelArtifact, correlatedParent); + super(null, managedType, metamodel, javaClass, expressionNode, modelArtifact, correlatedParent); } /** diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveProcessor.java b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveProcessor.java index e02cb9dfe59..8669d0d053b 100644 --- a/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveProcessor.java +++ b/jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/tools/weaving/jpa/StaticWeaveProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -183,7 +183,7 @@ private void preProcess() throws URISyntaxException,MalformedURLException{ //Instantiate default session log AbstractSessionLog.getLog().setLevel(this.logLevel); if(logWriter!=null){ - ((DefaultSessionLog)AbstractSessionLog.getLog()).setWriter(logWriter); + AbstractSessionLog.getLog().setWriter(logWriter); } //Make sure the source is existing diff --git a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/noversion/ServerEmployeeTest.java b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/noversion/ServerEmployeeTest.java index 6247f141ae5..dedd116e81b 100644 --- a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/noversion/ServerEmployeeTest.java +++ b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/server/noversion/ServerEmployeeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -604,7 +604,7 @@ protected void executeMultiResultQueryMax(MediaType mediaType) throws Exception employee1.setFirstName("Miles"); employee1.setLastName("Davis"); employee1.setGender(Gender.Male); - employee1.setSalary((double) 20000); + employee1.setSalary(20000); employee1 = RestUtils.restUpdate(context, employee1, Employee.class, null, mediaType, true); assertNotNull("Employee1 create failed.", employee1); @@ -614,7 +614,7 @@ protected void executeMultiResultQueryMax(MediaType mediaType) throws Exception employee2.setFirstName("Charlie"); employee2.setLastName("Parker"); employee2.setGender(Gender.Male); - employee2.setSalary((double) 30000); + employee2.setSalary(30000); employee2 = RestUtils.restUpdate(context, employee2, Employee.class, null, mediaType, true); assertNotNull("Employee2 create failed.", employee2); @@ -648,7 +648,7 @@ protected void executeSingleResultQueryMax(MediaType mediaType) throws Exception employee.setFirstName("Miles"); employee.setLastName("Davis"); employee.setGender(Gender.Male); - employee.setSalary((double) 20000); + employee.setSalary(20000); employee = RestUtils.restUpdate(context, employee, Employee.class, null, mediaType, true); assertNotNull("Employee create failed.", employee); diff --git a/utils/eclipselink.dbws.builder.test.oracle.server/src/it/java/dbws/testing/DBWSTestSuite.java b/utils/eclipselink.dbws.builder.test.oracle.server/src/it/java/dbws/testing/DBWSTestSuite.java index 94122fcd47e..81dcc6fc20b 100644 --- a/utils/eclipselink.dbws.builder.test.oracle.server/src/it/java/dbws/testing/DBWSTestSuite.java +++ b/utils/eclipselink.dbws.builder.test.oracle.server/src/it/java/dbws/testing/DBWSTestSuite.java @@ -361,7 +361,7 @@ public static SOAPMessage createSOAPMessage(String message) { try { MessageFactory factory = MessageFactory.newInstance(); soapMessage = factory.createMessage(); - soapMessage.getSOAPPart().setContent((Source)new StreamSource(new StringReader(message))); + soapMessage.getSOAPPart().setContent(new StreamSource(new StringReader(message))); soapMessage.saveChanges(); } catch (Exception e) { e.printStackTrace(); diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/mtom/MTOMTestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/mtom/MTOMTestSuite.java index b3db7a03dc5..81ab1a060d2 100644 --- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/mtom/MTOMTestSuite.java +++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/mtom/MTOMTestSuite.java @@ -500,7 +500,7 @@ public void testCreateFindRemove() { part.setContent(domSource); SOAPMessage response = null; response = dispatch.invoke(request); - AttachmentPart aPart = (AttachmentPart)response.getAttachments().next(); + AttachmentPart aPart = response.getAttachments().next(); DataHandler dh = aPart.getDataHandler(); InputStream inputStream = dh.getInputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); diff --git a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/soap12/SOAP12TestSuite.java b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/soap12/SOAP12TestSuite.java index 632600e1e07..2b5e4406f65 100644 --- a/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/soap12/SOAP12TestSuite.java +++ b/utils/org.eclipse.persistence.dbws.builder/src/it/java/dbws/testing/soap12/SOAP12TestSuite.java @@ -508,7 +508,7 @@ public void testCreateFindRemove() { part.setContent(domSource); SOAPMessage response = null; response = dispatch.invoke(request); - AttachmentPart aPart = (AttachmentPart)response.getAttachments().next(); + AttachmentPart aPart = response.getAttachments().next(); DataHandler dh = aPart.getDataHandler(); InputStream inputStream = dh.getInputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java index 41d9dd2e3c0..415a4d97738 100644 --- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java +++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/module-info.java @@ -21,7 +21,7 @@ requires jakarta.servlet; //AM requires org.eclipse.persistence.asm; - requires org.eclipse.persistence.core; + requires transitive org.eclipse.persistence.core; requires org.eclipse.persistence.dbws; requires org.eclipse.persistence.jpa; requires org.eclipse.persistence.jpa.jpql; diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/BaseDBWSBuilderHelper.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/BaseDBWSBuilderHelper.java index ebbf331e2c4..1436a492e4c 100644 --- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/BaseDBWSBuilderHelper.java +++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/BaseDBWSBuilderHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -1352,7 +1352,7 @@ protected org.eclipse.persistence.internal.helper.DatabaseType buildDatabaseType } return null; } else if (dType.isScalar()) { - org.eclipse.persistence.internal.helper.DatabaseType theType = OraclePLSQLTypes.getDatabaseTypeForCode(((ScalarDatabaseType)dType).getTypeName()); + org.eclipse.persistence.internal.helper.DatabaseType theType = OraclePLSQLTypes.getDatabaseTypeForCode(dType.getTypeName()); if (theType != null) { return theType; } diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java index b03ce6d5eea..69e4b8804dc 100644 --- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java +++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/WSDLGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -388,7 +388,7 @@ private void createMethodDefinition(WSDLFactory factory, ExtensionRegistry regis /** * Build the inline schema that will make up the content of the - * section of the WSDL. + * {@code } section of the WSDL. * @return */ @SuppressWarnings("unchecked") diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java index 91cf3ad49ee..9c169773293 100644 --- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java +++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/XRPackager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -177,6 +177,7 @@ public void processArchiveUse() { break; case noArchive: setArchiver(null); + break; case ignore: // do nothing - the default setting from the constructor is fine break; diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/oracle/OracleHelper.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/oracle/OracleHelper.java index 382aa201fb6..43823866a55 100644 --- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/oracle/OracleHelper.java +++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/dbws/oracle/OracleHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -597,7 +597,7 @@ protected List loadTables(List catalogPatterns, List /** * Build list of name patterns separated by vertical bar. - * @param namePatterns {@see List} of name patterns. + * @param namePatterns {@link List} of name patterns. * @return String containing list of name patterns separated by vertical bar. */ private static String buildNamePatternsList(List namePatterns) { diff --git a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java index 928c8fd6c83..385995b5984 100644 --- a/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java +++ b/utils/org.eclipse.persistence.dbws.builder/src/main/java/org/eclipse/persistence/tools/metadata/generation/JPAMetadataGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -874,7 +874,7 @@ protected void addEmbeddableAttributes(EmbeddableAccessor embeddable, List