From 054a950ceb656ad764367026a845f87e7c0be4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Wed, 23 Sep 2020 11:14:41 +0200 Subject: [PATCH] Align version field plugin naming (#62757) To better align the plugin naming with other mapper plugins under x-pack (e.g. mapper-flattened) this PR changes the plugin name and the containing directory to "mapper-version" --- x-pack/plugin/{versionfield => mapper-version}/build.gradle | 4 ++-- .../org/elasticsearch/xpack/versionfield/VersionFieldIT.java | 0 .../org/elasticsearch/xpack/versionfield/VersionEncoder.java | 0 .../xpack/versionfield/VersionFieldDocValuesExtension.java | 0 .../elasticsearch/xpack/versionfield/VersionFieldPlugin.java | 0 .../xpack/versionfield/VersionFieldWildcardQuery.java | 0 .../xpack/versionfield/VersionScriptDocValues.java | 0 .../xpack/versionfield/VersionStringFieldMapper.java | 0 .../services/org.elasticsearch.painless.spi.PainlessExtension | 0 .../org/elasticsearch/xpack/versionfield/whitelist.txt | 0 .../elasticsearch/xpack/versionfield/VersionEncoderTests.java | 0 .../xpack/versionfield/VersionStringFieldMapperTests.java | 0 .../xpack/versionfield/VersionStringFieldTests.java | 0 13 files changed, 2 insertions(+), 2 deletions(-) rename x-pack/plugin/{versionfield => mapper-version}/build.gradle (92%) rename x-pack/plugin/{versionfield => mapper-version}/src/internalClusterTest/java/org/elasticsearch/xpack/versionfield/VersionFieldIT.java (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/main/java/org/elasticsearch/xpack/versionfield/VersionEncoder.java (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldDocValuesExtension.java (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldPlugin.java (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldWildcardQuery.java (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/main/java/org/elasticsearch/xpack/versionfield/VersionScriptDocValues.java (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/main/resources/org/elasticsearch/xpack/versionfield/whitelist.txt (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/test/java/org/elasticsearch/xpack/versionfield/VersionEncoderTests.java (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapperTests.java (100%) rename x-pack/plugin/{versionfield => mapper-version}/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java (100%) diff --git a/x-pack/plugin/versionfield/build.gradle b/x-pack/plugin/mapper-version/build.gradle similarity index 92% rename from x-pack/plugin/versionfield/build.gradle rename to x-pack/plugin/mapper-version/build.gradle index 230d52ee551..35502b86704 100644 --- a/x-pack/plugin/versionfield/build.gradle +++ b/x-pack/plugin/mapper-version/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'elasticsearch.esplugin' apply plugin: 'elasticsearch.internal-cluster-test' esplugin { - name 'versionfield' + name 'mapper-version' description 'A plugin for a field type to store sofware versions' classname 'org.elasticsearch.xpack.versionfield.VersionFieldPlugin' extendedPlugins = ['x-pack-core', 'lang-painless'] } -archivesBaseName = 'x-pack-versionfield' +archivesBaseName = 'x-pack-mapper-version' dependencies { compileOnly project(path: xpackModule('core'), configuration: 'default') diff --git a/x-pack/plugin/versionfield/src/internalClusterTest/java/org/elasticsearch/xpack/versionfield/VersionFieldIT.java b/x-pack/plugin/mapper-version/src/internalClusterTest/java/org/elasticsearch/xpack/versionfield/VersionFieldIT.java similarity index 100% rename from x-pack/plugin/versionfield/src/internalClusterTest/java/org/elasticsearch/xpack/versionfield/VersionFieldIT.java rename to x-pack/plugin/mapper-version/src/internalClusterTest/java/org/elasticsearch/xpack/versionfield/VersionFieldIT.java diff --git a/x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionEncoder.java b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionEncoder.java similarity index 100% rename from x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionEncoder.java rename to x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionEncoder.java diff --git a/x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldDocValuesExtension.java b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldDocValuesExtension.java similarity index 100% rename from x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldDocValuesExtension.java rename to x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldDocValuesExtension.java diff --git a/x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldPlugin.java b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldPlugin.java similarity index 100% rename from x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldPlugin.java rename to x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldPlugin.java diff --git a/x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldWildcardQuery.java b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldWildcardQuery.java similarity index 100% rename from x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldWildcardQuery.java rename to x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionFieldWildcardQuery.java diff --git a/x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionScriptDocValues.java b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionScriptDocValues.java similarity index 100% rename from x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionScriptDocValues.java rename to x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionScriptDocValues.java diff --git a/x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java similarity index 100% rename from x-pack/plugin/versionfield/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java rename to x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java diff --git a/x-pack/plugin/versionfield/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension b/x-pack/plugin/mapper-version/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension similarity index 100% rename from x-pack/plugin/versionfield/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension rename to x-pack/plugin/mapper-version/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension diff --git a/x-pack/plugin/versionfield/src/main/resources/org/elasticsearch/xpack/versionfield/whitelist.txt b/x-pack/plugin/mapper-version/src/main/resources/org/elasticsearch/xpack/versionfield/whitelist.txt similarity index 100% rename from x-pack/plugin/versionfield/src/main/resources/org/elasticsearch/xpack/versionfield/whitelist.txt rename to x-pack/plugin/mapper-version/src/main/resources/org/elasticsearch/xpack/versionfield/whitelist.txt diff --git a/x-pack/plugin/versionfield/src/test/java/org/elasticsearch/xpack/versionfield/VersionEncoderTests.java b/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionEncoderTests.java similarity index 100% rename from x-pack/plugin/versionfield/src/test/java/org/elasticsearch/xpack/versionfield/VersionEncoderTests.java rename to x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionEncoderTests.java diff --git a/x-pack/plugin/versionfield/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapperTests.java b/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapperTests.java similarity index 100% rename from x-pack/plugin/versionfield/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapperTests.java rename to x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapperTests.java diff --git a/x-pack/plugin/versionfield/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java b/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java similarity index 100% rename from x-pack/plugin/versionfield/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java rename to x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java