Skip to content

fix: compile errors after @Setting cleanup #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paullatzelsperger merged 1 commit into from
Apr 14, 2026
Merged

fix: compile errors after @Setting cleanup #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...a/org/eclipse/edc/plugins/autodoc/core/processor/introspection/ExtensionIntrospector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,12 @@ private ConfigurationSetting createConfigurationSetting(VariableElement settingE
.toString();

var description = Stream.of(
attributeValue(String.class, "description", settingMirror, elementUtils),
attributeValue(String.class, "value", settingMirror, elementUtils)
attributeValue(String.class, "description", settingMirror, elementUtils)
).filter(Objects::nonNull).filter(it -> !it.isEmpty()).findFirst().orElse(null);

return ConfigurationSetting.Builder.newInstance()
.key(keyValue)
.description(description)
.type(attributeValue(String.class, "type", settingMirror, elementUtils))
.required(attributeValue(Boolean.class, "required", settingMirror, elementUtils))
.maximum(attributeValue(Long.class, "max", settingMirror, elementUtils))
.minimum(attributeValue(Long.class, "min", settingMirror, elementUtils))
Expand Down
2 changes: 1 addition & 1 deletion ...rg/eclipse/edc/plugins/autodoc/core/processor/test/ConfigurationExtensionWithSetting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

public class ConfigurationExtensionWithSetting implements ConfigurationExtension {

@Setting("Valid because this is an extension of ServiceExtension")
@Setting(description = "Valid because this is an extension of ServiceExtension")
private static final String VALID_SETTING = "any";

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/org/eclipse/edc/plugins/autodoc/core/processor/test/NotExtensionWithSetting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
import org.eclipse.edc.runtime.metamodel.annotation.Setting;

public class NotExtensionWithSetting {
@Setting("the setting must stay in a ServiceExtension class")
@Setting(description = "the setting must stay in a ServiceExtension class")
private static final String UNEXPECTED_SETTING = "any";
}
4 changes: 2 additions & 2 deletions ...e/edc/plugins/autodoc/core/processor/testextensions/SampleExtensionWithoutAnnotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@

@Provides(SomeOtherService.class)
public class SampleExtensionWithoutAnnotation implements ServiceExtension {
@Setting(value = Constants.TEST_SETTING_NAME, required = true, defaultValue = TEST_SETTING_DEFAULT_VALUE)
@Setting(description = Constants.TEST_SETTING_NAME, required = true, defaultValue = TEST_SETTING_DEFAULT_VALUE)
public static final String TEST_SETTING = Constants.TEST_SETTING_KEY;

@Deprecated(since = "forever")
@Setting(value = "deprecated")
@Setting(description = "deprecated")
public static final String DEPRECATED_TEST_SETTING = Constants.TEST_DEPRECATED_SETTING_KEY;

@Inject
Expand Down
Loading