Elide 6.0

bukajsytlos · Brutus5000 · commit 69dd45dc9434 · 2022-02-12T17:53:35.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -238,10 +238,10 @@ dependencies {
   runtimeOnly("org.mariadb.jdbc:mariadb-java-client")
 
   // Manually managed dependencies
-  def elideVersion = "5.1.2"
+  def elideVersion = "6.1.1"
   implementation("com.yahoo.elide:elide-core:${elideVersion}")
   implementation("com.yahoo.elide:elide-swagger:${elideVersion}")
-  implementation("com.yahoo.elide:elide-datastore-hibernate5:${elideVersion}")
+  implementation("com.yahoo.elide:elide-datastore-jpa:${elideVersion}")
   implementation("com.yahoo.elide:elide-datastore-multiplex:${elideVersion}")
   implementation("org.springdoc:springdoc-openapi-ui:1.6.6")
   implementation("org.springdoc:springdoc-openapi-security:1.6.6")
diff --git a/src/inttest/java/com/faforever/api/data/AvatarAssignmentElideTest.java b/src/inttest/java/com/faforever/api/data/AvatarAssignmentElideTest.java
@@ -185,15 +185,15 @@ public void cannotUpdateAvatarAssignmentExpirationWithoutRole() throws Exception
   public void ownerCanUpdateAvatarAssignmentSelection() throws Exception {
     final AvatarAssignment avatarAssignment = (AvatarAssignment) new AvatarAssignment()
       .setSelected(true)
-      .setId("1");
+      .setId("2");
     mockMvc.perform(
-      patch("/data/avatarAssignment/{assignmentId}", 1)
+        patch("/data/avatarAssignment/{assignmentId}", 2)
         .with(getOAuthTokenWithActiveUser(NO_SCOPE, NO_AUTHORITIES))
         .header(HttpHeaders.CONTENT_TYPE, JSON_API_MEDIA_TYPE)
         .content(createJsonApiContent(avatarAssignment)))
       .andExpect(status().isNoContent());
     mockMvc.perform(
-      get("/data/avatarAssignment/{assignmentId}", 1)
+        get("/data/avatarAssignment/{assignmentId}", 2)
         .with(getOAuthTokenWithActiveUser(NO_SCOPE, NO_AUTHORITIES)))
       .andExpect(status().isOk())
       .andExpect(jsonPath("$.data.attributes.selected", is(true)));
diff --git a/src/main/java/com/faforever/api/config/FafDatasourceConfig.java b/src/main/java/com/faforever/api/config/FafDatasourceConfig.java
@@ -2,7 +2,6 @@
 
 import com.faforever.api.config.elide.SpringHibernateDataStore;
 import com.yahoo.elide.core.datastore.DataStore;
-import org.hibernate.ScrollMode;
 import org.hibernate.cfg.AvailableSettings;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -77,6 +76,6 @@ DataStore fafDataStore(
     @Qualifier("fafTransactionManager") PlatformTransactionManager fafTransactionManager,
     @Qualifier("fafEntityManagerFactory") EntityManager entityManager
   ) {
-    return new SpringHibernateDataStore(fafTransactionManager, entityManager, true, ScrollMode.FORWARD_ONLY);
+    return new SpringHibernateDataStore(fafTransactionManager, entityManager);
   }
 }
diff --git a/src/main/java/com/faforever/api/config/LeagueDatasourceConfig.java b/src/main/java/com/faforever/api/config/LeagueDatasourceConfig.java
@@ -2,7 +2,6 @@
 
 import com.faforever.api.config.elide.SpringHibernateDataStore;
 import com.yahoo.elide.core.datastore.DataStore;
-import org.hibernate.ScrollMode;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -59,6 +58,6 @@ DataStore leagueDataStore(
     @Qualifier(LEAGUE_TRANSACTION_MANAGER) PlatformTransactionManager leagueTransactionManager,
     @Qualifier("leagueEntityManagerFactory") EntityManager entityManager
   ) {
-    return new SpringHibernateDataStore(leagueTransactionManager, entityManager, true, ScrollMode.FORWARD_ONLY);
+    return new SpringHibernateDataStore(leagueTransactionManager, entityManager);
   }
 }
