From 0bce26d2cc10c4325a0a48d253463205609febe0 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sat, 5 Dec 2020 09:13:32 -0500
Subject: [PATCH] use zillaruntime

---
 .../org/cobbzilla/wizard/model/entityconfig/ModelSetup.java   | 3 +--
 .../cobbzilla/wizard/server/handler/StaticAssetHandler.java   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java
index 3680002..c7cb54a 100644
--- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/ModelSetup.java
@@ -10,7 +10,6 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.InvocationHandler;
-import org.apache.commons.collections4.IteratorUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.cobbzilla.util.daemon.AwaitResult;
 import org.cobbzilla.util.reflect.ReflectionUtil;
@@ -633,7 +632,7 @@ public class ModelSetup {
         }
 
         public boolean hasData(final boolean strict) {
-            return IteratorUtils.toList(node.fieldNames()).stream().anyMatch((n) -> !ArrayUtils.contains(entity.excludeUpdateFields(strict), n));
+            return toList(node.fieldNames()).stream().anyMatch((n) -> !ArrayUtils.contains(entity.excludeUpdateFields(strict), n));
         }
 
         @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/handler/StaticAssetHandler.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/handler/StaticAssetHandler.java
index 2af8d1b..bd61dfd 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/handler/StaticAssetHandler.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/handler/StaticAssetHandler.java
@@ -1,7 +1,6 @@
 package org.cobbzilla.wizard.server.handler;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.IteratorUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.cobbzilla.util.io.DeleteOnExit;
 import org.cobbzilla.util.io.FileUtil;
@@ -19,6 +18,7 @@ import java.io.InputStream;
 import java.io.Writer;
 import java.util.*;
 
+import static org.cobbzilla.util.daemon.ZillaRuntime.toList;
 import static org.cobbzilla.util.io.FileUtil.abs;
 import static org.cobbzilla.util.security.ShaUtil.sha256_hex;
 
@@ -210,7 +210,7 @@ public class StaticAssetHandler extends CLStaticHttpHandler {
     private String getRequestHeaderJavascript(Request request) throws Exception {
         Map<String, Object> headers = new HashMap<>();
         for (String name : request.getHeaderNames()) {
-            List<String> values = IteratorUtils.toList(request.getHeaders(name).iterator());
+            List<String> values = toList(request.getHeaders(name).iterator());
             if (values.size() == 1) {
                 headers.put(name, values.get(0));
             } else {