diff --git a/bundles/eclipselink/pom.xml b/bundles/eclipselink/pom.xml
index 278e5c0bef0..6d2711f4072 100644
--- a/bundles/eclipselink/pom.xml
+++ b/bundles/eclipselink/pom.xml
@@ -272,7 +272,7 @@
org.eclipse.persistence
- org.eclipse.persistence.jpars
+ org.eclipse.persistence.jpars.server
provided
@@ -302,14 +302,6 @@
provided
-
- org.eclipse.persistence
- org.eclipse.persistence.jpars
- javadoc
- provided
-
- ${project.version}
-
@@ -385,6 +377,7 @@
org.eclipse.persistence.dbws,
org.eclipse.persistence.jpa,
org.eclipse.persistence.jpa.jpql,
+ org.eclipse.persistence.jpars.server,
org.eclipse.persistence.moxy,
org.eclipse.persistence.moxy.utils.xjc,
org.eclipse.persistence.oracle,
@@ -425,6 +418,7 @@
org.eclipse.persistence.dbws,
org.eclipse.persistence.jpa,
org.eclipse.persistence.jpa.jpql,
+ org.eclipse.persistence.jpars.server,
org.eclipse.persistence.moxy,
org.eclipse.persistence.moxy.utils.xjc,
org.eclipse.persistence.oracle,
diff --git a/bundles/eclipselink/src/main/java/module-info.java b/bundles/eclipselink/src/main/java/module-info.java
index ca15309e2c9..39ff2c21f4b 100644
--- a/bundles/eclipselink/src/main/java/module-info.java
+++ b/bundles/eclipselink/src/main/java/module-info.java
@@ -184,19 +184,14 @@
exports org.eclipse.persistence.dbws;
exports org.eclipse.persistence.jpa.rs;
exports org.eclipse.persistence.jpa.rs.annotations;
- exports org.eclipse.persistence.jpa.rs.eventlistener;
exports org.eclipse.persistence.jpa.rs.exceptions;
exports org.eclipse.persistence.jpa.rs.features;
exports org.eclipse.persistence.jpa.rs.features.core.selflinks;
exports org.eclipse.persistence.jpa.rs.features.fieldsfiltering;
exports org.eclipse.persistence.jpa.rs.features.paging;
- exports org.eclipse.persistence.jpa.rs.logging;
exports org.eclipse.persistence.jpa.rs.resources;
exports org.eclipse.persistence.jpa.rs.resources.common;
- exports org.eclipse.persistence.jpa.rs.util;
exports org.eclipse.persistence.jpa.rs.util.list;
- exports org.eclipse.persistence.jpa.rs.util.metadatasources;
- exports org.eclipse.persistence.jpa.rs.util.xmladapters;
//exported through EclipseLink PUBLIC API
exports org.eclipse.persistence.internal.cache;
@@ -219,7 +214,7 @@
exports org.eclipse.persistence.internal.jpa.deployment;
exports org.eclipse.persistence.internal.jpa.metadata.xml;
exports org.eclipse.persistence.internal.jpa.rs.metadata.model;
- exports org.eclipse.persistence.internal.jpa.rs.weaving;
+ exports org.eclipse.persistence.internal.jpa.rs.metadata.model.v2;
exports org.eclipse.persistence.internal.libraries.asm;
exports org.eclipse.persistence.internal.localization;
exports org.eclipse.persistence.internal.oxm;
@@ -288,6 +283,8 @@
exports org.eclipse.persistence.internal.sessions.factories.model.transport.naming;
exports org.eclipse.persistence.internal.xr.sxf;
+ uses org.eclipse.persistence.jpa.rs.PersistenceContextFactoryProvider;
+
provides jakarta.persistence.spi.PersistenceProvider with org.eclipse.persistence.jpa.PersistenceProvider;
provides jakarta.xml.bind.JAXBContextFactory with org.eclipse.persistence.jaxb.XMLBindingContextFactory;
provides com.sun.tools.xjc.Plugin with org.eclipse.persistence.jaxb.plugins.BeanValidationPlugin;
diff --git a/bundles/others/pom.xml b/bundles/others/pom.xml
index 9d30662134e..17ed8784a6e 100644
--- a/bundles/others/pom.xml
+++ b/bundles/others/pom.xml
@@ -36,7 +36,6 @@
EclipseLink ${release.version}
- EclipseLink JPA-RS ${release.version}
EclipseLink NoSQL ${release.version}
API Reference
@@ -94,6 +93,10 @@
org.eclipse.persistence
org.eclipse.persistence.jpars
+
+ org.eclipse.persistence
+ org.eclipse.persistence.jpars.server
+
org.eclipse.persistence
org.eclipse.persistence.jpa.modelgen.processor
@@ -371,14 +374,6 @@
sources
-
- org.eclipse.persistence
- org.eclipse.persistence.jpars
- javadoc
- provided
-
- ${project.version}
-
org.eclipse.persistence
org.eclipse.persistence.sdo
@@ -462,6 +457,7 @@
org.eclipse.persistence:org.eclipse.persistence.nosql
org.eclipse.persistence:org.eclipse.persistence.oracle.nosql
org.eclipse.persistence:org.eclipse.persistence.jpars
+ org.eclipse.persistence:org.eclipse.persistence.jpars.server
org.eclipse.persistence.internal.*
@@ -526,7 +522,7 @@
- sdo-jpars-javadoc.jar
+ sdo-javadoc.jar
prepare-package
copy-dependencies
@@ -537,7 +533,6 @@
provided
javadoc
- org.eclipse.persistence.jpars,
org.eclipse.persistence.sdo
true
diff --git a/bundles/p2site/pom.xml b/bundles/p2site/pom.xml
index 6e22dcb8ddc..6a6f6ff832e 100644
--- a/bundles/p2site/pom.xml
+++ b/bundles/p2site/pom.xml
@@ -69,6 +69,10 @@
org.eclipse.persistence
org.eclipse.persistence.jpars
+
+ org.eclipse.persistence
+ org.eclipse.persistence.jpars.server
+
org.eclipse.persistence
org.eclipse.persistence.jpa.modelgen.processor
@@ -314,6 +318,11 @@
org.eclipse.persistence.jpars
sources
+
+ org.eclipse.persistence
+ org.eclipse.persistence.jpars.server
+ sources
+
org.eclipse.persistence
org.eclipse.persistence.dbws
@@ -409,7 +418,7 @@
${project.groupId}
EclipseLink DBWS provides a Java-based, declarative Web Service solution for accessing relational databases.
\
- Copyright (c) 1998, 2020 Oracle and others. All rights reserved.\n\
+ Copyright (c) 1998, 2021 Oracle and others. All rights reserved.\n\
This program and the accompanying materials are made available under the\n\
terms of the Eclipse Public License v. 2.0 which is available at\n\
http://www.eclipse.org/legal/epl-2.0,\n\
diff --git a/dbws/org.eclipse.persistence.dbws/pom.xml b/dbws/org.eclipse.persistence.dbws/pom.xml
index 666f637aff3..f3e503cf4e0 100644
--- a/dbws/org.eclipse.persistence.dbws/pom.xml
+++ b/dbws/org.eclipse.persistence.dbws/pom.xml
@@ -32,7 +32,7 @@
- -Xlint:all,-serial,-exports
+ -Xlint:all
${skipTests}
@@ -63,12 +63,6 @@
provided
true
-
- jakarta.ws.rs
- jakarta.ws.rs-api
- provided
- true
-
jakarta.xml.bind
jakarta.xml.bind-api
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java b/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java
index 32c5efe7359..c60d8fccfdc 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/module-info.java
@@ -17,13 +17,12 @@
requires jakarta.activation;
requires jakarta.mail;
- requires jakarta.persistence;
- requires static jakarta.ws.rs;
+ requires transitive jakarta.persistence;
requires jakarta.xml.bind;
- requires static jakarta.xml.soap;
- requires static jakarta.xml.ws;
+ requires jakarta.xml.soap;
+ requires jakarta.xml.ws;
- requires static jakarta.servlet; //AM
+ requires jakarta.servlet; //AM
requires org.eclipse.persistence.asm;
requires org.eclipse.persistence.jpa;
@@ -31,32 +30,14 @@
requires transitive org.eclipse.persistence.moxy;
exports org.eclipse.persistence.dbws;
- exports org.eclipse.persistence.jpa.rs;
- exports org.eclipse.persistence.jpa.rs.annotations;
- exports org.eclipse.persistence.jpa.rs.eventlistener;
- exports org.eclipse.persistence.jpa.rs.exceptions;
- exports org.eclipse.persistence.jpa.rs.features;
- exports org.eclipse.persistence.jpa.rs.features.core.selflinks;
- exports org.eclipse.persistence.jpa.rs.features.fieldsfiltering;
- exports org.eclipse.persistence.jpa.rs.features.paging;
- exports org.eclipse.persistence.jpa.rs.logging;
- exports org.eclipse.persistence.jpa.rs.resources;
- exports org.eclipse.persistence.jpa.rs.resources.common;
- exports org.eclipse.persistence.jpa.rs.util;
- exports org.eclipse.persistence.jpa.rs.util.list;
- exports org.eclipse.persistence.jpa.rs.util.metadatasources;
- exports org.eclipse.persistence.jpa.rs.util.xmladapters;
//exported through DBWS PUBLIC API
- exports org.eclipse.persistence.internal.jpa.rs.metadata.model;
- exports org.eclipse.persistence.internal.jpa.rs.weaving;
exports org.eclipse.persistence.internal.xr;
- //exported through DBWS INTERNAL API
+ //exported DEV
exports org.eclipse.persistence.internal.xr.sxf;
//INTERNAL ONLY exports
exports org.eclipse.persistence.internal.dbws to org.eclipse.persistence.dbws.builder;
- uses org.eclipse.persistence.jpa.rs.PersistenceContextFactoryProvider;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/dbws/DBWSModelProject.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/dbws/DBWSModelProject.java
index 24b79b6e28d..4f14a28af06 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/dbws/DBWSModelProject.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/dbws/DBWSModelProject.java
@@ -308,7 +308,8 @@ public void setAttributeValueInObject(Object object, Object value)
descriptor.getInheritancePolicy().setClassIndicatorField(isColl);
descriptor.getInheritancePolicy().setClassExtractor(new ClassExtractor() {
@Override
- public Class> extractClassFromRow(DataRecord dataRecord, Session session) {
+ @SuppressWarnings({"unchecked"})
+ public Class extractClassFromRow(DataRecord dataRecord, Session session) {
Class> clz = Result.class;
UnmarshalRecord uRecord = (UnmarshalRecord) dataRecord;
Attributes attrs = uRecord.getAttributes();
@@ -324,7 +325,7 @@ public Class> extractClassFromRow(DataRecord dataRecord, Session session) {
}
}
}
- return clz;
+ return (Class) clz;
}
});
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPResponseWriter.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPResponseWriter.java
index 4b237f8b2d3..1680fd3640a 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPResponseWriter.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/SOAPResponseWriter.java
@@ -206,7 +206,9 @@ public SOAPMessage generateResponse(Operation op, boolean useSOAP12, Object resu
XMLDescriptor descriptor = resultDescriptors.get(op.getName());
SOAPResponse response = null;
try {
- response = (SOAPResponse) descriptor.getJavaClass().getConstructor().newInstance();
+ @SuppressWarnings({"unchecked"})
+ Class extends SOAPResponse> cls = descriptor.getJavaClass();
+ response = cls.getConstructor().newInstance();
} catch (ReflectiveOperationException ie) {
throw new SOAPException(ie);
}
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 ecc1f2b6244..af128c91265 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
@@ -32,6 +32,12 @@ public class JPQLQueryHandler extends QueryHandler {
protected String jpqlString;
+ /**
+ * Default constructor.
+ */
+ public JPQLQueryHandler() {
+ }
+
public String getJpqlString() {
return jpqlString;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/ProjectHelper.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/ProjectHelper.java
index 2ebf6a1cb18..1db37d209ea 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/ProjectHelper.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/ProjectHelper.java
@@ -15,22 +15,20 @@
package org.eclipse.persistence.internal.xr;
//javase imports
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-//java eXtension imports
-
-//EclipseLink imports
import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.internal.databaseaccess.Platform;
import org.eclipse.persistence.internal.helper.ConversionManager;
import org.eclipse.persistence.internal.indirection.BasicIndirectionPolicy;
-import org.eclipse.persistence.internal.xr.XRDynamicEntity;
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.mappings.ForeignReferenceMapping;
import org.eclipse.persistence.sessions.Login;
import org.eclipse.persistence.sessions.Project;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
import static org.eclipse.persistence.internal.xr.XRDynamicClassLoader.COLLECTION_WRAPPER_SUFFIX;
/**
@@ -41,20 +39,25 @@
* This API only supports EclipseLink 1.x format deployment XML
*/
-@SuppressWarnings({"rawtypes"})
-public class ProjectHelper {
+public final class ProjectHelper {
+
+ private ProjectHelper() {
+ // no instance please
+ }
+
/**
* INTERNAL: Fix the given EclipseLink OR and OX projects so that the
* descriptors for all generated sub-classes of XRDynamicEntity have the correct
* AttributeAccessors.
*/
public static void fixOROXAccessors(Project orProject, Project oxProject) {
- for (Iterator i = orProject.getDescriptors().values().iterator(); i.hasNext();) {
- ClassDescriptor desc = (ClassDescriptor)i.next();
- Class clz = desc.getJavaClass();
- if (!XRDynamicEntity.class.isAssignableFrom(clz)) {
+ for (Iterator i = orProject.getDescriptors().values().iterator(); i.hasNext();) {
+ ClassDescriptor desc = i.next();
+ if (!XRDynamicEntity.class.isAssignableFrom(desc.getJavaClass())) {
continue;
}
+ @SuppressWarnings({"unchecked"})
+ Class extends XRDynamicEntity> clz = (Class extends XRDynamicEntity>) desc.getJavaClass();
ClassDescriptor xdesc = null;
if (oxProject != null) {
xdesc = oxProject.getDescriptorForAlias(desc.getAlias());
@@ -62,7 +65,7 @@ public static void fixOROXAccessors(Project orProject, Project oxProject) {
XRDynamicPropertiesManager xrDPM = null;
if (!clz.getName().endsWith(COLLECTION_WRAPPER_SUFFIX)) {
try {
- XRDynamicEntity newInstance = (XRDynamicEntity)clz.getConstructor().newInstance();
+ XRDynamicEntity newInstance = clz.getConstructor().newInstance();
xrDPM = newInstance.fetchPropertiesManager();
}
catch (Exception e) {
@@ -70,8 +73,8 @@ public static void fixOROXAccessors(Project orProject, Project oxProject) {
}
}
Set propertiesNameSet = new HashSet<>();
- for (Iterator j = desc.getMappings().iterator(); j.hasNext();) {
- DatabaseMapping dm = (DatabaseMapping)j.next();
+ for (Iterator j = desc.getMappings().iterator(); j.hasNext();) {
+ DatabaseMapping dm = j.next();
String attributeName = dm.getAttributeName();
DatabaseMapping xdm = null;
if (xdesc != null) {
@@ -112,12 +115,12 @@ public static void fixOROXAccessors(Project orProject, Project oxProject) {
}
}
}
- if (cl != null && cl instanceof XRDynamicClassLoader) {
+ if (cl instanceof XRDynamicClassLoader) {
XRDynamicClassLoader xrdecl = (XRDynamicClassLoader)cl;
xrdecl.dontGenerateSubclasses();
}
if (oxProject != null) {
- cl = null;
+ cl = null;
login = oxProject.getDatasourceLogin();
if (login != null) {
Platform platform = login.getDatasourcePlatform();
@@ -128,8 +131,8 @@ public static void fixOROXAccessors(Project orProject, Project oxProject) {
}
}
}
- if (cl != null && cl instanceof XRDynamicClassLoader) {
- XRDynamicClassLoader xrdecl = (XRDynamicClassLoader)cl;
+ if (cl instanceof XRDynamicClassLoader) {
+ XRDynamicClassLoader xrdecl = (XRDynamicClassLoader) cl;
xrdecl.dontGenerateSubclasses();
}
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QNameTransformer.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QNameTransformer.java
index 0fa0877a837..c511e4ba476 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QNameTransformer.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/QNameTransformer.java
@@ -16,8 +16,6 @@
package org.eclipse.persistence.internal.xr;
//javase imports
-import static javax.xml.XMLConstants.DEFAULT_NS_PREFIX;
-import static javax.xml.XMLConstants.NULL_NS_URI;
import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
import static org.eclipse.persistence.internal.oxm.Constants.ANY;
import static org.eclipse.persistence.internal.oxm.Constants.ANY_QNAME;
@@ -117,7 +115,7 @@ public class QNameTransformer implements AttributeTransformer, FieldTransformer
AbstractTransformationMapping transformationMapping;
private transient NamespaceResolver namespaceResolver;
- private String xPath;
+ private final String xPath;
public QNameTransformer(String xPath) {
super();
@@ -139,7 +137,6 @@ public Object buildAttributeValue(DataRecord dataRecord, Object object, Session
if (null == value) {
return null;
}
- QName qName = null;
int index = value.lastIndexOf(COLON);
if (index > -1) {
String prefix = value.substring(0, index);
@@ -147,24 +144,15 @@ public Object buildAttributeValue(DataRecord dataRecord, Object object, Session
String namespaceURI = ((XMLRecord) dataRecord).resolveNamespacePrefix(prefix);
// check for W3C_XML_SCHEMA_NS_URI - return TL_OX pre-built QName's
if (W3C_XML_SCHEMA_NS_URI.equals(namespaceURI)) {
- qName = SCHEMA_QNAMES.get(localName);
+ QName qName = SCHEMA_QNAMES.get(localName);
if (qName == null) { // unknown W3C_XML_SCHEMA_NS_URI type ?
- qName = new QName(W3C_XML_SCHEMA_NS_URI, localName,
- prefix == null ? DEFAULT_NS_PREFIX : prefix);
+ return new QName(W3C_XML_SCHEMA_NS_URI, localName, prefix);
}
}
- else {
- qName = new QName(namespaceURI == null ? NULL_NS_URI : namespaceURI, localName,
- prefix == null ? DEFAULT_NS_PREFIX : prefix);
- }
- return qName;
- }
- else {
- String namespaceURI = ((XMLRecord) dataRecord)
- .resolveNamespacePrefix(DEFAULT_NAMESPACE_PREFIX);
- qName = new QName(namespaceURI, value);
+ return new QName(namespaceURI, localName, prefix);
}
- return qName;
+ String namespaceURI = ((XMLRecord) dataRecord).resolveNamespacePrefix(DEFAULT_NAMESPACE_PREFIX);
+ return new QName(namespaceURI, value);
}
@Override
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 3f6f556a2d6..40ed9559865 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
@@ -106,7 +106,6 @@
* @author Mike Norman - michael.norman@oracle.com
* @since EclipseLink 1.x
*/
-@SuppressWarnings({"serial", "unchecked"/*, "rawtypes"*/})
public class QueryOperation extends Operation {
public static final String ORACLEOPAQUE_STR = "oracle.sql.OPAQUE";
private static final String IORACLEOPAQUE_STR = "oracle.jdbc.OracleOpaque";
@@ -203,7 +202,7 @@ public void validate(XRServiceAdapter xrService) {
// Made static final for performance reasons.
private static final class DataHandlerInstantiationPolicy extends InstantiationPolicy {
- private String mimeType;
+ private final String mimeType;
public DataHandlerInstantiationPolicy(String mimeType) {
super();
this.mimeType = mimeType;
@@ -368,6 +367,7 @@ protected void addSimpleXMLFormatModelDescriptor(XRServiceAdapter xrService) {
* @see Operation
*/
@Override
+ @SuppressWarnings({"unchecked"})
public Object invoke(XRServiceAdapter xrService, Invocation invocation) {
DatabaseQuery query = queryHandler.getDatabaseQuery();
@@ -525,6 +525,7 @@ protected void populateTargetObjectFromRecord(Vector mappings,
}
}
+ @SuppressWarnings({"unchecked"})
public Object createSimpleXMLFormat(XRServiceAdapter xrService, Object value) {
XMLRoot xmlRoot = new XMLRoot();
SimpleXMLFormat simpleXMLFormat = result.getSimpleXMLFormat();
@@ -643,16 +644,16 @@ public Object createSimpleXMLFormat(XRServiceAdapter xrService, Object value) {
if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) {
oracleOPAQUE = AccessController.doPrivileged(new PrivilegedClassForName<>(IORACLEOPAQUE_STR, true, this.getClass().getClassLoader()));
xmlTypeFactoryClass = AccessController.doPrivileged(new PrivilegedClassForName<>(XMLTYPEFACTORY_STR, true, this.getClass().getClassLoader()));
- xmlTypeFactoryConstructor = AccessController.doPrivileged(new PrivilegedGetConstructorFor<>(xmlTypeFactoryClass, new Class[0], true));
+ xmlTypeFactoryConstructor = AccessController.doPrivileged(new PrivilegedGetConstructorFor<>(xmlTypeFactoryClass, new Class>[0], true));
xmlTypeFactory = AccessController.doPrivileged(new PrivilegedInvokeConstructor<>(xmlTypeFactoryConstructor, new Object[0]));
- getStringMethod = AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class[] {oracleOPAQUE}));
- fieldValue = AccessController.doPrivileged(new PrivilegedMethodInvoker<>(getStringMethod, fieldValue, new Object[] {}));
+ getStringMethod = AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class>[] {oracleOPAQUE}));
+ fieldValue = AccessController.doPrivileged(new PrivilegedMethodInvoker<>(getStringMethod, xmlTypeFactory, new Object[] {fieldValue}));
} else {
oracleOPAQUE = PrivilegedAccessHelper.getClassForName(IORACLEOPAQUE_STR, false, this.getClass().getClassLoader());
xmlTypeFactoryClass = PrivilegedAccessHelper.getClassForName(XMLTYPEFACTORY_STR, true, this.getClass().getClassLoader());
- xmlTypeFactoryConstructor = PrivilegedAccessHelper.getConstructorFor(xmlTypeFactoryClass, new Class[0], true);
+ xmlTypeFactoryConstructor = PrivilegedAccessHelper.getConstructorFor(xmlTypeFactoryClass, new Class>[0], true);
xmlTypeFactory = PrivilegedAccessHelper.invokeConstructor(xmlTypeFactoryConstructor, new Object[0]);
- getStringMethod = PrivilegedAccessHelper.getDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class[] {oracleOPAQUE});
+ getStringMethod = PrivilegedAccessHelper.getDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class>[] {oracleOPAQUE});
fieldValue = PrivilegedAccessHelper.invokeMethod(getStringMethod, xmlTypeFactory, new Object[] {fieldValue});
}
} catch (ReflectiveOperationException | PrivilegedActionException e) {
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Util.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Util.java
index 994285687bc..4c4afabd4b5 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Util.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/Util.java
@@ -79,8 +79,7 @@
* @author Mike Norman - michael.norman@oracle.com
* @since EclipseLink 1.x
*/
-@SuppressWarnings("serial")
-public class Util {
+public final class Util {
public static final XMLPlatform XML_PLATFORM = XMLPlatformFactory.getInstance().getXMLPlatform();
public static final Document TEMP_DOC = XML_PLATFORM.createDocument();
public static final int OPAQUE = 2007;
@@ -113,6 +112,10 @@ public class Util {
public static final char COLON_CHAR = ':';
public static final char SLASH_CHAR = '/';
+ private Util() {
+ // no instance please
+ }
+
/**
* Convert a SQL name to a valid XML name. Because not all characters that
* are valid in a SQL name is valid in an XML name, they need to be escaped
@@ -139,7 +142,7 @@ public static String sqlToXmlName(String name) {
xmlName.append("_x003A_");
}
// escape _ of _x to _x005F_
- else if ((length >= 2) && name.substring(0, 2).equals("_x")) {
+ else if ((length >= 2) && name.startsWith("_x")) {
xmlName.append("_x005F_");
}
// check to see if it is a valid first character
@@ -192,7 +195,7 @@ else if ((length >= 2) && name.substring(0, 2).equals("_x")) {
*/
public static String xmlToSqlName(String name) {
- String sqlName = "";
+ StringBuilder sqlName = new StringBuilder();
int length = name.length();
boolean unescapeMode = false;
String hexString = null;
@@ -208,30 +211,28 @@ public static String xmlToSqlName(String name) {
} else if (c == '_') {
// done with escape mode
unescapeMode = false;
- if (hexString != null) {
- int i;
- int len;
- if ((len = hexString.length()) > 4) {
- char i1 = (char) (Integer.parseInt(hexString.substring(0, len - 4), 16));
- char i2 = (char) (Integer.parseInt(hexString.substring(len - 4), 16));
- sqlName += i1;
- sqlName += i2;
- } else {
- try {
- i = Integer.parseInt(hexString, 16);
- if (i != 0xffff) {
- sqlName += (char) i;
- }
- } catch (NumberFormatException nfe) {
- throw new RuntimeException(nfe);
+ int i;
+ int len;
+ if ((len = hexString.length()) > 4) {
+ char i1 = (char) (Integer.parseInt(hexString.substring(0, len - 4), 16));
+ char i2 = (char) (Integer.parseInt(hexString.substring(len - 4), 16));
+ sqlName.append(i1);
+ sqlName.append(i2);
+ } else {
+ try {
+ i = Integer.parseInt(hexString, 16);
+ if (i != 0xffff) {
+ sqlName.append((char) i);
}
+ } catch (NumberFormatException nfe) {
+ throw new RuntimeException(nfe);
}
}
} else {
// invalid char in escape sequence! write everything into
// sqlName as is, or we could throw an exception here
// in the future
- sqlName += ("_x" + hexString + c);
+ sqlName.append("_x").append(hexString).append(c);
unescapeMode = false;
}
} else {
@@ -243,11 +244,11 @@ public static String xmlToSqlName(String name) {
x++;
} else {
// just copy src char to destination
- sqlName += c;
+ sqlName.append(c);
}
}
}
- return sqlName;
+ return sqlName.toString();
}
public static String hexEscape(char c) {
@@ -319,38 +320,34 @@ public static boolean isNameChar(char c) {
|| ((c >= 0xAC00) && (c <= 0xD7A3)) || ((c >= 0x0E47) && (c <= 0x0E4E)))
res = true;
else {
- if ((c == 0x02FF) || (c == 0x0346) || (c == 0x0362) || (c == 0x0487)
- || (c == 0x05A2) || (c == 0x05BA) || (c == 0x05BE) || (c == 0x05C0)
- || (c == 0x05C3) || (c == 0x0653) || (c == 0x06B8) || (c == 0x06B9)
- || (c == 0x06E9) || (c == 0x06EE) || (c == 0x0904) || (c == 0x093B)
- || (c == 0x094E) || (c == 0x0955) || (c == 0x0964) || (c == 0x0984)
- || (c == 0x09C5) || (c == 0x09C9) || (c == 0x09CE) || (c == 0x09D8)
- || (c == 0x09E4) || (c == 0x0A03) || (c == 0x0A3D) || (c == 0x0A46)
- || (c == 0x0A49) || (c == 0x0A4E) || (c == 0x0A80) || (c == 0x0A84)
- || (c == 0x0ABB) || (c == 0x0AC6) || (c == 0x0ACA) || (c == 0x0ACE)
- || (c == 0x0B04) || (c == 0x0B3B) || (c == 0x0B44) || (c == 0x0B4A)
- || (c == 0x0B4E) || (c == 0x0B58) || (c == 0x0B84) || (c == 0x0BC3)
- || (c == 0x0BC9) || (c == 0x0BD6) || (c == 0x0C0D) || (c == 0x0C45)
- || (c == 0x0C49) || (c == 0x0C54) || (c == 0x0C81) || (c == 0x0C84)
- || (c == 0x0CC5) || (c == 0x0CC9) || (c == 0x0CD4) || (c == 0x0CD7)
- || (c == 0x0D04) || (c == 0x0D45) || (c == 0x0D49) || (c == 0x0D4E)
- || (c == 0x0D58) || (c == 0x0E3F) || (c == 0x0E3B) || (c == 0x0E4F)
- || (c == 0x0EBA) || (c == 0x0EBE) || (c == 0x0ECE) || (c == 0x0F1A)
- || (c == 0x0F36) || (c == 0x0F38) || (c == 0x0F3B) || (c == 0x0F3A)
- || (c == 0x0F70) || (c == 0x0F85) || (c == 0x0F8C) || (c == 0x0F96)
- || (c == 0x0F98) || (c == 0x0FB0) || (c == 0x0FB8) || (c == 0x0FBA)
- || (c == 0x20DD) || (c == 0x20E2) || (c == 0x3030) || (c == 0x309B)
- || (c == 0x066A) || (c == 0x06FA) || (c == 0x0970) || (c == 0x09F2)
- || (c == 0x0AF0) || (c == 0x0B70) || (c == 0x0C65) || (c == 0x0CE5)
- || (c == 0x0CF0) || (c == 0x0D70) || (c == 0x0E5A) || (c == 0x0EDA)
- || (c == 0x0F2A) || (c == 0x02D2) || (c == 0x03FE) || (c == 0x065F)
- || (c == 0x0E5C) || (c == 0x0C04))
- res = false;
- else {
- // Character.isLetter(c) || Character.isDigit(c) || '-' || '-' || '.'
- // is known to be true at this point
- res = true;
- }
+ // Character.isLetter(c) || Character.isDigit(c) || '-' || '-' || '.'
+ // is known to be true at this point
+ res = (c != 0x02FF) && (c != 0x0346) && (c != 0x0362) && (c != 0x0487)
+ && (c != 0x05A2) && (c != 0x05BA) && (c != 0x05BE) && (c != 0x05C0)
+ && (c != 0x05C3) && (c != 0x0653) && (c != 0x06B8) && (c != 0x06B9)
+ && (c != 0x06E9) && (c != 0x06EE) && (c != 0x0904) && (c != 0x093B)
+ && (c != 0x094E) && (c != 0x0955) && (c != 0x0964) && (c != 0x0984)
+ && (c != 0x09C5) && (c != 0x09C9) && (c != 0x09CE) && (c != 0x09D8)
+ && (c != 0x09E4) && (c != 0x0A03) && (c != 0x0A3D) && (c != 0x0A46)
+ && (c != 0x0A49) && (c != 0x0A4E) && (c != 0x0A80) && (c != 0x0A84)
+ && (c != 0x0ABB) && (c != 0x0AC6) && (c != 0x0ACA) && (c != 0x0ACE)
+ && (c != 0x0B04) && (c != 0x0B3B) && (c != 0x0B44) && (c != 0x0B4A)
+ && (c != 0x0B4E) && (c != 0x0B58) && (c != 0x0B84) && (c != 0x0BC3)
+ && (c != 0x0BC9) && (c != 0x0BD6) && (c != 0x0C0D) && (c != 0x0C45)
+ && (c != 0x0C49) && (c != 0x0C54) && (c != 0x0C81) && (c != 0x0C84)
+ && (c != 0x0CC5) && (c != 0x0CC9) && (c != 0x0CD4) && (c != 0x0CD7)
+ && (c != 0x0D04) && (c != 0x0D45) && (c != 0x0D49) && (c != 0x0D4E)
+ && (c != 0x0D58) && (c != 0x0E3F) && (c != 0x0E3B) && (c != 0x0E4F)
+ && (c != 0x0EBA) && (c != 0x0EBE) && (c != 0x0ECE) && (c != 0x0F1A)
+ && (c != 0x0F36) && (c != 0x0F38) && (c != 0x0F3B) && (c != 0x0F3A)
+ && (c != 0x0F70) && (c != 0x0F85) && (c != 0x0F8C) && (c != 0x0F96)
+ && (c != 0x0F98) && (c != 0x0FB0) && (c != 0x0FB8) && (c != 0x0FBA)
+ && (c != 0x20DD) && (c != 0x20E2) && (c != 0x3030) && (c != 0x309B)
+ && (c != 0x066A) && (c != 0x06FA) && (c != 0x0970) && (c != 0x09F2)
+ && (c != 0x0AF0) && (c != 0x0B70) && (c != 0x0C65) && (c != 0x0CE5)
+ && (c != 0x0CF0) && (c != 0x0D70) && (c != 0x0E5A) && (c != 0x0EDA)
+ && (c != 0x0F2A) && (c != 0x02D2) && (c != 0x03FE) && (c != 0x065F)
+ && (c != 0x0E5C) && (c != 0x0C04);
}
}
return res;
@@ -381,25 +378,21 @@ public static boolean isFirstNameChar(char c) {
|| ((c >= 0xAC00) && (c <= 0xD7A3)))
res = true;
else {
- if ((c == 0x1101) || (c == 0x1104) || (c == 0x1108) || (c == 0x110A)
- || (c == 0x110D) || (c == 0x113B) || (c == 0x1141) || (c == 0x114D)
- || (c == 0x114F) || (c == 0x1151) || (c == 0x1156) || (c == 0x1162)
- || (c == 0x1164) || (c == 0x1166) || (c == 0x116B) || (c == 0x116F)
- || (c == 0x1174) || (c == 0x119F) || (c == 0x11AC) || (c == 0x11B6)
- || (c == 0x11B9) || (c == 0x11BB) || (c == 0x11C3) || (c == 0x11F1)
- || (c == 0x0132) || (c == 0x0133) || (c == 0x013F) || (c == 0x0140)
- || (c == 0x0149) || (c == 0x017F) || (c == 0x01C4) || (c == 0x01CC)
- || (c == 0x01F1) || (c == 0x01F3) || (c == 0x0E46) || (c == 0x113F)
- || (c == 0x01F6) || (c == 0x01F9) || (c == 0x0230) || (c == 0x03D7)
- || (c == 0x03DD) || (c == 0x03E1) || (c == 0x040D) || (c == 0x0450)
- || (c == 0x045D) || (c == 0x04EC) || (c == 0x04ED) || (c == 0x06B8)
- || (c == 0x06BF) || (c == 0x06CF) || (c == 0x0E2F) || (c == 0x0EAF)
- || (c == 0x0F6A) || (c == 0x4CFF) || (c == 0x212F) || (c == 0x0587)) {
- res = false;
- } else {
- //Character.isLetter(c) || c == '_' is known to be true here
- res = true;
- }
+ //Character.isLetter(c) || c == '_' is known to be true here
+ res = (c != 0x1101) && (c != 0x1104) && (c != 0x1108) && (c != 0x110A)
+ && (c != 0x110D) && (c != 0x113B) && (c != 0x1141) && (c != 0x114D)
+ && (c != 0x114F) && (c != 0x1151) && (c != 0x1156) && (c != 0x1162)
+ && (c != 0x1164) && (c != 0x1166) && (c != 0x116B) && (c != 0x116F)
+ && (c != 0x1174) && (c != 0x119F) && (c != 0x11AC) && (c != 0x11B6)
+ && (c != 0x11B9) && (c != 0x11BB) && (c != 0x11C3) && (c != 0x11F1)
+ && (c != 0x0132) && (c != 0x0133) && (c != 0x013F) && (c != 0x0140)
+ && (c != 0x0149) && (c != 0x017F) && (c != 0x01C4) && (c != 0x01CC)
+ && (c != 0x01F1) && (c != 0x01F3) && (c != 0x0E46) && (c != 0x113F)
+ && (c != 0x01F6) && (c != 0x01F9) && (c != 0x0230) && (c != 0x03D7)
+ && (c != 0x03DD) && (c != 0x03E1) && (c != 0x040D) && (c != 0x0450)
+ && (c != 0x045D) && (c != 0x04EC) && (c != 0x04ED) && (c != 0x06B8)
+ && (c != 0x06BF) && (c != 0x06CF) && (c != 0x0E2F) && (c != 0x0EAF)
+ && (c != 0x0F6A) && (c != 0x4CFF) && (c != 0x212F) && (c != 0x0587);
}
}
return res;
@@ -408,7 +401,7 @@ public static boolean isFirstNameChar(char c) {
/**
* Char type table
*/
- static final int chartype[] = new int[256];
+ static final int[] chartype = new int[256];
static final int FWHITESPACE = 1;
static final int FDIGIT = 2;
static final int FLETTER = 4;
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRDynamicEntityVHAccessor.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRDynamicEntityVHAccessor.java
index f827eb797d0..f9eda453341 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRDynamicEntityVHAccessor.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRDynamicEntityVHAccessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -35,7 +35,6 @@
* @since EclipseLink 1.x
*/
-@SuppressWarnings("serial")
public class XRDynamicEntityVHAccessor extends XRDynamicEntityAccessor {
public XRDynamicEntityVHAccessor(DatabaseMapping mapping) {
@@ -48,12 +47,13 @@ public Object getAttributeValueFromObject(Object entity) throws DescriptorExcept
PropertyWrapper wrapper = propertiesMap.get(attributeName);
Object v = null;
if (wrapper.isSet()) {
- v = ((ValueHolderInterface)wrapper.getValue()).getValue();
+ v = ((ValueHolderInterface>)wrapper.getValue()).getValue();
}
return v;
}
@Override
+ @SuppressWarnings({"rawtypes", "unchecked"})
public void setAttributeValueInObject(Object entity, Object value) throws DescriptorException {
Map propertiesMap = ((XRDynamicEntity)entity).getPropertiesMap();
PropertyWrapper wrapper = propertiesMap.get(attributeName);
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRFieldInfo.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRFieldInfo.java
index 84155eb26e4..04d4dd455b6 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRFieldInfo.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRFieldInfo.java
@@ -19,7 +19,7 @@
import org.eclipse.persistence.exceptions.DynamicException;
-public class XRFieldInfo {
+class XRFieldInfo {
protected HashMap fieldInfo = new HashMap<>();
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRSessionsFactory.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRSessionsFactory.java
index a0594d3836e..a6be5c0430a 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRSessionsFactory.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XRSessionsFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* 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,7 +46,12 @@ public class XRSessionsFactory extends SessionsFactory {
static Pattern matchDBWSOxProject =
Pattern.compile(/*DBWS_OX_XML*/"eclipselink-db.s-ox.xml", Pattern.CASE_INSENSITIVE);
- @SuppressWarnings("unchecked")
+ /**
+ * Default constructor.
+ */
+ public XRSessionsFactory() {
+ }
+
@Override
protected Project loadProjectConfig(ProjectConfig projectConfig) {
Project project = null;
@@ -56,7 +61,7 @@ protected Project loadProjectConfig(ProjectConfig projectConfig) {
try {
if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()){
project = (Project)AccessController.doPrivileged(
- new PrivilegedNewInstanceFromClass(m_classLoader.loadClass(projectString)));
+ new PrivilegedNewInstanceFromClass<>(m_classLoader.loadClass(projectString)));
}else{
project = (Project)PrivilegedAccessHelper.newInstanceFromClass(
m_classLoader.loadClass(projectString));
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XmlBindingsModel.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XmlBindingsModel.java
index 0ea4c576620..8044d6d3dd6 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XmlBindingsModel.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/XmlBindingsModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -32,6 +32,12 @@ public class XmlBindingsModel {
@XmlElement(name="xml-bindings", namespace="http://www.eclipse.org/eclipselink/xsds/persistence/oxm")
public List bindingsList;
+ /**
+ * Default constructor.
+ */
+ public XmlBindingsModel() {
+ }
+
/**
* Return the list of XmlBindings
*/
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/sxf/SimpleXMLFormat.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/sxf/SimpleXMLFormat.java
index ccf9cbfd91b..ad0c14700fe 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/sxf/SimpleXMLFormat.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/sxf/SimpleXMLFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,6 +31,12 @@ public class SimpleXMLFormat {
private String simpleXMLFormatTag;
private String xmlTag;
+ /**
+ * Default constructor.
+ */
+ public SimpleXMLFormat() {
+ }
+
public String getSimpleXMLFormatTag() {
return simpleXMLFormatTag;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/sxf/SimpleXMLFormatProject.java b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/sxf/SimpleXMLFormatProject.java
index 80e0b296272..aa60df5dabe 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/sxf/SimpleXMLFormatProject.java
+++ b/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/xr/sxf/SimpleXMLFormatProject.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* 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,9 @@
import org.eclipse.persistence.oxm.schema.XMLSchemaURLReference;
import org.eclipse.persistence.sessions.Project;
-@SuppressWarnings("serial")
public class SimpleXMLFormatProject extends Project {
+ private static final long serialVersionUID = 3830217546821842428L;
private transient NamespaceResolver ns;
public SimpleXMLFormatProject() {
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/module-info.java b/foundation/org.eclipse.persistence.core/src/main/java/module-info.java
index 03cf1d17580..980655bd420 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/module-info.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/module-info.java
@@ -183,6 +183,7 @@
org.eclipse.persistence.dbws,
org.eclipse.persistence.jpa,
org.eclipse.persistence.jpa.modelgen,
+ org.eclipse.persistence.jpars.server,
org.eclipse.persistence.moxy,
org.eclipse.persistence.oracle,
org.eclipse.persistence.sdo;
diff --git a/jpa/org.eclipse.persistence.jpars.server/pom.xml b/jpa/org.eclipse.persistence.jpars.server/pom.xml
new file mode 100644
index 00000000000..096850a63b2
--- /dev/null
+++ b/jpa/org.eclipse.persistence.jpars.server/pom.xml
@@ -0,0 +1,107 @@
+
+
+
+
+ 4.0.0
+
+ EclipseLink JPA-RS Server
+ org.eclipse.persistence
+ org.eclipse.persistence.jpars.server
+ jar
+
+
+ org.eclipse.persistence
+ org.eclipse.persistence.parent
+ 4.0.0-SNAPSHOT
+ ../../pom.xml
+
+
+
+
+ -Xlint:all
+ ${skipTests}
+
+
+
+
+
+ org.eclipse.persistence
+ org.eclipse.persistence.jpa
+
+
+ org.eclipse.persistence
+ org.eclipse.persistence.moxy
+
+
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ provided
+
+
+
+
+ junit
+ junit
+ test
+
+
+
+ ${db.driver.groupId}
+ ${db.driver.artifactId}
+ ${db.driver.version}
+ test
+
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+
+
+ bundle-manifest
+
+ manifest
+
+
+
+
+ org.eclipse.persistence.internal.jpa.rs.metadata.model,
+ org.eclipse.persistence.internal.jpa.rs.metadata.model.v2,
+ !org.eclipse.persistence.jpa.rs.eventlistener,
+ !org.eclipse.persistence.jpa.rs.logging,
+ !org.eclipse.persistence.jpa.rs.util.metadatasources,
+ !org.eclipse.persistence.jpa.rs.util.xmladapters,
+ *
+
+
+ org.eclipse.persistence.internal.libraries.asm*;version="${version;==;${@}}",
+ *
+
+
+
+
+
+
+
+
+
diff --git a/jpa/org.eclipse.persistence.jpars.server/src/main/java/module-info.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/module-info.java
new file mode 100644
index 00000000000..6783956f4e5
--- /dev/null
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/module-info.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0,
+ * or the Eclipse Distribution License v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+ */
+
+module org.eclipse.persistence.jpars.server {
+
+ requires java.desktop;
+ requires java.naming;
+
+ requires transitive jakarta.persistence;
+ requires transitive jakarta.ws.rs;
+ requires jakarta.xml.bind;
+
+ requires org.eclipse.persistence.asm;
+ requires org.eclipse.persistence.jpa;
+ requires org.eclipse.persistence.jpa.jpql;
+ requires transitive org.eclipse.persistence.moxy;
+
+ exports org.eclipse.persistence.jpa.rs;
+ exports org.eclipse.persistence.jpa.rs.annotations;
+ exports org.eclipse.persistence.jpa.rs.exceptions;
+ exports org.eclipse.persistence.jpa.rs.features;
+ exports org.eclipse.persistence.jpa.rs.features.core.selflinks;
+ exports org.eclipse.persistence.jpa.rs.features.fieldsfiltering;
+ exports org.eclipse.persistence.jpa.rs.features.paging;
+ exports org.eclipse.persistence.jpa.rs.resources;
+ exports org.eclipse.persistence.jpa.rs.resources.common;
+ exports org.eclipse.persistence.jpa.rs.util.list;
+
+ //exported through PUBLIC API (for XML Binding)
+ exports org.eclipse.persistence.internal.jpa.rs.metadata.model;
+ exports org.eclipse.persistence.internal.jpa.rs.metadata.model.v2;
+
+ uses org.eclipse.persistence.jpa.rs.PersistenceContextFactoryProvider;
+}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Attribute.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Attribute.java
similarity index 94%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Attribute.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Attribute.java
index 9a56e234589..73e0bcc60b4 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Attribute.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Attribute.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
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/CollectionWrapper.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/CollectionWrapper.java
similarity index 87%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/CollectionWrapper.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/CollectionWrapper.java
index d26adf3b735..ad354ce5dae 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/CollectionWrapper.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/CollectionWrapper.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
@@ -28,6 +28,12 @@ public class CollectionWrapper {
private List links;
+ /**
+ * Default constructor.
+ */
+ public CollectionWrapper() {
+ }
+
public Collection getItems() {
return items;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Descriptor.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Descriptor.java
similarity index 96%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Descriptor.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Descriptor.java
index a0c3d6fd594..b6e9a48a420 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Descriptor.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Descriptor.java
@@ -30,6 +30,12 @@ public class Descriptor {
protected List attributes = new ArrayList<>();
protected List queries = new ArrayList<>();
+ /**
+ * Default constructor.
+ */
+ public Descriptor() {
+ }
+
public String getName() {
return name;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/ItemLinks.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/ItemLinks.java
similarity index 96%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/ItemLinks.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/ItemLinks.java
index 6218c44b356..1219c6d3b67 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/ItemLinks.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/ItemLinks.java
@@ -27,6 +27,12 @@
public class ItemLinks {
private List links;
+ /**
+ * Default constructor.
+ */
+ public ItemLinks() {
+ }
+
/**
* Returns a list of all links.
*
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Link.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Link.java
similarity index 92%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Link.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Link.java
index 0aa7f359db7..532271a8105 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Link.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Link.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2019 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
@@ -21,6 +21,9 @@ public class Link {
private String method;
private String href;
+ /**
+ * Default constructor.
+ */
public Link() {
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkTemplate.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkTemplate.java
similarity index 92%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkTemplate.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkTemplate.java
index db813fc0437..5f4fdf59f33 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkTemplate.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkTemplate.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
@@ -25,6 +25,9 @@ public class LinkTemplate {
private String method;
private String href;
+ /**
+ * Default constructor.
+ */
public LinkTemplate() {
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkV2.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkV2.java
similarity index 94%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkV2.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkV2.java
index f6e347d4fea..7ee1ab4cb1b 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkV2.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/LinkV2.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,6 +35,9 @@ public class LinkV2 {
@XmlAttribute
private String mediaType;
+ /**
+ * Default constructor.
+ */
public LinkV2() {
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Parameter.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Parameter.java
similarity index 87%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Parameter.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Parameter.java
index ddcfee253cd..3f1b80a757d 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Parameter.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Parameter.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
@@ -22,6 +22,12 @@ public class Parameter {
private String value = null;
private String typeName = null;
+ /**
+ * Default constructor.
+ */
+ public Parameter() {
+ }
+
public String getValue() {
return value;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/PersistenceUnit.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/PersistenceUnit.java
similarity index 94%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/PersistenceUnit.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/PersistenceUnit.java
index 19e7be332ea..08b1f9c275f 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/PersistenceUnit.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/PersistenceUnit.java
@@ -27,6 +27,12 @@ public class PersistenceUnit {
protected String persistenceUnitName = null;
protected List types = new ArrayList<>();
+ /**
+ * Default constructor.
+ */
+ public PersistenceUnit() {
+ }
+
public String getPersistenceUnitName() {
return persistenceUnitName;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Query.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Query.java
similarity index 97%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Query.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Query.java
index df03b205ab8..e4711190af2 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Query.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/Query.java
@@ -28,6 +28,9 @@ public class Query {
protected LinkTemplate linkTemplate;
protected List returnTypes = new ArrayList<>();
+ /**
+ * Default constructor.
+ */
public Query() {
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/SessionBeanCall.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/SessionBeanCall.java
similarity index 95%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/SessionBeanCall.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/SessionBeanCall.java
index 5683ddbad5c..06daac4d297 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/SessionBeanCall.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/SessionBeanCall.java
@@ -29,6 +29,12 @@ public class SessionBeanCall {
private String context = null;
private List parameters = new ArrayList<>();
+ /**
+ * Default constructor.
+ */
+ public SessionBeanCall() {
+ }
+
public String getContext() {
return context;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ContextsCatalog.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ContextsCatalog.java
similarity index 94%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ContextsCatalog.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ContextsCatalog.java
index e08220cbe54..d1d2ff91b27 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ContextsCatalog.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ContextsCatalog.java
@@ -31,6 +31,12 @@ public final class ContextsCatalog {
/** A list of contexts **/
private List items;
+ /**
+ * Default constructor.
+ */
+ public ContextsCatalog() {
+ }
+
public List getItems() {
return items;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/MetadataCatalog.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/MetadataCatalog.java
similarity index 95%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/MetadataCatalog.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/MetadataCatalog.java
index ae1b97d6de6..e39238c6c36 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/MetadataCatalog.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/MetadataCatalog.java
@@ -36,6 +36,12 @@ public class MetadataCatalog {
/** Links **/
private List links;
+ /**
+ * Default constructor.
+ */
+ public MetadataCatalog() {
+ }
+
public List getItems() {
return items;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Property.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Property.java
similarity index 92%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Property.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Property.java
index 43a7b426777..47afb087de8 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Property.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Property.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
@@ -33,6 +33,9 @@ public class Property {
@XmlElement
private Property items;
+ /**
+ * Default constructor.
+ */
public Property() {
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Reference.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Reference.java
similarity index 92%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Reference.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Reference.java
index 2310ebb5af6..20528d6b904 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Reference.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Reference.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
@@ -30,6 +30,9 @@ public class Reference {
@XmlElement(name = "$ref")
private String ref;
+ /**
+ * Default constructor.
+ */
public Reference() {
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Resource.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Resource.java
similarity index 90%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Resource.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Resource.java
index 70aaf6dc3eb..43fdae46f5f 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Resource.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/Resource.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
@@ -36,6 +36,12 @@ public class Resource {
/** Links to this resource **/
private List links;
+ /**
+ * Default constructor.
+ */
+ public Resource() {
+ }
+
public String getName() {
return name;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ResourceSchema.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ResourceSchema.java
similarity index 97%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ResourceSchema.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ResourceSchema.java
index ea427d277a4..7223b6700ec 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ResourceSchema.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/metadata/model/v2/ResourceSchema.java
@@ -58,6 +58,12 @@ public class ResourceSchema {
/** Links **/
private List links;
+ /**
+ * Default constructor.
+ */
+ public ResourceSchema() {
+ }
+
public String getSchema() {
return schema;
}
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/CollectionProxyClassWriter.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/CollectionProxyClassWriter.java
similarity index 100%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/CollectionProxyClassWriter.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/CollectionProxyClassWriter.java
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/PersistenceWeavedRest.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/PersistenceWeavedRest.java
similarity index 94%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/PersistenceWeavedRest.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/PersistenceWeavedRest.java
index 8674a49a071..b63633a4871 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/PersistenceWeavedRest.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/PersistenceWeavedRest.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
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RelationshipInfo.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RelationshipInfo.java
similarity index 96%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RelationshipInfo.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RelationshipInfo.java
index d7b807cbfc4..a34c49cbd17 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RelationshipInfo.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RelationshipInfo.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
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestAdapterClassWriter.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestAdapterClassWriter.java
similarity index 100%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestAdapterClassWriter.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestAdapterClassWriter.java
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestCollectionAdapterClassWriter.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestCollectionAdapterClassWriter.java
similarity index 100%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestCollectionAdapterClassWriter.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestCollectionAdapterClassWriter.java
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestDynamicClassWriter.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestDynamicClassWriter.java
similarity index 100%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestDynamicClassWriter.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestDynamicClassWriter.java
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestReferenceAdapterV2ClassWriter.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestReferenceAdapterV2ClassWriter.java
similarity index 100%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestReferenceAdapterV2ClassWriter.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/internal/jpa/rs/weaving/RestReferenceAdapterV2ClassWriter.java
diff --git a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/DataStorage.java b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/jpa/rs/DataStorage.java
similarity index 88%
rename from dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/DataStorage.java
rename to jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/jpa/rs/DataStorage.java
index 96a5cce5e3c..3ad48e2b49a 100644
--- a/dbws/org.eclipse.persistence.dbws/src/main/java/org/eclipse/persistence/jpa/rs/DataStorage.java
+++ b/jpa/org.eclipse.persistence.jpars.server/src/main/java/org/eclipse/persistence/jpa/rs/DataStorage.java
@@ -17,10 +17,14 @@
import java.util.HashMap;
import java.util.Map;
-public class DataStorage {
+public final class DataStorage {
// key names in the data storage
public static final String REQUEST_ID = "requestId";
+ private DataStorage() {
+ // no instance please
+ }
+
private final static InheritableThreadLocal
diff --git a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/util/RestUtils.java b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/util/RestUtils.java
index 183b1383579..cf3b914a471 100644
--- a/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/util/RestUtils.java
+++ b/jpa/org.eclipse.persistence.jpars/src/it/java/org/eclipse/persistence/jpars/test/util/RestUtils.java
@@ -21,7 +21,7 @@
import org.eclipse.persistence.jpa.rs.QueryParameters;
import org.eclipse.persistence.jpa.rs.exceptions.ErrorResponse;
import org.eclipse.persistence.jpa.rs.features.ServiceVersion;
-import org.eclipse.persistence.jpa.rs.util.list.ReadAllQueryResultCollection;
+import org.eclipse.persistence.jpa.rs.util.list.PageableCollection;
import org.eclipse.persistence.jpa.rs.util.list.SimpleHomogeneousList;
import org.eclipse.persistence.jpars.test.server.RestCallFailedException;
@@ -513,9 +513,9 @@ public static List restNamedMultiResultQuery(PersistenceContext context,
if (context.getServiceVersion().compareTo(ServiceVersion.VERSION_2_0) >= 0) {
// 2.0 or higher
final Object obj = context.unmarshalEntity("ReadAllQueryResultCollection", mediaType, new ByteArrayInputStream(result.getBytes()));
- if (obj instanceof ReadAllQueryResultCollection) {
- final ReadAllQueryResultCollection c = (ReadAllQueryResultCollection) obj;
- return (List)c.getItems();
+ if (obj instanceof PageableCollection) {
+ final PageableCollection c = (PageableCollection) obj;
+ return c.getItems();
} else {
return Collections.emptyList();
}
diff --git a/jpa/org.eclipse.persistence.jpars/src/main/java/module-info.java b/jpa/org.eclipse.persistence.jpars/src/main/java/module-info.java
index f66347f386b..399b5b71abd 100644
--- a/jpa/org.eclipse.persistence.jpars/src/main/java/module-info.java
+++ b/jpa/org.eclipse.persistence.jpars/src/main/java/module-info.java
@@ -20,8 +20,8 @@
requires transitive jakarta.annotation;
requires transitive jakarta.ws.rs;
- requires transitive org.eclipse.persistence.dbws;
requires org.eclipse.persistence.jpa;
+ requires transitive org.eclipse.persistence.jpars.server;
requires org.eclipse.persistence.asm;
requires org.eclipse.persistence.core;
requires org.eclipse.persistence.jpa.jpql;
diff --git a/pom.xml b/pom.xml
index 5071698b253..c082a07bd49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,6 +256,7 @@
jpa/org.eclipse.persistence.jpa
jpa/org.eclipse.persistence.jpa.modelgen
jpa/org.eclipse.persistence.jpars
+ jpa/org.eclipse.persistence.jpars.server
foundation/org.eclipse.persistence.corba
foundation/org.eclipse.persistence.extension
@@ -396,6 +397,19 @@
sources
+
+ org.eclipse.persistence
+ org.eclipse.persistence.jpars.server
+ ${project.version}
+
+
+
+ org.eclipse.persistence
+ org.eclipse.persistence.jpars.server
+ ${project.version}
+ sources
+
+
org.eclipse.persistence
org.eclipse.persistence.jpars