refactor: move the runtime-metamodel module in its own repo (#164)

* refactor: move the runtime-metamodel module in its own repo

* removed remnants, amended repos

Author: paullatzelsperger

CODEOWNERS

@@ -17,7 +17,6 @@ README.md @paullatzelsperger
 .github/ISSUE_TEMPLATE @paullatzelsperger
 .github/workflows/ @paullatzelsperger
 
-/runtime-metamodel/ @paullatzelsperger @jimmarino
 /plugins/autodoc/autodoc-core/ @paullatzelsperger @jimmarino
 /plugins/autodoc/autodoc-extension-test/ @paullatzelsperger @jimmarino
 /plugins/autodoc/autodoc-spi-test/ @paullatzelsperger @jimmarino

buildSrc/build.gradle.kts

@@ -6,7 +6,11 @@ group = "org.eclipse.edc"
 
 repositories {
     mavenCentral()
+    maven {
+        url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+    }
     gradlePluginPortal()
+    mavenLocal()
 }
 
 dependencies {
@@ -23,6 +27,9 @@ dependencies {
     implementation(libs.jackson.annotations)
     implementation(libs.jackson.databind)
     implementation(libs.jackson.datatypeJsr310)
+
+    api(libs.edc.runtime.metamodel)
+
 }
 
 gradlePlugin {
@@ -38,7 +45,6 @@ sourceSets {
     main {
         java {
             srcDirs(
-                "../runtime-metamodel/src/main",
                 "../plugins/autodoc/autodoc-plugin/src/main",
                 "../plugins/autodoc/autodoc-processor/src/main",
                 "../plugins/edc-build/src/main",

gradle/libs.versions.toml

@@ -2,10 +2,12 @@
 format.version = "1.1"
 
 [versions]
+edc = "0.1.3-SNAPSHOT"
 jackson = "2.15.2"
 jetbrainsAnnotation = "24.0.1"
 
 [libraries]
+edc-runtime-metamodel = { module = "org.eclipse.edc:runtime-metamodel", version.ref = "edc" }
 jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
 jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }

plugins/autodoc/autodoc-plugin/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":runtime-metamodel"))
+    implementation(libs.edc.runtime.metamodel)
     implementation(libs.jetbrains.annotations)
     implementation(libs.jackson.core)
     implementation(libs.jackson.annotations)

plugins/autodoc/autodoc-plugin/src/main/java/org/eclipse/edc/plugins/autodoc/AutodocPlugin.java

@@ -25,7 +25,7 @@
  */
 public class AutodocPlugin implements Plugin<Project> {
 
-    private final List<String> exclusions = List.of("runtime-metamodel", "version-catalog", "edc-build", "module-names", "openapi-merger", "test-summary", "autodoc-plugin", "autodoc-processor");
+    private final List<String> exclusions = List.of("version-catalog", "edc-build", "module-names", "openapi-merger", "test-summary", "autodoc-plugin", "autodoc-processor");
 
     @Override
     public void apply(Project project) {

plugins/autodoc/autodoc-processor/build.gradle.kts

@@ -16,5 +16,5 @@ plugins {
 }
 
 dependencies {
-    api(project(":runtime-metamodel"))
+    api(libs.edc.runtime.metamodel)
 }

plugins/autodoc/autodoc-processor/src/main/java/org/eclipse/edc/plugins/autodoc/core/processor/introspection/ExtensionIntrospector.java

@@ -15,8 +15,6 @@
 package org.eclipse.edc.plugins.autodoc.core.processor.introspection;
 
 import org.eclipse.edc.plugins.autodoc.core.processor.compiler.AnnotationFunctions;
-import org.eclipse.edc.runtime.metamodel.annotation.EdcSetting;
-import org.eclipse.edc.runtime.metamodel.annotation.EdcSettingContext;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
@@ -103,8 +101,7 @@ public List<Service> resolveProvidedServices(Element element) {
      * Resolves configuration points declared with {@link Setting}.
      */
     public List<ConfigurationSetting> resolveConfigurationSettings(Element element) {
-        return Stream.concat(getEnclosedElementsAnnotatedWith(element, EdcSetting.class),
-                        getEnclosedElementsAnnotatedWith(element, Setting.class))
+        return getEnclosedElementsAnnotatedWith(element, Setting.class)
                 .filter(VariableElement.class::isInstance)
                 .map(VariableElement.class::cast)
                 .map(this::createConfigurationSetting)
@@ -141,9 +138,6 @@ private ConfigurationSetting createConfigurationSetting(VariableElement settingE
         var settingBuilder = ConfigurationSetting.Builder.newInstance().key(keyValue);
 
         var settingMirror = mirrorFor(Setting.class, settingElement);
-        if (settingMirror == null) { //todo: compatibility
-            settingMirror = mirrorFor(EdcSetting.class, settingElement);
-        }
 
         var description = attributeValue(String.class, "value", settingMirror, elementUtils);
         settingBuilder.description(description);
@@ -164,7 +158,7 @@ private ConfigurationSetting createConfigurationSetting(VariableElement settingE
     }
 
     /**
-     * Resolves a configuration prefix specified by {@link EdcSettingContext} for a given EDC setting element or an empty string if there is none.
+     * Resolves a configuration prefix specified by {@link SettingContext} for a given EDC setting element or an empty string if there is none.
      */
     @NotNull
     private String resolveConfigurationPrefix(VariableElement edcSettingElement) {
@@ -173,9 +167,6 @@ private String resolveConfigurationPrefix(VariableElement edcSettingElement) {
             return "";
         }
         var contextMirror = mirrorFor(SettingContext.class, enclosingElement);
-        if (contextMirror == null) {
-            contextMirror = mirrorFor(EdcSettingContext.class, enclosingElement);
-        }
         return contextMirror != null ? attributeValue(String.class, "value", contextMirror, elementUtils) : "";
     }
 }

plugins/autodoc/autodoc-processor/src/main/java/org/eclipse/edc/plugins/autodoc/core/processor/introspection/ModuleIntrospector.java

@@ -14,7 +14,6 @@
 
 package org.eclipse.edc.plugins.autodoc.core.processor.introspection;
 
-import org.eclipse.edc.runtime.metamodel.annotation.EdcSetting;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
@@ -80,7 +79,6 @@ public String getModuleName(RoundEnvironment environment) {
      *     <li>Are annotated with {@link Provides}</li>
      *     <li>Are annotated with {@link Requires}</li>
      *     <li>Have one or more fields annotated with {@link Inject}</li>
-     *     <li>Have one or more fields annotated with {@link EdcSetting}</li>
      *     <li>Have one or more methods annotated with {@link Provider}</li>
      * </ul>
      * <p>
@@ -92,14 +90,13 @@ public String getModuleName(RoundEnvironment environment) {
      */
     public Set<Element> getExtensionElements(RoundEnvironment environment) {
         var extensionClasses = environment.getElementsAnnotatedWith(Extension.class);
-        var settingsSymbolsDeprecated = environment.getElementsAnnotatedWith(EdcSetting.class);
         var settingsSymbols = environment.getElementsAnnotatedWith(Setting.class);
         var injectSymbols = environment.getElementsAnnotatedWith(Inject.class);
         var providerSymbols = environment.getElementsAnnotatedWith(Provider.class);
         var providesClasses = environment.getElementsAnnotatedWith(Provides.class);
         var requiresClasses = environment.getElementsAnnotatedWith(Requires.class);
 
-        var symbols = Stream.concat(settingsSymbols.stream(), settingsSymbolsDeprecated.stream());
+        var symbols = settingsSymbols.stream();
         symbols = Stream.concat(symbols, injectSymbols.stream());
         symbols = Stream.concat(symbols, providerSymbols.stream());
 

plugins/autodoc/autodoc-processor/src/test/java/org/eclipse/edc/plugins/autodoc/core/processor/testextensions/SampleExtensionWithoutAnnotation.java

@@ -15,15 +15,15 @@
 package org.eclipse.edc.plugins.autodoc.core.processor.testextensions;
 
 import org.eclipse.edc.plugins.autodoc.core.processor.Constants;
-import org.eclipse.edc.runtime.metamodel.annotation.EdcSetting;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
 import org.eclipse.edc.runtime.metamodel.annotation.Provides;
+import org.eclipse.edc.runtime.metamodel.annotation.Setting;
 import org.eclipse.edc.spi.system.ServiceExtension;
 
 @Provides(SomeOtherService.class)
 public class SampleExtensionWithoutAnnotation implements ServiceExtension {
-    @EdcSetting(value = Constants.TEST_SETTING_NAME, required = true)
+    @Setting(value = Constants.TEST_SETTING_NAME, required = true)
     public static final String TEST_SETTING = Constants.TEST_SETTING_KEY;
 
     @Inject

plugins/edc-build/build.gradle.kts

@@ -10,12 +10,12 @@ repositories {
 }
 
 dependencies {
-    implementation(project(":runtime-metamodel"))
     implementation(project(":plugins:autodoc:autodoc-plugin"))
     implementation(project(":plugins:test-summary"))
     implementation(project(":plugins:module-names"))
     implementation(project(":plugins:openapi-merger"))
 
+    implementation(libs.edc.runtime.metamodel)
     implementation(libs.plugin.dependency.analysis)
     implementation(libs.plugin.nexus.publish)
     implementation(libs.plugin.checksum)