Skip to content

Enhance OAuthBackendImpl with dynamic backend reference #3419

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
sfeilmeier merged 4 commits into from
Nov 30, 2025
+14 −4
Merged

Enhance OAuthBackendImpl with dynamic backend reference #3419

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
747bf4f
Enhance OAuthBackendImpl with dynamic backend reference
Sn0w3y Nov 16, 2025
b6d4520
Merge branch 'OpenEMS:develop' into fix-oauth
Sn0w3y Nov 27, 2025
cee439d
Restrict validation to OpenemsComponent and simplify OAuthBackendImpl
Sn0w3y Nov 27, 2025
99f1346
Cleanup
sfeilmeier Nov 30, 2025
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
18 changes: 14 additions & 4 deletions io.openems.edge.core/src/io/openems/edge/core/componentmanager/OsgiValidateWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import org.osgi.service.cm.ConfigurationEvent;
import org.osgi.service.component.runtime.ServiceComponentRuntime;
import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -142,9 +141,15 @@ private void restartDefectiveComponents() {
private static void updateInactiveComponentsUsingScr(Map<String, String> defectiveComponents,
ServiceComponentRuntime scr) {
var descriptions = scr.getComponentDescriptionDTOs();
for (ComponentDescriptionDTO description : descriptions) {
for (var description : descriptions) {
// Consider only components that implement OpenemsComponent
if (!Stream.of(description.serviceInterfaces) //
.anyMatch(OpenemsComponent.class.getName()::equals)) {
continue;
}

var configurations = scr.getComponentConfigurationDTOs(description);
for (ComponentConfigurationDTO configuration : configurations) {
for (var configuration : configurations) {
if (!MapUtils.getAsOptionalBoolean(configuration.properties, "enabled").orElse(true)) {
// Component is not enabled -> ignore
continue;
Expand All @@ -155,10 +160,12 @@ private static void updateInactiveComponentsUsingScr(Map<String, String> defecti
case ComponentConfigurationDTO.ACTIVE:
case ComponentConfigurationDTO.SATISFIED:
continue;

case ComponentConfigurationDTO.UNSATISFIED_CONFIGURATION: {
defectDetails = "Missing required configuration";
break;
}

case ComponentConfigurationDTO.UNSATISFIED_REFERENCE: {
defectDetails = "Unsatisfied reference for " //
+ Stream.of(configuration.unsatisfiedReferences) //
Expand All @@ -172,14 +179,17 @@ private static void updateInactiveComponentsUsingScr(Map<String, String> defecti
.collect(Collectors.joining(",")); //
break;
}

case ComponentConfigurationDTO.FAILED_ACTIVATION: {
defectDetails = "Failed activation " + configuration.failure.split(System.lineSeparator(), 2)[0];
break;
}

default:
defectDetails = "Undefined failure [" + configuration.state + "];";
}
var componentId = (String) configuration.properties.get("id");

var componentId = MapUtils.getAsString(configuration.properties, "id");
defectiveComponents.put(componentId, defectDetails);
}
}
Expand Down