Small Spring restructurings. Improve cyclic join error message. Unwra…

…p object array when using a PaginatedCriteriaBuilder with keyset extraction without an object builder. Align Spring Data with Deltaspike Data regarding ad-hoc entity view usage. Update version numbers everywhere to the 3 part variant. Remove emails from author tags

archetype/spring-boot-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java

@@ -22,7 +22,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.spring.impl.EnableEntityViews;
-import com.blazebit.persistence.spring.data.impl.repository.EntityViewRepositoryFactoryBean;
+import com.blazebit.persistence.spring.data.impl.repository.BlazePersistenceRepositoryFactoryBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,7 +38,7 @@
 @EnableEntityViews(basePackages = { "${package}.view"})
 @EnableJpaRepositories(
         basePackages = "${package}.repository",
-        repositoryFactoryBeanClass = EntityViewRepositoryFactoryBean.class)
+        repositoryFactoryBeanClass = BlazePersistenceRepositoryFactoryBean.class)
 public class BlazePersistenceConfiguration {
 
     @PersistenceUnit

archetype/spring-boot-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java

@@ -32,7 +32,7 @@
 import org.springframework.beans.factory.annotation.*;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import com.blazebit.persistence.view.spring.impl.EnableEntityViews;
-import com.blazebit.persistence.spring.data.impl.repository.EntityViewRepositoryFactoryBean;
+import com.blazebit.persistence.spring.data.impl.repository.BlazePersistenceRepositoryFactoryBean;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = SampleTest.TestConfig.class)
@@ -58,7 +58,7 @@ public void sampleTest() {
     @EnableJpaRepositories(
             basePackages = "${package}.repository",
             entityManagerFactoryRef = "myEmf",
-            repositoryFactoryBeanClass = EntityViewRepositoryFactoryBean.class)
+            repositoryFactoryBeanClass = BlazePersistenceRepositoryFactoryBean.class)
     static class TestConfig {
     }
 }

archetype/spring-data-sample/src/main/resources/archetype-resources/src/main/java/config/BlazePersistenceConfiguration.java

@@ -22,7 +22,7 @@
 import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.spi.EntityViewConfiguration;
 import com.blazebit.persistence.view.spring.impl.EnableEntityViews;
-import com.blazebit.persistence.spring.data.impl.repository.EntityViewRepositoryFactoryBean;
+import com.blazebit.persistence.spring.data.impl.repository.BlazePersistenceRepositoryFactoryBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -38,7 +38,7 @@
 @EnableEntityViews(basePackages = { "${package}.view"})
 @EnableJpaRepositories(
         basePackages = "${package}.repository",
-        repositoryFactoryBeanClass = EntityViewRepositoryFactoryBean.class)
+        repositoryFactoryBeanClass = BlazePersistenceRepositoryFactoryBean.class)
 public class BlazePersistenceConfiguration {
 
     @PersistenceUnit

archetype/spring-data-sample/src/main/resources/archetype-resources/src/test/java/sample/SampleTest.java

@@ -32,7 +32,7 @@
 import org.springframework.beans.factory.annotation.*;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import com.blazebit.persistence.view.spring.impl.EnableEntityViews;
-import com.blazebit.persistence.spring.data.impl.repository.EntityViewRepositoryFactoryBean;
+import com.blazebit.persistence.spring.data.impl.repository.BlazePersistenceRepositoryFactoryBean;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = SampleTest.TestConfig.class)
@@ -58,7 +58,7 @@ public void sampleTest() {
     @EnableJpaRepositories(
             basePackages = "${package}.repository",
             entityManagerFactoryRef = "myEmf",
-            repositoryFactoryBeanClass = EntityViewRepositoryFactoryBean.class)
+            repositoryFactoryBeanClass = BlazePersistenceRepositoryFactoryBean.class)
     static class TestConfig {
     }
 }

core/impl/src/main/java/com/blazebit/persistence/impl/AbstractCommonQueryBuilder.java

