PR feedback

Author: rschev

contentgrid-appserver-application-model/src/main/java/com/contentgrid/appserver/application/model/Application.java

@@ -10,6 +10,7 @@
 import com.contentgrid.appserver.application.model.searchfilters.AttributeSearchFilter;
 import com.contentgrid.appserver.application.model.values.ApplicationName;
 import com.contentgrid.appserver.application.model.values.AttributeName;
+import com.contentgrid.appserver.application.model.values.AttributePath;
 import com.contentgrid.appserver.application.model.values.EntityName;
 import com.contentgrid.appserver.application.model.values.LinkName;
 import com.contentgrid.appserver.application.model.values.PathSegmentName;
@@ -238,7 +239,7 @@ private void validateEntitySearchFilters(Entity entity) {
         entity.getSearchFilters().forEach(searchFilter -> {
             if (searchFilter instanceof AttributeSearchFilter attributeSearchFilter) {
                 try {
-                    var resolvedAttribute = resolveAttributePath(entity, attributeSearchFilter.getAttributePath());
+                    var resolvedAttribute = resolvePropertyPath(entity, attributeSearchFilter.getAttributePath());
                     if (resolvedAttribute.getType() != attributeSearchFilter.getAttributeType()) {
                         throw new InvalidArgumentModelException(
                             "SearchFilter %s does not match the type of attribute %s (%s != %s)".formatted(
@@ -253,7 +254,7 @@ private void validateEntitySearchFilters(Entity entity) {
         });
     }
 
-    private SimpleAttribute resolveAttributePath(Entity entity, PropertyPath path) {
+    private SimpleAttribute resolvePropertyPath(Entity entity, PropertyPath path) {
         Entity currentEntity = entity;
         PropertyPath currentPath = path;
 
@@ -263,7 +264,7 @@ private SimpleAttribute resolveAttributePath(Entity entity, PropertyPath path) {
             switch (name) {
                 case AttributeName ignored -> {
                     // When we hit an attribute, validate the remaining path via the current entity
-                    return currentEntity.resolveAttributePath(currentPath);
+                    return currentEntity.resolveAttributePath((AttributePath) currentPath);
                 }
                 case RelationName relationName -> {
                     final String entityName = currentEntity.getName().getValue(); // Make final for lambda

contentgrid-appserver-application-model/src/main/java/com/contentgrid/appserver/application/model/Entity.java

@@ -254,12 +254,8 @@ private static List<ContentAttribute> getContentAttributes(List<Attribute> attri
         return result;
     }
 
-    public SimpleAttribute resolveAttributePath(@NonNull PropertyPath attributePath) {
-        return switch (attributePath) {
-            case AttributePath attrPath -> resolveAttributePath(this, attrPath);
-            case RelationPath ignored -> throw new UnsupportedOperationException("Can't resolve paths across relations"
-                    + " from the Entity, try via Application instead.");
-        };
+    public SimpleAttribute resolveAttributePath(@NonNull AttributePath attributePath) {
+        return resolveAttributePath(this, attributePath);
     }
 
     private static SimpleAttribute resolveAttributePath(@NonNull HasAttributes container, @NonNull AttributePath attributePath) {

contentgrid-appserver-domain/src/main/java/com/contentgrid/appserver/domain/ThunkExpressionGenerator.java

@@ -8,6 +8,7 @@
 import com.contentgrid.appserver.application.model.searchfilters.ExactSearchFilter;
 import com.contentgrid.appserver.application.model.searchfilters.SearchFilter;
 import com.contentgrid.appserver.application.model.values.AttributeName;
+import com.contentgrid.appserver.application.model.values.AttributePath;
 import com.contentgrid.appserver.application.model.values.FilterName;
 import com.contentgrid.appserver.application.model.values.PropertyName;
 import com.contentgrid.appserver.application.model.values.PropertyPath;
@@ -109,7 +110,7 @@ private static Stream<PathElement> convertPath(Application application, Entity e
                 case AttributeName ignored -> {
                     // If the remaining path is just (composite) attributes, validate the path via the current entity
                     // This throws if there is an invalid link
-                    currentEntity.resolveAttributePath(currentPath);
+                    currentEntity.resolveAttributePath((AttributePath) currentPath);
 
                     // Convert the rest of the path using toList()
                     return Stream.concat(