Fix packages

eclipse-ee4j · Nov 21, 2024 · 5adb64c · 5adb64c
1 parent 70839f1
commit 5adb64c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/...ps/batchfetch/BatchFetchTableCreator.java → ...pa/batchfetch/BatchFetchTableCreator.java b/...ps/batchfetch/BatchFetchTableCreator.java → ...pa/batchfetch/BatchFetchTableCreator.java
@@ -12,7 +12,7 @@
 
 // Contributors:
 
-package org.eclipse.persistence.jpa.testapps.batchfetch;
+package org.eclipse.persistence.testing.models.jpa.batchfetch;
 
 import org.eclipse.persistence.tools.schemaframework.FieldDefinition;
 import org.eclipse.persistence.tools.schemaframework.TableCreator;

diff --git a/...ence/jpa/testapps/batchfetch/Company.java → ...esting/models/jpa/batchfetch/Company.java b/...ence/jpa/testapps/batchfetch/Company.java → ...esting/models/jpa/batchfetch/Company.java
@@ -12,7 +12,7 @@
 
 // Contributors:
 
-package org.eclipse.persistence.jpa.testapps.batchfetch;
+package org.eclipse.persistence.testing.models.jpa.batchfetch;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

diff --git a/...stence/jpa/testapps/batchfetch/Count.java → .../testing/models/jpa/batchfetch/Count.java b/...stence/jpa/testapps/batchfetch/Count.java → .../testing/models/jpa/batchfetch/Count.java
@@ -12,6 +12,6 @@
 
 // Contributors:
 
-package org.eclipse.persistence.jpa.testapps.batchfetch;
+package org.eclipse.persistence.testing.models.jpa.batchfetch;
 
 public record Count(long value, Employee employee) {}
diff --git a/...nce/jpa/testapps/batchfetch/Employee.java → ...sting/models/jpa/batchfetch/Employee.java b/...nce/jpa/testapps/batchfetch/Employee.java → ...sting/models/jpa/batchfetch/Employee.java
@@ -12,11 +12,10 @@
 
 // Contributors:
 
-package org.eclipse.persistence.jpa.testapps.batchfetch;
+package org.eclipse.persistence.testing.models.jpa.batchfetch;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
-import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;

diff --git a/...tence/jpa/testapps/batchfetch/Record.java → ...testing/models/jpa/batchfetch/Record.java b/...tence/jpa/testapps/batchfetch/Record.java → ...testing/models/jpa/batchfetch/Record.java
@@ -12,7 +12,7 @@
 
 // Contributors:
 
-package org.eclipse.persistence.jpa.testapps.batchfetch;
+package org.eclipse.persistence.testing.models.jpa.batchfetch;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;

diff --git a/jpa/eclipselink.jpa.testapps/jpa.test.batchfetch/src/main/resources/META-INF/persistence.xml b/jpa/eclipselink.jpa.testapps/jpa.test.batchfetch/src/main/resources/META-INF/persistence.xml
@@ -17,9 +17,9 @@
 	version="2.0" xmlns="http://java.sun.com/xml/ns/persistence">
 	<persistence-unit name="batchfetch">
 		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.eclipse.persistence.jpa.testapps.batchfetch.Company</class>
-		<class>org.eclipse.persistence.jpa.testapps.batchfetch.Employee</class>
-		<class>org.eclipse.persistence.jpa.testapps.batchfetch.Record</class>
+		<class>org.eclipse.persistence.testing.models.jpa.batchfetch.Company</class>
+		<class>org.eclipse.persistence.testing.models.jpa.batchfetch.Employee</class>
+		<class>org.eclipse.persistence.testing.models.jpa.batchfetch.Record</class>
 		<properties>
 			<property name="eclipselink.logging.level" value="${eclipselink.logging.level}"/>
 			<property name="eclipselink.logging.level.sql" value="${eclipselink.logging.sql.level}"/>

diff --git a/.../java/batchfetch/BatchFetchJUnitTest.java → ...s/jpa/batchfetch/BatchFetchJUnitTest.java b/.../java/batchfetch/BatchFetchJUnitTest.java → ...s/jpa/batchfetch/BatchFetchJUnitTest.java
@@ -12,18 +12,18 @@
 
 // Contributors:
 
-package batchfetch;
+package org.eclipse.persistence.testing.tests.jpa.batchfetch;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.eclipse.persistence.config.QueryHints;
-import org.eclipse.persistence.jpa.testapps.batchfetch.BatchFetchTableCreator;
-import org.eclipse.persistence.jpa.testapps.batchfetch.Company;
-import org.eclipse.persistence.jpa.testapps.batchfetch.Count;
-import org.eclipse.persistence.jpa.testapps.batchfetch.Employee;
-import org.eclipse.persistence.jpa.testapps.batchfetch.Record;
+import org.eclipse.persistence.testing.models.jpa.batchfetch.BatchFetchTableCreator;
+import org.eclipse.persistence.testing.models.jpa.batchfetch.Company;
+import org.eclipse.persistence.testing.models.jpa.batchfetch.Count;
+import org.eclipse.persistence.testing.models.jpa.batchfetch.Employee;
+import org.eclipse.persistence.testing.models.jpa.batchfetch.Record;
 import org.eclipse.persistence.testing.framework.jpa.junit.JUnitTestCase;
 
 import java.util.List;
@@ -53,7 +53,8 @@ public static Test suite() {
      * The setup is done as a test, both to record its failure, and to allow execution in the server.
      */
     public void testSetup() {
-        new BatchFetchTableCreator().replaceTables(JUnitTestCase.getServerSession("batchfetch"));
+        new BatchFetchTableCreator().replaceTables(JUnitTestCase.getServerSession(
+                "batchfetch"));
         EntityManager em = createEntityManager();
         createRecords(em);
     }
@@ -130,7 +131,7 @@ public void testSelectNonRootWithOffsetAndLimit() {
         em.getEntityManagerFactory().getCache().evictAll();
 
         try {
-            TypedQuery<Count> q = em.createQuery("SELECT new org.eclipse.persistence.jpa.testapps.batchfetch.Count(count(r.employee), r.employee) FROM Record r group by r.employee", Count.class);
+            TypedQuery<Count> q = em.createQuery("SELECT new org.eclipse.persistence.testing.models.jpa.batchfetch.Count(count(r.employee), r.employee) FROM Record r group by r.employee", Count.class);
             q.setHint(QueryHints.BATCH_SIZE, 1);
             List<Count> result = q.getResultList();
             assertEquals("Not all rows are selected", 3, result.size());