Consolidate Oracle Platforms

dbws/eclipselink.dbws.test.oracle/src/it/java/dbws/testing/plsqlcollection/PLSQLcollectionTestSuite.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,7 +45,7 @@
 import org.eclipse.persistence.oxm.XMLMarshaller;
 import org.eclipse.persistence.oxm.mappings.XMLTransformationMapping;
 import org.eclipse.persistence.platform.database.jdbc.JDBCTypes;
-import org.eclipse.persistence.platform.database.oracle.Oracle10Platform;
+import org.eclipse.persistence.platform.database.OraclePlatform;
 import org.eclipse.persistence.platform.database.oracle.plsql.PLSQLStoredProcedureCall;
 import org.eclipse.persistence.platform.database.oracle.plsql.PLSQLCollection;
 import org.eclipse.persistence.platform.xml.XMLComparer;
@@ -273,7 +273,7 @@ public void fromProjectXML() {
         login.setPassword(password);
         ((DatabaseLogin)login).setConnectionString(url);
         ((DatabaseLogin)login).setDriverClassName("oracle.jdbc.OracleDriver");
-        Platform platform = new Oracle10Platform();
+        Platform platform = new OraclePlatform();
         ConversionManager cm = platform.getConversionManager();
         cm.setLoader(xrdecl);
         login.setDatasourcePlatform(platform);

dbws/eclipselink.dbws.test.oracle/src/it/java/dbws/testing/veearray/VeearrayTestSuite.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -64,7 +64,7 @@
 import org.eclipse.persistence.oxm.mappings.XMLDirectMapping;
 import org.eclipse.persistence.oxm.schema.XMLSchemaReference;
 import org.eclipse.persistence.oxm.schema.XMLSchemaURLReference;
-import org.eclipse.persistence.platform.database.oracle.Oracle10Platform;
+import org.eclipse.persistence.platform.database.OraclePlatform;
 import org.eclipse.persistence.platform.xml.XMLComparer;
 import org.eclipse.persistence.platform.xml.XMLParser;
 import org.eclipse.persistence.platform.xml.XMLPlatform;
@@ -250,7 +250,7 @@ public static void setUp() {
         login.setPassword(password);
         login.setConnectionString(url);
         login.setDriverClassName(driver);
-        login.setDatasourcePlatform(new Oracle10Platform());
+        login.setDatasourcePlatform(new OraclePlatform());
         login.bindAllParameters();
         orProject.setDatasourceLogin(login);
 

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatabasePlatform.java

@@ -1,5 +1,5 @@
 /*
- * 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) 2019 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -2815,7 +2815,7 @@ public boolean usesStringBinding() {
      * Write LOB value - only on Oracle8 and up
      */
     public void writeLOB(DatabaseField field, Object value, ResultSet resultSet, AbstractSession session) throws SQLException {
-        // used by Oracle8Platform
+        // used by OraclePlatform
     }
 
     /**

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/Oracle11Platform.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
@@ -24,7 +24,7 @@
  * Provides Oracle version specific behavior when 
  * org.eclipse.persistence.oracle bundle is not available.
  */
-public class Oracle11Platform extends Oracle10Platform {
+public class Oracle11Platform extends OraclePlatform {
     public Oracle11Platform() {
         super();