Extract RuleScope parser

Author: dimitris-athanasiou

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/DetectionRule.java

@@ -7,18 +7,12 @@
 
 import org.elasticsearch.Version;
 import org.elasticsearch.common.ParseField;
-import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
-import org.elasticsearch.common.xcontent.ConstructingObjectParser;
-import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
-import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.ml.MlParserType;
 import org.elasticsearch.xpack.core.ml.job.messages.Messages;
 import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
@@ -28,7 +22,6 @@
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.EnumSet;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -57,24 +50,7 @@ public class DetectionRule implements ToXContentObject, Writeable {
             ObjectParser<Builder, Void> parser = PARSERS.get(parserType);
             assert parser != null;
             parser.declareStringArray(Builder::setActions, ACTIONS_FIELD);
-            parser.declareObject(Builder::setScope, (p, c) -> {
-                Map<String, Object> unparsedScope = p.map();
-                if (unparsedScope.isEmpty()) {
-                    return new RuleScope();
-                }
-                ConstructingObjectParser<FilterRef, Void> filterRefParser = FilterRef.PARSERS.get(parserType);
-                Map<String, FilterRef> scope = new HashMap<>();
-                for (Map.Entry<String, Object> entry : unparsedScope.entrySet()) {
-                    try (XContentBuilder builder = XContentFactory.jsonBuilder()) {
-                        builder.map((Map<String, ?>) entry.getValue());
-                        try (XContentParser scopeParser = XContentFactory.xContent(builder.contentType()).createParser(
-                                NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, Strings.toString(builder))) {
-                            scope.put(entry.getKey(), filterRefParser.parse(scopeParser, null));
-                        }
-                    }
-                }
-                return new RuleScope(scope);
-            }, SCOPE_FIELD);
+            parser.declareObject(Builder::setScope, RuleScope.parser(parserType), SCOPE_FIELD);
             parser.declareObjectArray(Builder::setConditions, (p, c) ->
                     RuleCondition.PARSERS.get(parserType).apply(p, c), CONDITIONS_FIELD);
         }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/RuleScope.java

@@ -5,11 +5,19 @@
  */
 package org.elasticsearch.xpack.core.ml.job.config;
 
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.ContextParser;
+import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
+import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.xpack.core.ml.MlParserType;
 import org.elasticsearch.xpack.core.ml.job.messages.Messages;
 import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
 
@@ -24,6 +32,27 @@
 
 public class RuleScope implements ToXContentObject, Writeable {
 
+    public static ContextParser<Void, RuleScope> parser(MlParserType parserType) {
+        return (p, c) -> {
+            Map<String, Object> unparsedScope = p.map();
+            if (unparsedScope.isEmpty()) {
+                return new RuleScope();
+            }
+            ConstructingObjectParser<FilterRef, Void> filterRefParser = FilterRef.PARSERS.get(parserType);
+            Map<String, FilterRef> scope = new HashMap<>();
+            for (Map.Entry<String, Object> entry : unparsedScope.entrySet()) {
+                try (XContentBuilder builder = XContentFactory.jsonBuilder()) {
+                    builder.map((Map<String, ?>) entry.getValue());
+                    try (XContentParser scopeParser = XContentFactory.xContent(builder.contentType()).createParser(
+                            NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, Strings.toString(builder))) {
+                        scope.put(entry.getKey(), filterRefParser.parse(scopeParser, null));
+                    }
+                }
+            }
+            return new RuleScope(scope);
+        };
+    }
+
     private final Map<String, FilterRef> scope;
 
     public RuleScope() {