Jakarta Persistence 3.2 - initial commit

Signed-off-by: Radek Felcman <[email protected]>

jpa/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2021  Contributors to the Eclipse Foundation
+    Copyright (c) 2021, 2024  Contributors to the Eclipse Foundation
     All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -46,6 +46,7 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
+            <version>3.2.0-M2</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>

jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/implementation/EntityManagerFactoryImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,12 +17,17 @@
 package com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation;
 
 import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
 import jakarta.persistence.Cache;
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceUnitTransactionType;
 import jakarta.persistence.PersistenceUnitUtil;
 import jakarta.persistence.Query;
+import jakarta.persistence.SchemaManager;
+import jakarta.persistence.TypedQueryReference;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.metamodel.Metamodel;
 import jakarta.persistence.spi.PersistenceUnitInfo;
@@ -66,6 +71,12 @@ public void close() {
 		isOpen = false;
 	}
 
+	@Override
+	public String getName() {
+		//TODO implement
+		return null;
+	}
+
 	public EntityManager createEntityManager() {
 		logger.log("Called EntityManagerFactoryImpl.createEntityManager()");
 		verifyOpen();
@@ -118,6 +129,16 @@ public PersistenceUnitUtil getPersistenceUnitUtil() {
 		return null;
 	}
 
+	@Override
+	public PersistenceUnitTransactionType getTransactionType() {
+		return null;
+	}
+
+	@Override
+	public SchemaManager getSchemaManager() {
+		return null;
+	}
+
 	public Map<String, Object> getProperties() {
 		return null;
 	}
@@ -133,6 +154,26 @@ public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph
 
 	}
 
+	@Override
+	public <R> Map<String, TypedQueryReference<R>> getNamedQueries(Class<R> resultType) {
+		return null;
+	}
+
+	@Override
+	public <E> Map<String, EntityGraph<? extends E>> getNamedEntityGraphs(Class<E> entityType) {
+		return null;
+	}
+
+	@Override
+	public void runInTransaction(Consumer<EntityManager> work) {
+
+	}
+
+	@Override
+	public <R> R callInTransaction(Function<EntityManager, R> work) {
+		return null;
+	}
+
 	public boolean isOpen() {
 		return isOpen;
 	}

jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/implementation/EntityManagerImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -19,17 +19,26 @@
 import java.util.List;
 import java.util.Map;
 
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
+import jakarta.persistence.ConnectionConsumer;
+import jakarta.persistence.ConnectionFunction;
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.FindOption;
 import jakarta.persistence.FlushModeType;
 import jakarta.persistence.LockModeType;
+import jakarta.persistence.LockOption;
 import jakarta.persistence.Query;
+import jakarta.persistence.RefreshOption;
 import jakarta.persistence.StoredProcedureQuery;
 import jakarta.persistence.TypedQuery;
+import jakarta.persistence.TypedQueryReference;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaSelect;
 import jakarta.persistence.criteria.CriteriaUpdate;
 import jakarta.persistence.metamodel.Metamodel;
 
@@ -87,6 +96,11 @@ public <T> TypedQuery<T> createNamedQuery(String arg0, Class<T> arg1) {
 		return (TypedQuery<T>) query;
 	}
 
