reduce scope where possible

Author: jakelandis

libs/dissect/src/main/java/org/elasticsearch/dissect/DissectKey.java

@@ -166,12 +166,13 @@ public String toString() {
             this.modifier = modifier;
         }
 
+        //package private for testing
         static Modifier fromString(String modifier) {
             return EnumSet.allOf(Modifier.class).stream().filter(km -> km.modifier.equals(modifier))
                 .findFirst().orElseThrow(() -> new IllegalArgumentException("Found invalid modifier.")); //throw should never happen
         }
 
-        static Modifier findModifier(String key) {
+        private static Modifier findModifier(String key) {
             Modifier modifier = Modifier.NONE;
             if (key != null && !key.isEmpty()) {
                 Matcher matcher = MODIFIER_PATTERN.matcher(key);

libs/dissect/src/main/java/org/elasticsearch/dissect/DissectMatch.java

@@ -126,19 +126,19 @@ Map<String, String> getResults() {
     /**
      * a result that will need to be part of an append operation.
      */
-    final class AppendResult {
+    private final class AppendResult {
         private final List<AppendValue> values = new ArrayList<>();
         private final String appendSeparator;
 
-        AppendResult(String appendSeparator) {
+        private AppendResult(String appendSeparator) {
             this.appendSeparator = appendSeparator;
         }
 
-        void addValue(String value, int order) {
+        private void addValue(String value, int order) {
             values.add(new AppendValue(value, order));
         }
 
-        String getAppendResult() {
+        private String getAppendResult() {
             Collections.sort(values);
             return values.stream().map(AppendValue::getValue).collect(Collectors.joining(appendSeparator));
         }
@@ -147,20 +147,20 @@ String getAppendResult() {
     /**
      * An appendable value that can be sorted based on the provided order
      */
-    final class AppendValue implements Comparable<AppendValue> {
+    private final class AppendValue implements Comparable<AppendValue> {
         private final String value;
         private final int order;
 
-        AppendValue(String value, int order) {
+        private AppendValue(String value, int order) {
             this.value = value;
             this.order = order;
         }
 
-        String getValue() {
+        private String getValue() {
             return value;
         }
 
-        int getOrder() {
+        private int getOrder() {
             return order;
         }
 
@@ -173,25 +173,25 @@ public int compareTo(AppendValue o) {
     /**
      * A result that needs to be converted to a key/value reference
      */
-    final class ReferenceResult {
+    private final class ReferenceResult {
 
         private String key;
 
-        String getKey() {
+        private String getKey() {
             return key;
         }
 
-        String getValue() {
+        private String getValue() {
             return value;
         }
 
         private String value;
 
-        void setValue(String value) {
+        private void setValue(String value) {
             this.value = value;
         }
 
-        void setKey(String key) {
+        private void setKey(String key) {
             this.key = key;
         }
     }

libs/dissect/src/main/java/org/elasticsearch/dissect/DissectParser.java

@@ -285,24 +285,23 @@ public Map<String, String> parse(String inputString) {
     /**
      * A tuple class to hold the dissect key and delimiter
      */
-    class DissectPair {
+    private class DissectPair {
 
         private final DissectKey key;
         private final String delimiter;
 
-        DissectPair(DissectKey key, String delimiter) {
+        private DissectPair(DissectKey key, String delimiter) {
             this.key = key;
             this.delimiter = delimiter;
         }
 
-        DissectKey getKey() {
+        private DissectKey getKey() {
             return key;
         }
 
-        String getDelimiter() {
+        private String getDelimiter() {
             return delimiter;
         }
-
     }
 
 }