[#1832] Fix over-fetching of entity view data with dynamic fetches

Author: beikov

CHANGELOG.md

@@ -10,7 +10,7 @@ None yet
 
 ### Bug fixes
 
-None yet
+* Fix over-fetching of entity view data with dynamic fetches
 
 ### Backwards-incompatible changes
 

entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/objectbuilder/ViewTypeObjectBuilder.java

@@ -101,15 +101,15 @@ public <X extends SelectBuilder<X>> void applySelects(X queryBuilder) {
             if (secondaryMappers.length != 0) {
                 FullQueryBuilder<?, ?> fullQueryBuilder = (FullQueryBuilder<?, ?>) queryBuilder;
                 for (SecondaryMapper viewRoot : secondaryMappers) {
-                    if (hasSubFetches(viewRoot.getAttributePath())) {
+                    if (hasSubFetches(fetches, viewRoot.getAttributePath())) {
                         viewRoot.apply(fullQueryBuilder, parameterHolder, optionalParameters, viewJpqlMacro, embeddingViewJpqlMacro);
                     }
                 }
             }
             for (int i = 0; i < mappers.length; i++) {
                 TupleElementMapper mapper = mappers[i];
                 String attributePath = mapper.getAttributePath();
-                if (attributePath != null && hasSubFetches(attributePath)) {
+                if (attributePath != null && hasSubFetches(fetches, attributePath)) {
                     mapper.applyMapping(queryBuilder, parameterHolder, optionalParameters, viewJpqlMacro, embeddingViewJpqlMacro, false);
                 } else {
                     queryBuilder.select("NULL");
@@ -118,8 +118,11 @@ public <X extends SelectBuilder<X>> void applySelects(X queryBuilder) {
         }
     }
 
-    private boolean hasSubFetches(String attributePath) {
+    static boolean hasSubFetches(NavigableSet<String> fetches, String attributePath) {
+        // Fetches can never contain a path leading to a view i.e. one for which a dot is allowed to follow.
+        // To find a potential match in the fetches, we have to look for an entry that is greater-or-equal to a path
+        // See EntityViewConfiguration.getFetches(Collection, ManagedViewTypeImplementor)
         String fetchedPath = fetches.ceiling(attributePath);
-        return fetchedPath != null && (fetchedPath.length() == attributePath.length() || fetchedPath.startsWith(attributePath) && fetchedPath.length() > attributePath.length() && fetchedPath.charAt(attributePath.length()) == '.');
+        return fetchedPath != null && fetchedPath.startsWith(attributePath) && (fetchedPath.length() == attributePath.length() || fetchedPath.charAt(attributePath.length()) == '.');
     }
 }

entity-view/impl/src/test/java/com/blazebit/persistence/view/impl/objectbuilder/ViewTypeObjectBuilderTest.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2014 - 2023 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.blazebit.persistence.view.impl.objectbuilder;
+
+import java.util.TreeSet;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ *
+ * @author Christian Beikov
+ * @since 1.6.11
+ */
+public class ViewTypeObjectBuilderTest {
+
+	// Test for #1832
+	@Test
+	public void hasSubFetches() {
+		TreeSet<String> fetches = new TreeSet<>();
+		fetches.add( "id" );
+		fetches.add( "bbbbbb" );
+		fetches.add( "a.name" );
+		assertTrue(ViewTypeObjectBuilder.hasSubFetches(fetches, "id"));
+		assertTrue(ViewTypeObjectBuilder.hasSubFetches(fetches, "bbbbbb"));
+		assertFalse(ViewTypeObjectBuilder.hasSubFetches(fetches, "aaa.id"));
+		assertFalse(ViewTypeObjectBuilder.hasSubFetches(fetches, "ccc.id"));
+		assertFalse(ViewTypeObjectBuilder.hasSubFetches(fetches, "bbbbb"));
+		assertFalse(ViewTypeObjectBuilder.hasSubFetches(fetches, "bbbbbbb"));
+		assertTrue(ViewTypeObjectBuilder.hasSubFetches(fetches, "a"));
+		assertTrue(ViewTypeObjectBuilder.hasSubFetches(fetches, "a.name"));
+		assertFalse(ViewTypeObjectBuilder.hasSubFetches(fetches, "a.id"));
+	}
+}