[ML][Inference] adding .ml-inference* index and storage (#47267)

* [ML][Inference] adding .ml-inference* index and storage * Addressing PR comments * Allowing null definition, adding validation tests for model config * fixing line length
elastic · Sep 30, 2019 · f6f2c9f · f6f2c9f
1 parent c83dd32
commit f6f2c9f
Show file tree

Hide file tree

Showing 31 changed files with 1,643 additions and 65 deletions.
diff --git a/...t/transform/transforms/util/TimeUtil.java → ...elasticsearch/client/common/TimeUtil.java b/...t/transform/transforms/util/TimeUtil.java → ...elasticsearch/client/common/TimeUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.client.transform.transforms.util;
+package org.elasticsearch.client.common;
 
 import org.elasticsearch.common.time.DateFormatters;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -46,6 +46,14 @@ public static Date parseTimeField(XContentParser parser, String fieldName) throw
             "unexpected token [" + parser.currentToken() + "] for [" + fieldName + "]");
     }
 
+    /**
+     * Parse out an Instant object given the current parser and field name.
+     *
+     * @param parser current XContentParser
+     * @param fieldName the field's preferred name (utilized in exception)
+     * @return parsed Instant object
+     * @throws IOException from XContentParser
+     */
     public static Instant parseTimeFieldToInstant(XContentParser parser, String fieldName) throws IOException {
         if (parser.currentToken() == XContentParser.Token.VALUE_NUMBER) {
             return Instant.ofEpochMilli(parser.longValue());

diff --git a/...t/rest-high-level/src/main/java/org/elasticsearch/client/ml/calendars/ScheduledEvent.java b/...t/rest-high-level/src/main/java/org/elasticsearch/client/ml/calendars/ScheduledEvent.java
@@ -18,7 +18,7 @@
  */
 package org.elasticsearch.client.ml.calendars;
 
-import org.elasticsearch.client.ml.job.util.TimeUtil;
+import org.elasticsearch.client.common.TimeUtil;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;

diff --git a/...h-level/src/main/java/org/elasticsearch/client/ml/dataframe/DataFrameAnalyticsConfig.java b/...h-level/src/main/java/org/elasticsearch/client/ml/dataframe/DataFrameAnalyticsConfig.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.client.ml.dataframe;
 
 import org.elasticsearch.Version;
-import org.elasticsearch.client.transform.transforms.util.TimeUtil;
+import org.elasticsearch.client.common.TimeUtil;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.Strings;

diff --git a/...t-high-level/src/main/java/org/elasticsearch/client/ml/inference/NamedXContentObject.java b/...t-high-level/src/main/java/org/elasticsearch/client/ml/inference/NamedXContentObject.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.client.ml.inference;
+
+import org.elasticsearch.common.xcontent.ToXContentObject;
+
+/**
+ * Simple interface for XContent Objects that are named.
+ *
+ * This affords more general handling when serializing and de-serializing this type of XContent when it is used in a NamedObjects
+ * parser.
+ */
+public interface NamedXContentObject extends ToXContentObject {
+    /**
+     * @return The name of the XContentObject that is to be serialized
+     */
+    String getName();
+}
diff --git a/...-level/src/main/java/org/elasticsearch/client/ml/inference/NamedXContentObjectHelper.java b/...-level/src/main/java/org/elasticsearch/client/ml/inference/NamedXContentObjectHelper.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.client.ml.inference;
+
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+
+import java.io.IOException;
+import java.util.List;
+
+public final class NamedXContentObjectHelper {
+
+    private NamedXContentObjectHelper() {}
+
+    public static XContentBuilder writeNamedObjects(XContentBuilder builder,
+                                                    ToXContent.Params params,
+                                                    boolean useExplicitOrder,
+                                                    String namedObjectsName,
+                                                    List<? extends NamedXContentObject> namedObjects) throws IOException {
+        if (useExplicitOrder) {
+            builder.startArray(namedObjectsName);
+        } else {
+            builder.startObject(namedObjectsName);
+        }
+        for (NamedXContentObject object : namedObjects) {
+            if (useExplicitOrder) {
+                builder.startObject();
+            }
+            builder.field(object.getName(), object, params);
+            if (useExplicitOrder) {
+                builder.endObject();
+            }
+        }
+        if (useExplicitOrder) {
+            builder.endArray();
+        } else {
+            builder.endObject();
+        }
+        return builder;
+    }
+}