[GEOS-11246] Schemaless plugin performance for WFS

geosolutions-it · Jan 9, 2024 · 62e8dd4 · 62e8dd4
1 parent d27abf2
commit 62e8dd4
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/...less-core/src/main/java/org/geoserver/schemalessfeatures/type/DynamicComplexTypeImpl.java b/...less-core/src/main/java/org/geoserver/schemalessfeatures/type/DynamicComplexTypeImpl.java
@@ -20,8 +20,6 @@
 /** Concrete implementation of a DynamicComplexType */
 public class DynamicComplexTypeImpl extends AttributeTypeImpl implements DynamicComplexType {
 
-    private final Collection<PropertyDescriptor> properties;
-
     private final Map<Name, PropertyDescriptor> propertyMap;
 
     public DynamicComplexTypeImpl(
@@ -48,7 +46,6 @@ public DynamicComplexTypeImpl(
                 localPropertyMap.put(pd.getName(), pd);
             }
         }
-        this.properties = properties;
         this.propertyMap = localPropertyMap;
     }
 
@@ -60,7 +57,7 @@ public Class<Collection<Property>> getBinding() {
 
     @Override
     public Collection<PropertyDescriptor> getDescriptors() {
-        return properties;
+        return propertyMap.values();
     }
 
     @Override
@@ -85,7 +82,7 @@ public PropertyDescriptor getDescriptor(String name) {
     }
 
     private PropertyDescriptor getDescriptorByLocalPart(String localPart) {
-        for (PropertyDescriptor pd : properties) {
+        for (PropertyDescriptor pd : propertyMap.values()) {
             if (pd.getName().getLocalPart().equals(localPart)) {
                 return pd;
             }
@@ -111,23 +108,19 @@ public boolean equals(Object o) {
             return false;
         }
         DynamicComplexTypeImpl other = (DynamicComplexTypeImpl) o;
-        if (!properties.equals(other.properties)) {
-            return false;
-        }
-        return true;
+        return !propertyMap.equals(other.propertyMap);
     }
 
     @Override
     public void addPropertyDescriptor(PropertyDescriptor descriptor) {
-        if (!properties.contains(descriptor)) {
-            properties.add(descriptor);
+        if (!propertyMap.containsValue(descriptor)) {
             propertyMap.put(descriptor.getName(), descriptor);
         }
     }
 
+    @Override
     public void removePropertyDescriptor(PropertyDescriptor descriptor) {
-        if (properties.contains(descriptor)) {
-            properties.remove(descriptor);
+        if (propertyMap.containsValue(descriptor)) {
             propertyMap.remove(descriptor.getName());
         }
     }