diff --git a/src/main/java/com/faforever/api/config/elide/ElideConfig.java b/src/main/java/com/faforever/api/config/elide/ElideConfig.java
@@ -3,12 +3,15 @@
 import com.faforever.api.security.ExtendedAuditLogger;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yahoo.elide.Elide;
+import com.yahoo.elide.ElideSettings;
 import com.yahoo.elide.ElideSettingsBuilder;
+import com.yahoo.elide.core.TransactionRegistry;
 import com.yahoo.elide.core.datastore.DataStore;
 import com.yahoo.elide.core.dictionary.EntityDictionary;
 import com.yahoo.elide.core.dictionary.Injector;
 import com.yahoo.elide.core.filter.dialect.CaseSensitivityStrategy;
 import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
+import com.yahoo.elide.core.utils.DefaultClassScanner;
 import com.yahoo.elide.core.utils.coerce.CoerceUtil;
 import com.yahoo.elide.datastores.multiplex.MultiplexManager;
 import com.yahoo.elide.jsonapi.JsonApiMapper;
@@ -22,6 +25,7 @@
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.util.Map;
+import java.util.Set;
 
 @Configuration
 public class ElideConfig {
@@ -38,17 +42,18 @@ MultiplexManager multiplexDataStore(
 
   @Bean
   public Elide elide(DataStore multiplexDataStore, ObjectMapper objectMapper, EntityDictionary entityDictionary, ExtendedAuditLogger extendedAuditLogger) {
-    RSQLFilterDialect rsqlFilterDialect = new RSQLFilterDialect(entityDictionary, new CaseSensitivityStrategy.UseColumnCollation());
+    RSQLFilterDialect rsqlFilterDialect = new RSQLFilterDialect(entityDictionary, new CaseSensitivityStrategy.UseColumnCollation(), true);
 
     registerAdditionalConverters();
 
-    return new Elide(new ElideSettingsBuilder(multiplexDataStore)
+    final ElideSettings elideSettings = new ElideSettingsBuilder(multiplexDataStore)
       .withJsonApiMapper(new JsonApiMapper(objectMapper))
       .withAuditLogger(extendedAuditLogger)
       .withEntityDictionary(entityDictionary)
       .withJoinFilterDialect(rsqlFilterDialect)
       .withSubqueryFilterDialect(rsqlFilterDialect)
-      .build());
+      .build();
+    return new Elide(elideSettings, new TransactionRegistry(), elideSettings.getDictionary().getScanner(), true);
   }
 
   /**
@@ -81,7 +86,7 @@ public <T> T convert(Class<T> type, Object value) {
 
   @Bean
   public EntityDictionary entityDictionary(AutowireCapableBeanFactory beanFactory) {
-    final EntityDictionary entityDictionary = new EntityDictionary(Map.of(), new Injector() {
+    final EntityDictionary entityDictionary = new EntityDictionary(Map.of(), Map.of(), new Injector() {
       @Override
       public void inject(Object entity) {
         beanFactory.autowireBean(entity);
@@ -91,7 +96,10 @@ public void inject(Object entity) {
       public <T> T instantiate(Class<T> cls) {
         return beanFactory.createBean(cls);
       }
-    });
+    },
+      CoerceUtil::lookup,
+      Set.of(),
+      new DefaultClassScanner());
 
     entityDictionary.scanForSecurityChecks();
 
diff --git a/src/main/java/com/faforever/api/config/elide/SpringHibernateDataStore.java b/src/main/java/com/faforever/api/config/elide/SpringHibernateDataStore.java
@@ -17,101 +17,40 @@
 package com.faforever.api.config.elide;
 
 import com.google.common.base.Preconditions;
-import com.yahoo.elide.core.datastore.DataStore;
 import com.yahoo.elide.core.datastore.DataStoreTransaction;
-import com.yahoo.elide.core.dictionary.EntityDictionary;
-import com.yahoo.elide.core.utils.TypeHelper;
-import org.hibernate.ScrollMode;
+import com.yahoo.elide.datastores.jpa.JpaDataStore;
 import org.hibernate.Session;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 import javax.persistence.EntityManager;
-import javax.persistence.metamodel.EntityType;
-import java.util.Objects;
-import java.util.Set;
 
-/**
- * Spring Hibernate DataStore.
- *
- * @author olOwOlo
- */
-public class SpringHibernateDataStore implements DataStore {
-
-  private static final Logger logger = LoggerFactory.getLogger(SpringHibernateDataStore.class);
+public class SpringHibernateDataStore extends JpaDataStore {
 
   protected final PlatformTransactionManager txManager;
   protected final EntityManager entityManager;
-  protected final boolean isScrollEnabled;
-  protected final ScrollMode scrollMode;
   protected final HibernateTransactionSupplier transactionSupplier;
 
-  /**
-   * Constructor.
-   *
-   * @param txManager Spring PlatformTransactionManager
-   * @param entityManager EntityManager
-   * @param isScrollEnabled Whether or not scrolling is enabled on driver
-   * @param scrollMode Scroll mode to use for scrolling driver
-   */
-  public SpringHibernateDataStore(PlatformTransactionManager txManager,
-                                  EntityManager entityManager,
-                                  boolean isScrollEnabled,
-                                  ScrollMode scrollMode) {
-    this(txManager, entityManager, isScrollEnabled, scrollMode, SpringHibernateTransaction::new);
+  public SpringHibernateDataStore(
+    PlatformTransactionManager txManager,
+    EntityManager entityManager
+  ) {
+    this(txManager, entityManager, SpringHibernateTransaction::new);
   }
 
-  /**
-   * <p>Constructor.</p>
-   * Useful for extending the store and relying on existing code to instantiate custom hibernate transaction.
-   *
-   * @param txManager Spring PlatformTransactionManager
-   * @param entityManager EntityManager factory
-   * @param isScrollEnabled Whether or not scrolling is enabled on driver
-   * @param scrollMode Scroll mode to use for scrolling driver
-   * @param transactionSupplier Supplier for transaction
-   */
-  protected SpringHibernateDataStore(PlatformTransactionManager txManager,
-                                     EntityManager entityManager,
-                                     boolean isScrollEnabled,
-                                     ScrollMode scrollMode,
-                                     HibernateTransactionSupplier transactionSupplier) {
+  protected SpringHibernateDataStore(
+    PlatformTransactionManager txManager,
+    EntityManager entityManager,
+    HibernateTransactionSupplier transactionSupplier
+  ) {
+    super(() -> entityManager, null);
     this.txManager = txManager;
     this.entityManager = entityManager;
-    this.isScrollEnabled = isScrollEnabled;
-    this.scrollMode = scrollMode;
     this.transactionSupplier = transactionSupplier;
   }
 
-  @Override
-  public void populateEntityDictionary(EntityDictionary dictionary) {
-    Set<EntityType<?>> entities = entityManager.getMetamodel().getEntities();
-    /* bind all entities */
-    entities.stream()
-      .map(EntityType::getJavaType)
-      .filter(Objects::nonNull)
-      .forEach(mappedClass -> {
-        try {
-          // Ignore this result.
-          // We are just checking to see if it throws an exception meaning that
-          // provided class was _not_ an entity.
-          dictionary.lookupEntityClass(TypeHelper.getClassType(mappedClass));
-          // Bind if successful
-          dictionary.bindEntity(mappedClass);
-        } catch (IllegalArgumentException e) {
-          // Ignore this entity
-          // Turns out that hibernate may include non-entity types in this list when using things
-          // like envers. Since they are not entities, we do not want to bind them into the entity
-          // dictionary
-          logger.debug("Ignoring entity", e);
-        }
-      });
-  }
-
   @Override
   public DataStoreTransaction beginTransaction() {
     // begin a spring transaction
@@ -123,15 +62,28 @@ public DataStoreTransaction beginTransaction() {
     Session session = entityManager.unwrap(Session.class);
     Preconditions.checkNotNull(session);
 
-    return transactionSupplier.get(session, txManager, txStatus, isScrollEnabled, scrollMode);
+    return transactionSupplier.get(session, txManager, txStatus);
+  }
+
+  @Override
+  public DataStoreTransaction beginReadTransaction() {
+    // begin a spring transaction
+    DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+    def.setName("elide read transaction");
+    def.setReadOnly(true);
+    TransactionStatus txStatus = txManager.getTransaction(def);
+
+    Session session = entityManager.unwrap(Session.class);
+    Preconditions.checkNotNull(session);
+
+    return transactionSupplier.get(session, txManager, txStatus);
   }
 
   /**
    * Functional interface for describing a method to supply a custom Hibernate transaction.
    */
   @FunctionalInterface
   public interface HibernateTransactionSupplier {
-    SpringHibernateTransaction get(Session session, PlatformTransactionManager txManager,
-                                   TransactionStatus txStatus, boolean isScrollEnabled, ScrollMode scrollMode);
+    SpringHibernateTransaction get(Session session, PlatformTransactionManager txManager, TransactionStatus txStatus);
   }
 }
diff --git a/src/main/java/com/faforever/api/config/elide/SpringHibernateTransaction.java b/src/main/java/com/faforever/api/config/elide/SpringHibernateTransaction.java
@@ -18,45 +18,41 @@
 
 import com.yahoo.elide.core.RequestScope;
 import com.yahoo.elide.core.exceptions.TransactionException;
-import com.yahoo.elide.datastores.hibernate5.HibernateTransaction;
-import org.hibernate.ScrollMode;
+import com.yahoo.elide.datastores.jpa.transaction.AbstractJpaTransaction;
+import com.yahoo.elide.datastores.jpql.query.DefaultQueryLogger;
 import org.hibernate.Session;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 
 import java.io.IOException;
 
-/**
- * Spring Hibernate Transaction.
- *
- * @author olOwOlo
- */
-public class SpringHibernateTransaction extends HibernateTransaction {
+public class SpringHibernateTransaction extends AbstractJpaTransaction {
 
   private final Session session;
   private final TransactionStatus txStatus;
   private final PlatformTransactionManager txManager;
 
-  /**
-   * Constructor.
-   *
-   * @param session Hibernate session
-   * @param txManager Spring PlatformTransactionManager
-   * @param txStatus Spring Transaction status
-   * @param isScrollEnabled Whether or not scrolling is enabled
-   * @param scrollMode Scroll mode to use if scrolling enabled
-   */
-  protected SpringHibernateTransaction(Session session,
-                                       PlatformTransactionManager txManager,
-                                       TransactionStatus txStatus,
-                                       boolean isScrollEnabled,
-                                       ScrollMode scrollMode) {
-    super(session, isScrollEnabled, scrollMode);
+  protected SpringHibernateTransaction(
+    Session session,
+    PlatformTransactionManager txManager,
+    TransactionStatus txStatus
+  ) {
+    super(session, em -> em.unwrap(Session.class).cancelQuery(), new DefaultQueryLogger(), true, true);
     this.session = session;
     this.txManager = txManager;
     this.txStatus = txStatus;
   }
 
+  @Override
+  public void begin() {
+    //no op
+  }
+
+  @Override
+  public boolean isOpen() {
+    return session.isOpen() && !txStatus.isCompleted();
+  }
+
   @Override
   public void commit(RequestScope scope) {
     try {
@@ -69,10 +65,9 @@ public void commit(RequestScope scope) {
 
   @Override
   public void close() throws IOException {
-    if (session.isOpen() && !txStatus.isCompleted()) {
+    if (isOpen()) {
       txManager.rollback(txStatus);
       throw new IOException("Transaction not closed");
     }
   }
-
 }
diff --git a/src/main/resources/config/application-local.yml b/src/main/resources/config/application-local.yml
@@ -74,4 +74,3 @@ spring:
 logging:
   level:
     com.faforever.api: debug
-

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import com.faforever.api.config.elide.SpringHibernateDataStore;`
`4`	`4`	`import com.yahoo.elide.core.datastore.DataStore;`
`5`		`-import org.hibernate.ScrollMode;`
`6`	`5`	`import org.hibernate.cfg.AvailableSettings;`
`7`	`6`	`import org.springframework.beans.factory.annotation.Qualifier;`
`8`	`7`	`import org.springframework.beans.factory.support.DefaultListableBeanFactory;`
`@@ -77,6 +76,6 @@ DataStore fafDataStore(`
`77`	`76`	`@Qualifier("fafTransactionManager") PlatformTransactionManager fafTransactionManager,`
`78`	`77`	`@Qualifier("fafEntityManagerFactory") EntityManager entityManager`
`79`	`78`	`) {`
`80`		`- return new SpringHibernateDataStore(fafTransactionManager, entityManager, true, ScrollMode.FORWARD_ONLY);`
	`79`	`+ return new SpringHibernateDataStore(fafTransactionManager, entityManager);`
`81`	`80`	`}`
`82`	`81`	`}`