From 83bec850644681ce631f236b539a23917aac4833 Mon Sep 17 00:00:00 2001
From: at055612 <22818309+at055612@users.noreply.github.com>
Date: Wed, 3 Jul 2024 12:03:27 +0100
Subject: [PATCH 1/2] Empty initial commit on gh-4028-in-dict-logging [no ci]


From aa9cb887c1379fc332f89d9d21a9cbe04f34fa4c Mon Sep 17 00:00:00 2001
From: at055612 <22818309+at055612@users.noreply.github.com>
Date: Wed, 3 Jul 2024 12:17:18 +0100
Subject: [PATCH 2/2] gh-4028 Tidy code

---
 .../logging/api/StroomEventLoggingUtil.java   | 73 ++++++-------------
 1 file changed, 22 insertions(+), 51 deletions(-)

diff --git a/stroom-event-logging/stroom-event-logging-api/src/main/java/stroom/event/logging/api/StroomEventLoggingUtil.java b/stroom-event-logging/stroom-event-logging-api/src/main/java/stroom/event/logging/api/StroomEventLoggingUtil.java
index c3c78989188..078d74d4ff5 100644
--- a/stroom-event-logging/stroom-event-logging-api/src/main/java/stroom/event/logging/api/StroomEventLoggingUtil.java
+++ b/stroom-event-logging/stroom-event-logging-api/src/main/java/stroom/event/logging/api/StroomEventLoggingUtil.java
@@ -197,13 +197,11 @@ public static <T> SearchEventAction createSearchEventAction(final QuickFilterRes
 
     private static AdvancedQueryItem convertItem(final ExpressionItem expressionItem) {
         if (expressionItem != null && expressionItem.enabled()) {
-            if (expressionItem instanceof ExpressionTerm) {
-                final ExpressionTerm expressionTerm = (ExpressionTerm) expressionItem;
+            if (expressionItem instanceof final ExpressionTerm expressionTerm) {
 
                 return convertTerm(expressionTerm);
 
-            } else if (expressionItem instanceof ExpressionOperator) {
-                final ExpressionOperator expressionOperator = (ExpressionOperator) expressionItem;
+            } else if (expressionItem instanceof final ExpressionOperator expressionOperator) {
                 final AdvancedQueryItem operator;
                 if (expressionOperator.op().equals(Op.AND)) {
                     operator = And.builder()
@@ -294,21 +292,13 @@ private static AdvancedQueryItem convertTerm(final ExpressionTerm expressionTerm
             }
         } else {
             final TermCondition termCondition = convertCondition(expressionTerm.getCondition());
-            final String value;
+            final String value = switch (expressionTerm.getCondition()) {
+                case IN_DICTIONARY -> "dictionary: " + expressionTerm.getDocRef();
+                case IN_FOLDER -> "folder: " + expressionTerm.getDocRef();
+                case IS_DOC_REF -> "docRef: " + expressionTerm.getDocRef();
+                default -> expressionTerm.getValue();
+            };
 
-            switch (expressionTerm.getCondition()) {
-                case IN_DICTIONARY:
-                    value = "dictionary: " + expressionTerm.getDocRef();
-                    break;
-                case IN_FOLDER:
-                    value = "folder: " + expressionTerm.getDocRef();
-                    break;
-                case IS_DOC_REF:
-                    value = "docRef: " + expressionTerm.getDocRef();
-                    break;
-                default:
-                    value = expressionTerm.getValue();
-            }
             result = Term.builder()
                     .withName(expressionTerm.getField())
                     .withCondition(termCondition)
@@ -321,38 +311,19 @@ private static AdvancedQueryItem convertTerm(final ExpressionTerm expressionTerm
 
 
     private static TermCondition convertCondition(final Condition condition) {
-        final TermCondition termCondition;
-        switch (condition) {
-            case CONTAINS:
-                termCondition = TermCondition.CONTAINS;
-                break;
-            case EQUALS:
-            case IN_DICTIONARY:
-            case IN_FOLDER:
-            case IS_DOC_REF:
-                termCondition = TermCondition.EQUALS;
-                break;
-            case NOT_EQUALS:
-                termCondition = TermCondition.NOT_EQUALS;
-                break;
-            case GREATER_THAN:
-                termCondition = TermCondition.GREATER_THAN;
-                break;
-            case GREATER_THAN_OR_EQUAL_TO:
-                termCondition = TermCondition.GREATER_THAN_EQUAL_TO;
-                break;
-            case LESS_THAN:
-                termCondition = TermCondition.LESS_THAN;
-                break;
-            case LESS_THAN_OR_EQUAL_TO:
-                termCondition = TermCondition.LESS_THAN_EQUAL_TO;
-                break;
-            case MATCHES_REGEX:
-                termCondition = TermCondition.REGEX;
-                break;
-            default:
-                throw new RuntimeException("Can't convert condition " + condition);
-        }
-        return termCondition;
+        return switch (condition) {
+            case CONTAINS -> TermCondition.CONTAINS;
+            case EQUALS,
+                    IN_DICTIONARY,
+                    IN_FOLDER,
+                    IS_DOC_REF -> TermCondition.EQUALS;
+            case NOT_EQUALS -> TermCondition.NOT_EQUALS;
+            case GREATER_THAN -> TermCondition.GREATER_THAN;
+            case GREATER_THAN_OR_EQUAL_TO -> TermCondition.GREATER_THAN_EQUAL_TO;
+            case LESS_THAN -> TermCondition.LESS_THAN;
+            case LESS_THAN_OR_EQUAL_TO -> TermCondition.LESS_THAN_EQUAL_TO;
+            case MATCHES_REGEX -> TermCondition.REGEX;
+            default -> throw new RuntimeException("Can't convert condition " + condition);
+        };
     }
 }