Merge branch 'develop' into Issue-#2196

fieldenms · Apr 2, 2024 · ba4f10e · ba4f10e
2 parents 4bd97f0 + 4c2d470
commit ba4f10e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/...l/src/main/java/ua/com/fielden/platform/entity/functional/centre/CentreContextHolder.java b/...l/src/main/java/ua/com/fielden/platform/entity/functional/centre/CentreContextHolder.java
@@ -3,7 +3,10 @@
 import static java.util.Collections.unmodifiableList;
 import static java.util.Collections.unmodifiableMap;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 import ua.com.fielden.platform.entity.AbstractEntity;
 import ua.com.fielden.platform.entity.annotation.CompanionObject;
@@ -50,7 +53,7 @@ public class CentreContextHolder extends AbstractEntity<String> {
 
     @IsProperty(CentreContextHolder.class)
     @Title(value = "Related contexts", desc = "Contexts relate to this one")
-    private Map<String, CentreContextHolder> relatedContexts = new LinkedHashMap<>();
+    private final Map<String, CentreContextHolder> relatedContexts = new LinkedHashMap<>();
 
     @IsProperty
     @Title(value = "Parent Centre Context", desc = "The context of the centre that owns this view as a insertion point")
@@ -119,7 +122,7 @@ public AbstractEntity<?> getOriginallyProducedEntity() {
     }
 
     @Observable
-    protected CentreContextHolder setModifHolder(final Map<String, Object> modifHolder) {
+    public CentreContextHolder setModifHolder(final Map<String, Object> modifHolder) {
         this.modifHolder.clear();
         this.modifHolder.putAll(modifHolder);
         return this;
@@ -130,7 +133,7 @@ public Map<String, Object> getModifHolder() {
     }
 
     @Observable
-    protected CentreContextHolder setCustomObject(final Map<String, Object> customObject) {
+    public CentreContextHolder setCustomObject(final Map<String, Object> customObject) {
         this.customObject.clear();
         this.customObject.putAll(customObject);
         return this;

diff --git a/platform-pojo-bl/src/main/java/ua/com/fielden/platform/web/utils/EntityResourceUtils.java b/platform-pojo-bl/src/main/java/ua/com/fielden/platform/web/utils/EntityResourceUtils.java
@@ -21,6 +21,7 @@
 import static ua.com.fielden.platform.error.Result.successful;
 import static ua.com.fielden.platform.reflection.AnnotationReflector.getPropertyAnnotation;
 import static ua.com.fielden.platform.reflection.Finder.getPropertyDescriptors;
+import static ua.com.fielden.platform.reflection.PropertyTypeDeterminator.stripIfNeeded;
 import static ua.com.fielden.platform.reflection.asm.impl.DynamicTypeNamingService.decodeOriginalTypeFromCriteriaType;
 import static ua.com.fielden.platform.utils.EntityUtils.isCompositeEntity;
 import static ua.com.fielden.platform.utils.EntityUtils.isEntityType;
@@ -957,7 +958,7 @@ public static <T extends AbstractEntity<?>> Class<T> getEntityType(final Class<?
      * @return
      */
     public static Class<? extends AbstractEntity<?>> getOriginalType(final Class<? extends AbstractEntity<?>> criteriaType) {
-        return (Class<? extends AbstractEntity<?>>) ClassesRetriever.findClass(decodeOriginalTypeFromCriteriaType(criteriaType.getName()));
+        return (Class<? extends AbstractEntity<?>>) ClassesRetriever.findClass(decodeOriginalTypeFromCriteriaType(stripIfNeeded(criteriaType).getName()));
     }
 
     /**

diff --git a/...ava/ua/com/fielden/platform/web/resources/webui/CriteriaEntityAutocompletionResource.java b/...ava/ua/com/fielden/platform/web/resources/webui/CriteriaEntityAutocompletionResource.java
@@ -145,11 +145,11 @@ public Representation post(final Representation envelope) {
                     device(),
                     webUiConfig, eccCompanion, mmiCompanion, userCompanion, sharingModel
                 );
-                criteriaType = (Class<M>) enhancedCentreEntityQueryCriteria.getClass();
+                criteriaType = (Class<M>) enhancedCentreEntityQueryCriteria.getType();
             } else {
                 criteriaEntity = (M) createCriteriaEntityWithoutConflicts(modifHolder, companionFinder, critGenerator, miType, saveAsName, user, device(), webUiConfig, eccCompanion, mmiCompanion, userCompanion, sharingModel);
                 enhancedCentreEntityQueryCriteria = criteriaEntity;
-                criteriaType = (Class<M>) criteriaEntity.getClass();
+                criteriaType = (Class<M>) criteriaEntity.getType();
             }
 
             // TODO criteriaType is necessary to be used for 1) value matcher creation 2) providing value matcher fetch model