Changed class and method names for clarity

Author: hylkevds

FROST-Server.SQLjooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/ExpressionHelper.java

@@ -216,7 +216,7 @@ private void handleEntityProperty(PathState state, Path path, EntityPropertyMain
             if (state.parentPropFields == null) {
                 state.parentPropFields = state.pathTableRef.getTable()
                         .getPropertyFieldRegistry()
-                        .getSelectFieldsForProperty(element);
+                        .getPropertyFieldsForProperty(element);
             } else {
                 state.parentPropFields = state.parentPropFields.getSubField(element);
             }
@@ -231,11 +231,11 @@ private void handleEntityProperty(PathState state, Path path, EntityPropertyMain
             }
             pathExpressions = state.pathTableRef.getTable()
                     .getPropertyFieldRegistry()
-                    .resolveFieldsForProperty(state.parentPropFields, new LinkedHashMap<>());
+                    .resolveAllFieldsForProperty(state.parentPropFields, new LinkedHashMap<>());
         } else {
             pathExpressions = state.pathTableRef.getTable()
                     .getPropertyFieldRegistry()
-                    .resolveFieldsForProperty(element, new LinkedHashMap<>());
+                    .resolveAllFieldsForProperty(element, new LinkedHashMap<>());
         }
         if (pathExpressions.size() == 1) {
             final Field field = pathExpressions.values().stream().iterator().next();

FROST-Server.SQLjooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/JooqAbsPersistenceManager.java

@@ -809,7 +809,7 @@ private void validateMappings() {
 
     private void validateMappings(final StaMainTable<?> tableForType, PropertyFieldRegistry<?> pfReg, ContainerType<?> type) {
         for (var property : type.getEntityProperties()) {
-            var pf = pfReg.getSelectFieldsForProperty(property);
+            var pf = pfReg.getPropertyFieldsForProperty(property);
             validateMapping(pf, "", tableForType);
         }
     }

FROST-Server.SQLjooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/tables/StaTableAbstract.java

@@ -305,7 +305,7 @@ public Entity insertIntoDatabase(JooqPersistenceManager pm, Entity entity, EditF
             if (entity.isSetProperty(np)) {
                 Entity ne = entity.getProperty(np);
                 entityFactories.entityExistsOrCreate(pm, ne, updateMode);
-                PropertyFields<T> registry = pfReg.getSelectFieldsForProperty(np);
+                PropertyFields<T> registry = pfReg.getPropertyFieldsForProperty(np);
                 registry.convert(thisTable, entity, insertFields);
             }
         }
@@ -329,15 +329,15 @@ public Entity insertIntoDatabase(JooqPersistenceManager pm, Entity entity, EditF
                 continue;
             }
             if (entity.isSetProperty(ep)) {
-                pfReg.getSelectFieldsForProperty(ep).convert(thisTable, entity, insertFields);
+                pfReg.getPropertyFieldsForProperty(ep).convert(thisTable, entity, insertFields);
             }
         }
 
         // Sixth, do the actual insert.
         // This returns the entire inserted row. It may or may not be changed by databse rules or before-triggers.
         DSLContext dslContext = pm.getDslContext();
-        final Set<PropertyFields<T>> propertyFields = getPropertyFieldRegistry().getSelectFields(new HashSet<>());
-        final Set<Field> selectFields = QueryState.propertiesToFields(thisTable, propertyFields);
+        final Set<PropertyFields<T>> propertyFields = getPropertyFieldRegistry().getPropertyFields(new HashSet<>());
+        final Set<Field> selectFields = QueryState.propertiesToSelectFields(thisTable, propertyFields);
         Record result = pm.timeFetchAny(
                 dslContext.insertInto(thisTable)
                         .set(insertFields)
@@ -448,7 +448,7 @@ public EntityChangedMessage updateInDatabase(JooqPersistenceManager pm, Entity e
                 if (!entityFactories.entityExists(pm, ne, PrincipalExtended.getLocalPrincipal().isAdmin())) {
                     throw new NoSuchEntityException("Linked " + ne.getType() + " not found.");
                 }
-                PropertyFields<T> registry = pfReg.getSelectFieldsForProperty(np);
+                PropertyFields<T> registry = pfReg.getPropertyFieldsForProperty(np);
                 registry.convert(thisTable, entity, updateFields, message);
             }
         }
@@ -461,7 +461,7 @@ public EntityChangedMessage updateInDatabase(JooqPersistenceManager pm, Entity e
                 continue;
             }
             if (entity.isSetProperty(ep)) {
-                pfReg.getSelectFieldsForProperty(ep).convert(thisTable, entity, updateFields, message);
+                pfReg.getPropertyFieldsForProperty(ep).convert(thisTable, entity, updateFields, message);
             }
         }
 
@@ -473,8 +473,8 @@ public EntityChangedMessage updateInDatabase(JooqPersistenceManager pm, Entity e
         }
 
         DSLContext dslContext = pm.getDslContext();
-        final Set<PropertyFields<T>> propertyFields = getPropertyFieldRegistry().getSelectFields(new HashSet<>());
-        final Set<Field> selectFields = QueryState.propertiesToFields(thisTable, propertyFields);
+        final Set<PropertyFields<T>> propertyFields = getPropertyFieldRegistry().getPropertyFields(new HashSet<>());
+        final Set<Field> selectFields = QueryState.propertiesToSelectFields(thisTable, propertyFields);
         Record result = null;
         if (!updateFields.isEmpty()) {
             result = executeUpdate(pm, dslContext, thisTable, updateFields, where, selectFields);