diff --git a/x-pack/plugin/vector-tile/build.gradle b/x-pack/plugin/vector-tile/build.gradle index 3914a0d10defb..5bbc19d619c4d 100644 --- a/x-pack/plugin/vector-tile/build.gradle +++ b/x-pack/plugin/vector-tile/build.gradle @@ -41,15 +41,6 @@ testClusters.all { setting 'xpack.license.self_generated.type', 'trial' testDistribution = 'DEFAULT' setting 'xpack.security.enabled', 'false' - if (BuildParams.isSnapshotBuild() == false) { - systemProperty 'es.vector_tile_feature_flag_registered', 'true' - } -} - -tasks.named("test").configure { - if (BuildParams.isSnapshotBuild() == false) { - systemProperty 'es.vector_tile_feature_flag_registered', 'true' - } } tasks.named("thirdPartyAudit").configure { diff --git a/x-pack/plugin/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/VectorTilePlugin.java b/x-pack/plugin/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/VectorTilePlugin.java index 8ab4fae0900dd..fa41f87d0d6b6 100644 --- a/x-pack/plugin/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/VectorTilePlugin.java +++ b/x-pack/plugin/vector-tile/src/main/java/org/elasticsearch/xpack/vectortile/VectorTilePlugin.java @@ -6,14 +6,12 @@ */ package org.elasticsearch.xpack.vectortile; -import org.elasticsearch.Build; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.IndexScopedSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; -import org.elasticsearch.core.Booleans; import org.elasticsearch.license.XPackLicenseState; import org.elasticsearch.plugins.ActionPlugin; import org.elasticsearch.plugins.Plugin; @@ -35,20 +33,6 @@ protected XPackLicenseState getLicenseState() { return XPackPlugin.getSharedLicenseState(); } - private static final Boolean VECTOR_TILE_FEATURE_FLAG_REGISTERED; - - static { - final String property = System.getProperty("es.vector_tile_feature_flag_registered"); - if (Build.CURRENT.isSnapshot() && property != null) { - throw new IllegalArgumentException("es.vector_tile_feature_flag_registered is only supported in non-snapshot builds"); - } - VECTOR_TILE_FEATURE_FLAG_REGISTERED = Booleans.parseBoolean(property, null); - } - - public boolean isVectorTileEnabled() { - return Build.CURRENT.isSnapshot() || (VECTOR_TILE_FEATURE_FLAG_REGISTERED != null && VECTOR_TILE_FEATURE_FLAG_REGISTERED); - } - @Override public List getRestHandlers( Settings settings, @@ -59,11 +43,7 @@ public List getRestHandlers( IndexNameExpressionResolver indexNameExpressionResolver, Supplier nodesInCluster ) { - if (isVectorTileEnabled()) { - return List.of(new RestVectorTileAction()); - } else { - return List.of(); - } + return List.of(new RestVectorTileAction()); } @Override