AMBARI-26294: upgrade JPA

ambari-project/pom.xml

@@ -39,7 +39,7 @@
     <slf4j.version>2.0.0</slf4j.version>
     <reload4j.version>1.2.22</reload4j.version>
     <logback.version>1.2.13</logback.version>
-    <guice.version>6.0.0</guice.version>
+    <guice.version>7.0.0</guice.version>
     <spring.version>6.0.0</spring.version>
     <spring.security.version>6.0.0</spring.security.version>
     <fasterxml.jackson.version>2.18.2</fasterxml.jackson.version>

ambari-server/pom.xml

@@ -1161,6 +1161,11 @@
     </profile>
   </profiles>
   <dependencies>
+    <dependency>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
+      <version>3.1.0</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jndi</artifactId>
@@ -1184,11 +1189,6 @@
       <version>3.15.6</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>jakarta.persistence</groupId>
-      <artifactId>jakarta.persistence-api</artifactId>
-      <version>2.2.3</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>ambari-views</artifactId>
@@ -1336,6 +1336,7 @@
     <dependency>
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>eclipselink</artifactId>
+      <version>4.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
@@ -1433,10 +1434,10 @@
       <artifactId>commons-net</artifactId>
       <version>1.4.1</version>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>javax.servlet</groupId>-->
+<!--      <artifactId>javax.servlet-api</artifactId>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
       <artifactId>jersey-container-jdk-http</artifactId>

ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistModule.java

@@ -27,8 +27,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java

@@ -32,7 +32,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ClusterNotFoundException;

ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentReportsController.java

@@ -23,7 +23,6 @@
 import java.util.Map;
 
 import jakarta.inject.Provider;
-
 import jakarta.ws.rs.WebApplicationException;
 
 import org.apache.ambari.server.AmbariException;

ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaPredicateVisitor.java

@@ -21,12 +21,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.metamodel.SingularAttribute;
 
 import org.apache.ambari.server.controller.predicate.AlwaysPredicate;
 import org.apache.ambari.server.controller.predicate.ArrayPredicate;