+	@Override
+	public <T> TypedQuery<T> createQuery(TypedQueryReference<T> reference) {
+		return null;
+	}
+
 	@Override
 	public Query createNativeQuery(String arg0) {
 		QueryImpl query = new QueryImpl();
@@ -122,6 +136,11 @@ public <T> TypedQuery<T> createQuery(CriteriaQuery<T> arg0) {
 		return null;
 	}
 
+	@Override
+	public <T> TypedQuery<T> createQuery(CriteriaSelect<T> selectQuery) {
+		return null;
+	}
+
 	@Override
 	public <T> TypedQuery<T> createQuery(String arg0, Class<T> arg1) {
 		QueryImpl query = new QueryImpl();
@@ -185,6 +204,16 @@ public <T> T find(Class<T> arg0, Object arg1, LockModeType arg2, Map<String, Obj
 		return null;
 	}
 
+	@Override
+	public <T> T find(Class<T> entityClass, Object primaryKey, FindOption... options) {
+		return null;
+	}
+
+	@Override
+	public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... options) {
+		return null;
+	}
+
 	@Override
 	public void flush() {
 
@@ -216,6 +245,26 @@ public LockModeType getLockMode(Object arg0) {
 		return null;
 	}
 
+	@Override
+	public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) {
+
+	}
+
+	@Override
+	public void setCacheStoreMode(CacheStoreMode cacheStoreMode) {
+
+	}
+
+	@Override
+	public CacheRetrieveMode getCacheRetrieveMode() {
+		return null;
+	}
+
+	@Override
+	public CacheStoreMode getCacheStoreMode() {
+		return null;
+	}
+
 	@Override
 	public Metamodel getMetamodel() {
 		return null;
@@ -231,6 +280,11 @@ public <T> T getReference(Class<T> arg0, Object arg1) {
 		return null;
 	}
 
+	@Override
+	public <T> T getReference(T entity) {
+		return null;
+	}
+
 	@Override
 	public EntityTransaction getTransaction() {
 		logger.log("Called EntityManagerImpl.getTransaction()");
@@ -265,6 +319,11 @@ public void lock(Object arg0, LockModeType arg1, Map<String, Object> arg2) {
 
 	}
 
+	@Override
+	public void lock(Object entity, LockModeType lockMode, LockOption... options) {
+
+	}
+
 	@Override
 	public <T> T merge(T arg0) {
 		return arg0;// not cloning it in case the object can't be cloned
@@ -295,6 +354,11 @@ public void refresh(Object arg0, LockModeType arg1, Map<String, Object> arg2) {
 
 	}
 
+	@Override
+	public void refresh(Object entity, RefreshOption... options) {
+
+	}
+
 	@Override
 	public void remove(Object arg0) {
 
@@ -322,6 +386,21 @@ public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
 		return null;
 	}
 
+	@Override
+	public <C> void runWithConnection(ConnectionConsumer<C> action) {
+
+	}
+
+	@Override
+	public <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
+		C connection = null;
+		try {
+			return function.apply(connection);
+		} catch (Exception e) {
+			throw new IllegalStateException("callWithConnection failed");
+		}
+	}
+
 	public EntityGraph<?> getEntityGraph(String graphName) {
 		return null;
 	}

jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/implementation/EntityTransactionImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,7 +18,7 @@
 
 public class EntityTransactionImpl implements jakarta.persistence.EntityTransaction {
 	protected boolean isActive;
-
+	protected Integer timeout;
 	protected TSLogger logger;
 
 	public EntityTransactionImpl() {
@@ -46,6 +46,16 @@ public boolean isActive() {
 		return this.isActive;
 	}
 
+	@Override
+	public void setTimeout(Integer timeout) {
+		this.timeout = timeout;
+	}
+
+	@Override
+	public Integer getTimeout() {
+		return timeout;
+	}
+
 	@Override
 	public void rollback() {
 

jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/implementation/PersistenceProvider.java

@@ -25,6 +25,7 @@
 import java.util.Set;
 
 import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.PersistenceConfiguration;
 import jakarta.persistence.spi.LoadState;
 import jakarta.persistence.spi.PersistenceProviderResolver;
 import jakarta.persistence.spi.PersistenceProviderResolverHolder;
@@ -150,6 +151,12 @@ public EntityManagerFactory createEntityManagerFactory(String puName, Map proper
 		return emf;
 	}
 
+	@Override
+	public EntityManagerFactory createEntityManagerFactory(PersistenceConfiguration configuration) {
+		//TODO implement
+		return null;
+	}
+
 	public ProviderUtil getProviderUtil() {
 		callLogger("Called getProviderUtil()");
 		return provider;

jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/implementation/PersistenceUnitInfoImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * 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,6 +130,16 @@ public String getPersistenceProviderClassName() {
 		return persistenceProviderClassName;
 	}
 
+	@Override
+	public String getScopeAnnotationName() {
+		return null;
+	}
+
+	@Override
+	public List<String> getQualifierAnnotationNames() {
+		return null;
+	}
+
 	@Override
 	public String getPersistenceUnitName() {
 		logger.log("Called PersistenceUnitInfoImpl.getPersistenceUnitName()");