@@ -109,7 +109,7 @@
  * @param <SubquerySetReturn> The builder type that should be returned on subquery set operations
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public abstract class AbstractCommonQueryBuilder<QueryResultType, BuilderType, SetReturn, SubquerySetReturn, FinalSetReturn extends BaseFinalSetOperationBuilderImpl<?, ?, ?>> implements ServiceProvider, ConfigurationSource {
 

core/impl/src/main/java/com/blazebit/persistence/impl/AbstractFullQueryBuilder.java

@@ -35,7 +35,7 @@
  * @param <X> The concrete builder type
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public abstract class AbstractFullQueryBuilder<T, X extends FullQueryBuilder<T, X>, Z, W, FinalSetReturn extends BaseFinalSetOperationBuilderImpl<T, ?, ?>> extends AbstractQueryBuilder<T, X, Z, W, FinalSetReturn> implements FullQueryBuilder<T, X> {
 

core/impl/src/main/java/com/blazebit/persistence/impl/AbstractManager.java

@@ -26,7 +26,7 @@
 /**
  *
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public abstract class AbstractManager<T extends ExpressionModifier> {
 

core/impl/src/main/java/com/blazebit/persistence/impl/AbstractQueryBuilder.java

@@ -30,7 +30,7 @@
  * @param <X> The concrete builder type
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public abstract class AbstractQueryBuilder<T, X extends Queryable<T, X>, Z, W, FinalSetReturn extends BaseFinalSetOperationBuilderImpl<T, ?, ?>> extends AbstractCommonQueryBuilder<T, X, Z, W, FinalSetReturn> implements Queryable<T, X> {
 

core/impl/src/main/java/com/blazebit/persistence/impl/AliasInfo.java

@@ -19,7 +19,7 @@
 /**
  *
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public interface AliasInfo {
 

core/impl/src/main/java/com/blazebit/persistence/impl/AliasManager.java

@@ -22,7 +22,7 @@
 /**
  *
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class AliasManager {
 

core/impl/src/main/java/com/blazebit/persistence/impl/BaseSubqueryBuilderImpl.java

@@ -31,7 +31,7 @@
  *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public abstract class BaseSubqueryBuilderImpl<T, X, Y extends BaseOngoingSetOperationBuilder<?, ?, ?>, Z extends BaseOngoingSetOperationBuilder<?, ?, ?>> extends AbstractCommonQueryBuilder<Tuple, X, Y, Z, BaseFinalSetOperationSubqueryBuilderImpl<T, ?>> implements SubqueryInternalBuilder<T> {
 

core/impl/src/main/java/com/blazebit/persistence/impl/ConfigurationProperties.java

@@ -20,7 +20,7 @@
  *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public final class ConfigurationProperties {
 

core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderConfigurationImpl.java

@@ -171,7 +171,7 @@
  *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class CriteriaBuilderConfigurationImpl implements CriteriaBuilderConfiguration {
 

core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderConfigurationProviderImpl.java

@@ -24,7 +24,7 @@
 /**
  *
  * @author Christian Beikov
- * @since 1.0
+ * @since 1.0.0
  */
 public class CriteriaBuilderConfigurationProviderImpl implements CriteriaBuilderConfigurationProvider {
 

core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderFactoryImpl.java

@@ -51,7 +51,7 @@
 /**
  *
  * @author Christian Beikov
- * @since 1.0
+ * @since 1.0.0
  */
 public class CriteriaBuilderFactoryImpl implements CriteriaBuilderFactory {
 

core/impl/src/main/java/com/blazebit/persistence/impl/CriteriaBuilderImpl.java

@@ -29,7 +29,7 @@
  * @param <T> The query result type
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class CriteriaBuilderImpl<T> extends AbstractFullQueryBuilder<T, CriteriaBuilder<T>, LeafOngoingSetOperationCriteriaBuilder<T>, StartOngoingSetOperationCriteriaBuilder<T, LeafOngoingFinalSetOperationCriteriaBuilder<T>>, BaseFinalSetOperationCriteriaBuilderImpl<T, ?>> implements CriteriaBuilder<T> {
 

core/impl/src/main/java/com/blazebit/persistence/impl/ExpressionUtils.java

@@ -62,7 +62,7 @@
  *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class ExpressionUtils {
 

core/impl/src/main/java/com/blazebit/persistence/impl/ExternalAliasDereferencingException.java

@@ -19,7 +19,7 @@
 /**
  *
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class ExternalAliasDereferencingException extends RuntimeException {
 

core/impl/src/main/java/com/blazebit/persistence/impl/GroupByManager.java

@@ -29,7 +29,7 @@
  *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class GroupByManager extends AbstractManager<ExpressionModifier> {
 

core/impl/src/main/java/com/blazebit/persistence/impl/HavingManager.java

@@ -25,7 +25,7 @@
 /**
  *
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class HavingManager<T> extends PredicateManager<T> {
 

core/impl/src/main/java/com/blazebit/persistence/impl/IllegalSubqueryDetector.java

@@ -24,7 +24,7 @@
  *
  * @author Moritz Becker
  * @author Christian Beikov
- * @since 1.0
+ * @since 1.0.0
  */
 public class IllegalSubqueryDetector extends VisitorAdapter {
 

core/impl/src/main/java/com/blazebit/persistence/impl/JoinAliasInfo.java

@@ -20,7 +20,7 @@
  *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class JoinAliasInfo implements AliasInfo {
 

core/impl/src/main/java/com/blazebit/persistence/impl/JoinManager.java

@@ -85,7 +85,7 @@
 /**
  * @author Moritz Becker
  * @author Christian Beikov
- * @since 1.0
+ * @since 1.0.0
  */
 public class JoinManager extends AbstractManager<ExpressionModifier> {
 
@@ -1104,8 +1104,19 @@ private void renderReverseDependency(StringBuilder sb, JoinNode dependency, Stri
                 try {
                     for (JoinNode dep : dependency.getDependencies()) {
                         if (markedJoinNodes.contains(dep)) {
-                            throw new IllegalStateException("Cyclic join dependency detected at absolute path ["
-                                    + dep.getAliasInfo().getAbsolutePath() + "] with alias [" + dep.getAliasInfo().getAlias() + "]");
+                            StringBuilder errorSb = new StringBuilder();
+                            errorSb.append("Cyclic join dependency between nodes: [");
+                            for (JoinNode seenNode : markedJoinNodes) {
+                                errorSb.append(seenNode.getAliasInfo().getAlias());
+                                if (seenNode.getAliasInfo().isImplicit()) {
+                                    errorSb.append('(').append(seenNode.getAliasInfo().getAbsolutePath()).append(')');
+                                }
+                                errorSb.append(", ");
+                            }
+                            errorSb.setLength(errorSb.length() - 2);
+                            errorSb.append(']');
+
+                            throw new IllegalStateException(errorSb.toString());
                         }
                         // render reverse dependencies
                         renderReverseDependency(sb, dep, aliasPrefix, renderFetches, nodesToFetch, whereConjuncts);
@@ -1720,7 +1731,11 @@ public void implicitJoin(Expression expression, boolean objectLeafAllowed, Strin
 
             // Don't forget to update the clause dependencies!!
             if (fromClause != null) {
-                updateClauseDependencies(result.baseNode, fromClause, new HashSet<JoinNode>());
+                try {
+                    updateClauseDependencies(result.baseNode, fromClause, new LinkedHashSet<JoinNode>());
+                } catch (IllegalStateException ex) {
+                    throw new IllegalArgumentException("Implicit join in expression '" + expression + "' introduces cyclic join dependency!", ex);
+                }
             }
 
             if (result.isLazy()) {
@@ -2253,8 +2268,18 @@ private JoinResult implicitJoinSingle(JoinNode baseNode, String attributeName, b
 
     private void updateClauseDependencies(JoinNode baseNode, ClauseType clauseDependency, Set<JoinNode> seenNodes) {
         if (!seenNodes.add(baseNode)) {
-            // Cyclic dependency
-            throw new IllegalStateException("Cyclic join dependency: " + seenNodes);
+            StringBuilder errorSb = new StringBuilder();
+            errorSb.append("Cyclic join dependency between nodes: ");
+            for (JoinNode seenNode : seenNodes) {
+                errorSb.append(seenNode.getAliasInfo().getAlias());
+                if (seenNode.getAliasInfo().isImplicit()) {
+                    errorSb.append('(').append(seenNode.getAliasInfo().getAbsolutePath()).append(')');
+                }
+                errorSb.append(" -> ");
+            }
+            errorSb.setLength(errorSb.length() - 4);
+
+            throw new IllegalStateException(errorSb.toString());
         }
 
         JoinNode current = baseNode;

core/impl/src/main/java/com/blazebit/persistence/impl/JoinNode.java

@@ -55,7 +55,7 @@
  *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class JoinNode implements From, ExpressionModifier, BaseNode {
 

core/impl/src/main/java/com/blazebit/persistence/impl/JoinNodeVisitor.java

@@ -19,7 +19,7 @@
 /**
  *
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public interface JoinNodeVisitor {
 

core/impl/src/main/java/com/blazebit/persistence/impl/JoinTreeNode.java

@@ -26,7 +26,7 @@
 /**
  *
  * @author Christian Beikov
- * @since 1.0
+ * @since 1.0.0
  */
 public class JoinTreeNode {
 

core/impl/src/main/java/com/blazebit/persistence/impl/JoinVisitor.java

@@ -34,7 +34,7 @@
  *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class JoinVisitor extends VisitorAdapter {
 

core/impl/src/main/java/com/blazebit/persistence/impl/JpaUtils.java

@@ -26,7 +26,7 @@
 /**
  *
  * @author Christian Beikov
- * @since 1.0
+ * @since 1.0.0
  */
 public final class JpaUtils {
 

core/impl/src/main/java/com/blazebit/persistence/impl/NodeInfo.java

@@ -23,7 +23,7 @@
  *
  * @author Moritz Becker
  * @author Christian Beikov
- * @since 1.0
+ * @since 1.0.0
  */
 public class NodeInfo implements ExpressionModifier {
 

core/impl/src/main/java/com/blazebit/persistence/impl/OrderByExpression.java

@@ -21,7 +21,7 @@
 /**
  *
  * @author Christian Beikov
- * @since 1.0
+ * @since 1.0.0
  */
 public final class OrderByExpression {
 

core/impl/src/main/java/com/blazebit/persistence/impl/OrderByManager.java

@@ -30,7 +30,7 @@
 /**
  *
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class OrderByManager extends AbstractManager<ExpressionModifier> {
 

core/impl/src/main/java/com/blazebit/persistence/impl/PagedListImpl.java

@@ -27,7 +27,7 @@
  * @param <T> the type of elements in this list
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class PagedListImpl<T> extends ArrayList<T> implements PagedList<T> {
 

core/impl/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java

@@ -53,7 +53,7 @@
  *
  * @author Christian Beikov
  * @author Moritz Becker
- * @since 1.0
+ * @since 1.0.0
  */
 public class PaginatedCriteriaBuilderImpl<T> extends AbstractFullQueryBuilder<T, PaginatedCriteriaBuilder<T>, PaginatedCriteriaBuilderImpl<T>, PaginatedCriteriaBuilderImpl<T>, BaseFinalSetOperationBuilderImpl<T, ?, ?>> implements PaginatedCriteriaBuilder<T> {
 
@@ -392,7 +392,7 @@ private Map.Entry<TypedQuery<T>, KeysetExtractionObjectBuilder<T>> getObjectQuer
             int keysetSize = orderByManager.getOrderByCount();
 
             if (transformerObjectBuilder == null) {
-                objectBuilder = new KeysetExtractionObjectBuilder<T>(keysetSize, keysetMode);
+                objectBuilder = new KeysetExtractionObjectBuilder<T>(keysetSize, keysetMode, selectManager.getExpectedQueryResultType() != Object[].class);
             } else {
                 objectBuilder = new DelegatingKeysetExtractionObjectBuilder<T>(transformerObjectBuilder, keysetSize, keysetMode);
             }