@@ -39,7 +39,7 @@
 
 /**
  * The {@link JpaPredicateVisitor} is used to convert an Ambari
- * {@link Predicate} into a JPA {@link javax.persistence.criteria.Predicate}.
+ * {@link Predicate} into a JPA {@link jakarta.persistence.criteria.Predicate}.
  */
 public abstract class JpaPredicateVisitor<T> implements PredicateVisitor {
   /**
@@ -65,15 +65,15 @@ public abstract class JpaPredicateVisitor<T> implements PredicateVisitor {
   /**
    * The last calculated predicate.
    */
-  private javax.persistence.criteria.Predicate m_lastPredicate = null;
+  private jakarta.persistence.criteria.Predicate m_lastPredicate = null;
 
   /**
-   * A queue of lists of {@link javax.persistence.criteria.Predicate}. Every
+   * A queue of lists of {@link jakarta.persistence.criteria.Predicate}. Every
    * time an {@code OR} or {@code AND} is encountered, a new chain (list) is
    * created and the prior list is enqeued. When the logical statement is
    * closed, the chain is completed and added to the prior chain's list.
    */
-  private ArrayDeque<List<javax.persistence.criteria.Predicate>> m_queue =
+  private ArrayDeque<List<jakarta.persistence.criteria.Predicate>> m_queue =
     new ArrayDeque<>();
 
   /**
@@ -111,12 +111,12 @@ public JpaPredicateVisitor(EntityManager entityManager, Class<T> entityClass) {
       String propertyId);
 
   /**
-   * Gets the final JPA {@link javax.persistence.criteria.Predicate} after the
+   * Gets the final JPA {@link jakarta.persistence.criteria.Predicate} after the
    * visitor is done traversing the Ambari {@link Predicate}.
    *
    * @return the predicate, or {@code null} if none.
    */
-  public javax.persistence.criteria.Predicate getJpaPredicate() {
+  public jakarta.persistence.criteria.Predicate getJpaPredicate() {
     return m_lastPredicate;
   }
 
@@ -183,7 +183,7 @@ public void acceptComparisonPredicate(ComparisonPredicate predicate) {
       }
     }
 
-    javax.persistence.criteria.Predicate jpaPredicate = null;
+    jakarta.persistence.criteria.Predicate jpaPredicate = null;
     if ("=".equals(operator)) {
       jpaPredicate = m_builder.equal(path, value);
     } else if ("<".equals(operator)) {
@@ -219,19 +219,19 @@ public void acceptArrayPredicate(ArrayPredicate predicate) {
     }
 
     // create a new list for all of the predicates in this chain
-    List<javax.persistence.criteria.Predicate> predicateList = new ArrayList<>();
+    List<jakarta.persistence.criteria.Predicate> predicateList = new ArrayList<>();
     m_queue.add(predicateList);
 
     // visit every child predicate so it can be added to the list
     String operator = predicate.getOperator();
     for (int i = 0; i < predicates.length; i++) {
       PredicateHelper.visit(predicates[i], this);
     }
-    javax.persistence.criteria.Predicate jpaPredicate = null;
+    jakarta.persistence.criteria.Predicate jpaPredicate = null;
     // the list is done; deque and apply logical AND or OR
     predicateList = m_queue.pollLast();
     if (predicateList != null) {
-      javax.persistence.criteria.Predicate[] array = new javax.persistence.criteria.Predicate[predicateList.size()];
+      jakarta.persistence.criteria.Predicate[] array = new jakarta.persistence.criteria.Predicate[predicateList.size()];
       array = predicateList.toArray(array);
 
       if ("AND".equals(operator)) {

ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java

@@ -23,12 +23,12 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.metamodel.SingularAttribute;
 
 import org.apache.ambari.server.controller.spi.SortRequest;
 import org.apache.ambari.server.controller.spi.SortRequestProperty;

ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java

@@ -39,10 +39,11 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
+
 import jakarta.inject.Provider;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;

ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/ApiSecurityConfig.java

@@ -1,5 +1,7 @@
 package org.apache.ambari.server.configuration.spring;
 
+import java.util.Arrays;
+
 import org.apache.ambari.server.security.AmbariEntryPoint;
 import org.apache.ambari.server.security.authentication.AmbariDelegatingAuthenticationFilter;
 import org.apache.ambari.server.security.authentication.AmbariLocalAuthenticationProvider;
@@ -19,15 +21,12 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.ProviderManager;
-import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
-import java.util.Arrays;
-
 @Configuration
 @EnableWebSecurity
 @Import(GuiceBeansConfig.class)

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariHandlerList.java

@@ -28,7 +28,6 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 import jakarta.inject.Singleton;
-
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -45,6 +44,8 @@
 import org.apache.ambari.server.view.ViewRegistry;
 import org.apache.ambari.view.SystemException;
 import org.apache.ambari.view.ViewContext;
+import org.eclipse.jetty.plus.webapp.EnvConfiguration;
+import org.eclipse.jetty.plus.webapp.PlusConfiguration;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.ErrorHandler;
@@ -262,6 +263,10 @@ private WebAppContext getHandler(ViewInstanceEntity viewInstanceDefinition)
     webAppContext.addFilter(new FilterHolder(persistFilter), "/*", AmbariServer.DISPATCHER_TYPES);
     webAppContext.addFilter(new FilterHolder(springSecurityFilter), "/*", AmbariServer.DISPATCHER_TYPES);
     webAppContext.setAllowNullPathInfo(true);
+    webAppContext.setConfigurations(new org.eclipse.jetty.webapp.Configuration[] {
+            new EnvConfiguration(),
+            new PlusConfiguration()
+    });
 
 
     if (webAppContext.getErrorHandler() != null) {

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

@@ -88,7 +88,8 @@
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
-import javax.persistence.RollbackException;
+
+import jakarta.persistence.RollbackException;
 
 import org.apache.ambari.annotations.Experimental;
 import org.apache.ambari.annotations.ExperimentalFeature;

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java

@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.RollbackException;
+import jakarta.persistence.RollbackException;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.orm.dao.ExtensionDAO;

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariSessionManager.java

@@ -19,7 +19,6 @@
 package org.apache.ambari.server.controller;
 
 import jakarta.inject.Inject;
-
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpSession;
 

ambari-server/src/main/java/org/apache/ambari/server/events/jpa/JPAEvent.java

@@ -17,7 +17,7 @@
  */
 package org.apache.ambari.server.events.jpa;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 import org.apache.ambari.server.events.AmbariEvent;
 

ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConnectionConfigService.java

@@ -19,11 +19,12 @@
 import java.io.FileInputStream;
 import java.security.KeyStore;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 import org.apache.ambari.server.ldap.domain.AmbariLdapConfiguration;
 import org.apache.ambari.server.ldap.service.AmbariLdapException;
 import org.apache.ambari.server.ldap.service.LdapConnectionConfigService;

ambari-server/src/main/java/org/apache/ambari/server/orm/AmbariJpaLocalTxnInterceptor.java

@@ -25,9 +25,9 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
+import jakarta.persistence.PersistenceException;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java

@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.agent.stomp.dto.AlertGroupUpdate;

ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDispatchDAO.java

@@ -25,11 +25,11 @@
 import java.util.concurrent.locks.Lock;
 import java.util.stream.Collectors;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.metamodel.SingularAttribute;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.metamodel.SingularAttribute;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.agent.stomp.dto.AlertGroupUpdate;
@@ -375,7 +375,7 @@ public List<AlertNoticeEntity> findAllNotices(AlertNoticeRequest request) {
     PredicateHelper.visit(request.Predicate, visitor);
 
     CriteriaQuery<AlertNoticeEntity> query = visitor.getCriteriaQuery();
-    javax.persistence.criteria.Predicate jpaPredicate = visitor.getJpaPredicate();
+    jakarta.persistence.criteria.Predicate jpaPredicate = visitor.getJpaPredicate();
 
     if (null != jpaPredicate) {
       query.where(jpaPredicate);
@@ -775,7 +775,7 @@ public void removeNoticeByDefinitionId(long definitionId) {
 
   /**
    * The {@link NoticePredicateVisitor} is used to convert an Ambari
-   * {@link Predicate} into a JPA {@link javax.persistence.criteria.Predicate}.
+   * {@link Predicate} into a JPA {@link jakarta.persistence.criteria.Predicate}.
    */
   private final class NoticePredicateVisitor extends
       JpaPredicateVisitor<AlertNoticeEntity> {