Skip to content

Commit 2cdaabe

Browse files
authored
[Stable plugin api] Drop api suffix in package names (elastic#92905)
Refactoring that drops the api suffix from package name This will have to be followed up by a plugins/examples fix in imports Also set an artifact group name to `org.elasticsearch.plugin` in the plugin-api and plugin-analysis-api
1 parent 4573c56 commit 2cdaabe

File tree

47 files changed

+165
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+165
-176
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionModuleCheckTaskProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public class InternalDistributionModuleCheckTaskProvider {
5454
"org.elasticsearch.geo",
5555
"org.elasticsearch.logging",
5656
"org.elasticsearch.lz4",
57-
"org.elasticsearch.plugin.analysis.api",
58-
"org.elasticsearch.plugin.api",
57+
"org.elasticsearch.plugin",
58+
"org.elasticsearch.plugin.analysis",
5959
"org.elasticsearch.pluginclassloader",
6060
"org.elasticsearch.securesm",
6161
"org.elasticsearch.server",

build-tools/src/integTest/groovy/org/elasticsearch/gradle/plugin/StablePluginBuildPluginFuncTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class StablePluginBuildPluginFuncTest extends AbstractGradleFuncTest {
9292
file("src/main/java/org/acme/A.java") << """
9393
package org.acme;
9494
95-
import org.elasticsearch.plugin.api.NamedComponent;
95+
import org.elasticsearch.plugin.NamedComponent;
9696
import org.elasticsearch.plugin.scanner.test_classes.ExtensibleClass;
9797
9898
@NamedComponent( "componentA")

build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/StableApiJarMocks.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import net.bytebuddy.ByteBuddy;
1212
import net.bytebuddy.dynamic.DynamicType;
1313

14-
import org.elasticsearch.plugin.api.Extensible;
15-
import org.elasticsearch.plugin.api.NamedComponent;
14+
import org.elasticsearch.plugin.Extensible;
15+
import org.elasticsearch.plugin.NamedComponent;
1616
import org.elasticsearch.plugin.scanner.test_classes.ExtensibleClass;
1717
import org.elasticsearch.plugin.scanner.test_classes.ExtensibleInterface;
1818

build-tools/src/testFixtures/java/org/elasticsearch/plugin/api/Extensible.java renamed to build-tools/src/testFixtures/java/org/elasticsearch/plugin/Extensible.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* in compliance with, at your election, the Elastic License 2.0 or the Server
66
* Side Public License, v 1.
77
*/
8-
package org.elasticsearch.plugin.api;
8+
package org.elasticsearch.plugin;
99

1010
import java.lang.annotation.Retention;
1111
import java.lang.annotation.RetentionPolicy;

build-tools/src/testFixtures/java/org/elasticsearch/plugin/api/NamedComponent.java renamed to build-tools/src/testFixtures/java/org/elasticsearch/plugin/NamedComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.plugin.api;
9+
package org.elasticsearch.plugin;
1010

1111
import java.lang.annotation.ElementType;
1212
import java.lang.annotation.Retention;

build-tools/src/testFixtures/java/org/elasticsearch/plugin/scanner/test_classes/ExtensibleClass.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package org.elasticsearch.plugin.scanner.test_classes;
1010

11-
import org.elasticsearch.plugin.api.Extensible;
11+
import org.elasticsearch.plugin.Extensible;
1212

1313
@Extensible
1414
public class ExtensibleClass {}

build-tools/src/testFixtures/java/org/elasticsearch/plugin/scanner/test_classes/ExtensibleInterface.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package org.elasticsearch.plugin.scanner.test_classes;
1010

11-
import org.elasticsearch.plugin.api.Extensible;
11+
import org.elasticsearch.plugin.Extensible;
1212

1313
@Extensible
1414
public interface ExtensibleInterface {}

build-tools/src/testFixtures/java/org/elasticsearch/plugin/scanner/test_classes/TestNamedComponent.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
package org.elasticsearch.plugin.scanner.test_classes;
1010

11-
@org.elasticsearch.plugin.api.NamedComponent("test_named_component")
11+
import org.elasticsearch.plugin.NamedComponent;
12+
13+
@NamedComponent("test_named_component")
1214
public class TestNamedComponent implements ExtensibleInterface {
1315

1416
}

libs/plugin-analysis-api/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
apply plugin: 'elasticsearch.publish'
1010
apply plugin: 'elasticsearch.build'
1111

12+
group = "org.elasticsearch.plugin"
1213

1314
tasks.named("loggerUsageCheck").configure {enabled = false }
1415

libs/plugin-analysis-api/src/main/java/module-info.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* Side Public License, v 1.
77
*/
88

9-
module org.elasticsearch.plugin.analysis.api {
9+
module org.elasticsearch.plugin.analysis {
1010
requires org.apache.lucene.core;
11-
requires org.elasticsearch.plugin.api;
11+
requires org.elasticsearch.plugin;
1212

13-
exports org.elasticsearch.plugin.analysis.api;
13+
exports org.elasticsearch.plugin.analysis;
1414
}

0 commit comments

Comments
 (0)