chore: remove @EdcSetting and @EdcSettingContext from the code base (#47)

Author: paullatzelsperger

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,7 @@ 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 fields annotated with {@link Setting}</li>
      *     <li>Have one or more methods annotated with {@link Provider}</li>
      * </ul>
      * <p>
@@ -92,14 +91,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