Change EntityDataWriterImpl to use groovy CompileStatic, without this…

… a compile error was missed in the changes for PR #625, fix small issues from this
moqui · Nov 29, 2023 · b4287f1 · b4287f1
1 parent e6135fa
commit b4287f1
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/framework/src/main/groovy/org/moqui/impl/entity/EntityDataWriterImpl.groovy b/framework/src/main/groovy/org/moqui/impl/entity/EntityDataWriterImpl.groovy
@@ -14,6 +14,7 @@
 package org.moqui.impl.entity
 
 import groovy.json.JsonBuilder
+import groovy.transform.CompileStatic
 import org.moqui.entity.EntityValue
 import org.moqui.util.ObjectUtilities
 
@@ -35,6 +36,7 @@ import java.time.format.DateTimeFormatter
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
+@CompileStatic
 class EntityDataWriterImpl implements EntityDataWriter {
     private final static Logger logger = LoggerFactory.getLogger(EntityDataWriterImpl.class)
 
@@ -284,7 +286,13 @@ class EntityDataWriterImpl implements EntityDataWriter {
     int writer(Writer writer) {
         if (dependentLevels > 0) efi.createAllAutoReverseManyRelationships()
 
-        LinkedHashSet<String> activeEntityNames = skipEntityNames.size() > 0 ? entityNames - skipEntityNames : entityNames
+        LinkedHashSet<String> activeEntityNames
+        if (skipEntityNames.size() == 0) {
+            activeEntityNames = entityNames
+        } else {
+            activeEntityNames = new LinkedHashSet<>(entityNames)
+            activeEntityNames.removeAll(skipEntityNames)
+        }
         EntityDefinition singleEd = null
         if (activeEntityNames.size() == 1) singleEd = efi.getEntityDefinition(activeEntityNames.first())
 
@@ -300,13 +308,12 @@ class EntityDataWriterImpl implements EntityDataWriter {
                 for (String en in activeEntityNames) {
                     EntityDefinition ed = efi.getEntityDefinition(en)
                     boolean useMaster = masterName != null && masterName.length() > 0 && ed.getMasterDefinition(masterName) != null
-                    EntityFind ef = makeEntityFind(en)
-                    ef.iterator().withCloseable ({
+                    try (EntityListIterator eli = makeEntityFind(en).iterator()) {
                         EntityValue ev
                         while ((ev = eli.next()) != null) {
                             valuesWritten+= writeValue(ev, writer, useMaster)
                         }
-                    });
+                    }
                 }
 
                 endFile(writer)