|
@@ -5,20 +5,19 @@
|
|
|
*/
|
|
|
package org.elasticsearch.xpack.graph.rest.action;
|
|
|
|
|
|
-import org.apache.logging.log4j.Logger;
|
|
|
import org.apache.logging.log4j.LogManager;
|
|
|
+import org.apache.logging.log4j.Logger;
|
|
|
import org.elasticsearch.ElasticsearchParseException;
|
|
|
import org.elasticsearch.action.support.IndicesOptions;
|
|
|
import org.elasticsearch.common.ParseField;
|
|
|
import org.elasticsearch.common.Strings;
|
|
|
-import org.elasticsearch.common.logging.DeprecationLogger;
|
|
|
import org.elasticsearch.common.settings.Settings;
|
|
|
import org.elasticsearch.common.unit.TimeValue;
|
|
|
import org.elasticsearch.common.xcontent.XContentParser;
|
|
|
import org.elasticsearch.protocol.xpack.graph.GraphExploreRequest;
|
|
|
+import org.elasticsearch.protocol.xpack.graph.GraphExploreRequest.TermBoost;
|
|
|
import org.elasticsearch.protocol.xpack.graph.Hop;
|
|
|
import org.elasticsearch.protocol.xpack.graph.VertexRequest;
|
|
|
-import org.elasticsearch.protocol.xpack.graph.GraphExploreRequest.TermBoost;
|
|
|
import org.elasticsearch.rest.RestController;
|
|
|
import org.elasticsearch.rest.RestRequest;
|
|
|
import org.elasticsearch.rest.action.RestToXContentListener;
|
|
@@ -40,7 +39,6 @@ import static org.elasticsearch.xpack.core.graph.action.GraphExploreAction.INSTA
|
|
|
*/
|
|
|
public class RestGraphAction extends XPackRestHandler {
|
|
|
private static final Logger logger = LogManager.getLogger(RestGraphAction.class);
|
|
|
- private static final DeprecationLogger deprecationLogger = new DeprecationLogger(logger);
|
|
|
|
|
|
public static final ParseField TIMEOUT_FIELD = new ParseField("timeout");
|
|
|
public static final ParseField SIGNIFICANCE_FIELD = new ParseField("use_significance");
|
|
@@ -64,15 +62,10 @@ public class RestGraphAction extends XPackRestHandler {
|
|
|
public RestGraphAction(Settings settings, RestController controller) {
|
|
|
super(settings);
|
|
|
|
|
|
- // @deprecated Remove in 7.0
|
|
|
- controller.registerWithDeprecatedHandler(GET, "/{index}" + URI_BASE + "/graph/_explore", this,
|
|
|
- GET, "/{index}" + URI_BASE + "/_graph/_explore", deprecationLogger);
|
|
|
- controller.registerWithDeprecatedHandler(POST, "/{index}" + URI_BASE + "/graph/_explore", this,
|
|
|
- POST, "/{index}" + URI_BASE + "/_graph/_explore", deprecationLogger);
|
|
|
- controller.registerWithDeprecatedHandler(GET, "/{index}/{type}" + URI_BASE + "/graph/_explore", this,
|
|
|
- GET, "/{index}/{type}" + URI_BASE + "/_graph/_explore", deprecationLogger);
|
|
|
- controller.registerWithDeprecatedHandler(POST, "/{index}/{type}" + URI_BASE + "/graph/_explore", this,
|
|
|
- POST, "/{index}/{type}" + URI_BASE + "/_graph/_explore", deprecationLogger);
|
|
|
+ controller.registerHandler(GET, "/{index}" + URI_BASE + "/graph/_explore", this);
|
|
|
+ controller.registerHandler(POST, "/{index}" + URI_BASE + "/graph/_explore", this);
|
|
|
+ controller.registerHandler(GET, "/{index}/{type}" + URI_BASE + "/graph/_explore", this);
|
|
|
+ controller.registerHandler(POST, "/{index}/{type}" + URI_BASE + "/graph/_explore", this);
|
|
|
}
|
|
|
|
|
|
@Override
|