From db09b6947f0e534b0f1fec484a1445182d215137 Mon Sep 17 00:00:00 2001
From: Paul Tuckey <paul@tuckey.org>
Date: Mon, 3 Jul 2023 10:19:36 +1200
Subject: [PATCH] progress

---
 .../filters/urlrewrite/json/JsonWriter.java   | 22 ++++++++-----------
 .../tuckey/web/filters/urlrewrite/doc/doc.css |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/tuckey/web/filters/urlrewrite/json/JsonWriter.java b/src/main/java/org/tuckey/web/filters/urlrewrite/json/JsonWriter.java
index 29994039..23620372 100644
--- a/src/main/java/org/tuckey/web/filters/urlrewrite/json/JsonWriter.java
+++ b/src/main/java/org/tuckey/web/filters/urlrewrite/json/JsonWriter.java
@@ -75,9 +75,7 @@ private void value(Object object) {
     }
 
     private boolean cyclic(Object object) {
-        Iterator it = calls.iterator();
-        while (it.hasNext()) {
-            Object called = it.next();
+        for (Object called : calls) {
             if (object == called) return true;
         }
         return false;
@@ -90,19 +88,18 @@ private void bean(Object object) {
         try {
             info = Introspector.getBeanInfo(object.getClass());
             PropertyDescriptor[] props = info.getPropertyDescriptors();
-            for (int i = 0; i < props.length; ++i) {
-                PropertyDescriptor prop = props[i];
+            for (PropertyDescriptor prop : props) {
                 String name = prop.getName();
                 // ignore stacktraces
-                if ( object instanceof Throwable && "stackTrace".equals(name) ) continue;
+                if (object instanceof Throwable && "stackTrace".equals(name)) continue;
                 // ignore class element of JSONRPCErrorBean
-                if ( object instanceof JsonRpcErrorBean && "class".equals(name) ) continue;
+                if (object instanceof JsonRpcErrorBean && "class".equals(name)) continue;
                 // for JSONRPCBean ignore result or error depending on weather error present
-                if ( object instanceof JsonRpcBean) {
-                    if ("class".equals(name) ) continue;
+                if (object instanceof JsonRpcBean) {
+                    if ("class".equals(name)) continue;
                     JsonRpcBean rpcBean = (JsonRpcBean) object;
-                    if (rpcBean.getError() == null && "error".equals(name) ) continue;
-                    if (rpcBean.getError() != null && "result".equals(name) ) continue;
+                    if (rpcBean.getError() == null && "error".equals(name)) continue;
+                    if (rpcBean.getError() != null && "result".equals(name)) continue;
                 }
                 Method accessor = prop.getReadMethod();
                 if ((emitClassName || !"class".equals(name)) && accessor != null) {
@@ -114,8 +111,7 @@ private void bean(Object object) {
                 }
             }
             Field[] ff = object.getClass().getFields();
-            for (int i = 0; i < ff.length; ++i) {
-                Field field = ff[i];
+            for (Field field : ff) {
                 if (addedSomething) add(',');
                 add(field.getName(), field.get(object));
                 addedSomething = true;
diff --git a/src/main/resources/org/tuckey/web/filters/urlrewrite/doc/doc.css b/src/main/resources/org/tuckey/web/filters/urlrewrite/doc/doc.css
index 4d5043a6..b9fc567f 100644
--- a/src/main/resources/org/tuckey/web/filters/urlrewrite/doc/doc.css
+++ b/src/main/resources/org/tuckey/web/filters/urlrewrite/doc/doc.css
@@ -37,7 +37,7 @@ a:link, a:visited {
     color: blue;
 }
 
-a:active, a:hover, {
+a:active, a:hover {
     color: #f30 !important;
 }