feat: properly handling repository inheritance (with specific-to-generic precedence) (#116)

Author: brian-mulier

tzatziki-spring-jpa/src/main/java/com/decathlon/tzatziki/steps/SpringJPASteps.java

@@ -67,10 +67,14 @@ public void before() {
         if (crudRepositoryByClass == null) {
             crudRepositoryByClass = spring.applicationContext().getBeansOfType(CrudRepository.class).values()
                     .stream()
-                    .<Map.Entry<Class<?>, CrudRepository<?, ?>>>mapMulti((crudRepository, consumer) -> {
-                        Map<TypeVariable<?>, Type> typeArguments = TypeUtils.getTypeArguments(crudRepository.getClass(), CrudRepository.class);
-                        Type type = typeArguments.get(CrudRepository.class.getTypeParameters()[0]);
-
+                    .map(crudRepository -> Map.entry(crudRepository, TypeUtils.getTypeArguments(crudRepository.getClass(), CrudRepository.class).get(CrudRepository.class.getTypeParameters()[0])))
+                    .sorted((e1, e2) -> {
+                        if(e1.getValue() instanceof Class) return -1;
+                        return e2.getValue() instanceof Class ? 1 : 0;
+                    })
+                    .<Map.Entry<Class<?>, CrudRepository<?, ?>>>mapMulti((crudRepositoryWithType, consumer) -> {
+                        CrudRepository<?, ?> crudRepository = crudRepositoryWithType.getKey();
+                        Type type = crudRepositoryWithType.getValue();
                         if (type instanceof TypeVariable<?> typeVariable) {
                             type = typeVariable.getBounds()[0];
                             TypeParser.getSubtypesOf((Class<?>) type)
@@ -81,7 +85,8 @@ public void before() {
                     })
                     .collect(Collectors.toMap(
                             Map.Entry::getKey,
-                            Map.Entry::getValue
+                            Map.Entry::getValue,
+                            (v1, v2) -> v1
                     ));
         }
         if (entityClassByTableName == null) {
@@ -234,7 +239,9 @@ private Type entityTypeByTableNameOrClassName(String entityTableOrClass) {
 
     public <E> CrudRepository<E, ?> getRepositoryByType(Type type) {
         if (Types.isAssignableTo(type, CrudRepository.class)) {
-            return spring.applicationContext().getBean(Types.rawTypeOf(type));
+            return ((CrudRepository<E, ?>) spring.applicationContext().getBeansOfType(Types.rawTypeOf(type)).values().stream()
+                    .sorted((b1, b2) -> b1.getClass() == type ? -1 : 1)
+                    .findFirst().get());
         }
         throw new AssertionError(type + " is not a CrudRepository!");
     }

tzatziki-spring-jpa/src/test/java/com/decathlon/tzatziki/app/aspects/SuperUserCrudSavePrefixerAspect.java

@@ -0,0 +1,21 @@
+package com.decathlon.tzatziki.app.aspects;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import com.decathlon.tzatziki.app.model.SuperUser;
+
+import java.util.Arrays;
+
+@Aspect
+@Configuration
+@EnableAspectJAutoProxy
+public class SuperUserCrudSavePrefixerAspect {
+    @Around(value = "execution(* com.decathlon.tzatziki.app.dao.SuperUserDataSpringRepository.saveAll(..))")
+    public Object addPrefixToRoles(ProceedingJoinPoint joinPoint) throws Throwable {
+        ((Iterable<SuperUser>) Arrays.stream(joinPoint.getArgs()).findFirst().get()).forEach(superUser -> superUser.setRole("superUser_"+superUser.getRole()));
+        return joinPoint.proceed();
+    }
+}

tzatziki-spring-jpa/src/test/java/com/decathlon/tzatziki/app/dao/SuperUserDataSpringRepository.java

@@ -0,0 +1,6 @@
+package com.decathlon.tzatziki.app.dao;
+
+import com.decathlon.tzatziki.app.model.SuperUser;
+
+
+public interface SuperUserDataSpringRepository extends UserDataSpringRepository<SuperUser> {}

tzatziki-spring-jpa/src/test/java/com/decathlon/tzatziki/app/model/SuperUser.java

@@ -2,6 +2,7 @@
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -12,6 +13,7 @@
 @NoArgsConstructor
 @Table(name = "super_users")
 public class SuperUser extends User {
+    @Setter
     @Column(name = "role")
     String role;
 }

tzatziki-spring-jpa/src/test/resources/com/decathlon/tzatziki/steps/spring-jpa.feature

@@ -237,9 +237,9 @@ Feature: to interact with a spring boot service having a persistence layer
       | 1  | Darth     | Vader     | admin |
       | 2  | Anakin    | Skywalker | dummy |
     Then the super_users table contains:
-      | id | firstName | lastName  | role  |
-      | 1  | Darth     | Vader     | admin |
-      | 2  | Anakin    | Skywalker | dummy |
+      | id | firstName | lastName  | role            |
+      | 1  | Darth     | Vader     | superUser_admin |
+      | 2  | Anakin    | Skywalker | superUser_dummy |
 
   Scenario: if we have a table which is handled by multiple entities, we should prioritize entity types from default parser package
     # non-default package, should not be used and throw an exception