App Manager

io.openems.common/src/io/openems/common/utils/EnumUtils.java

@@ -48,6 +48,24 @@ public static <ENUM extends Enum<ENUM>> Optional<String> getAsOptionalString(Enu
 		}
 	}
 
+	/**
+	 * Gets the member of the {@link EnumMap} as {@link Optional} {@link Integer}.
+	 *
+	 * @param <ENUM> the type of the EnumMap key
+	 * @param map    the {@link EnumMap}
+	 * @param member the member
+	 * @return the {@link Optional} {@link Integer} value
+	 * @throws OpenemsNamedException on error
+	 */
+	public static <ENUM extends Enum<ENUM>> Optional<Integer> getAsOptionalInt(EnumMap<ENUM, JsonElement> map,
+			ENUM member) {
+		try {
+			return Optional.of(getAsInt(map, member));
+		} catch (OpenemsNamedException e) {
+			return Optional.empty();
+		}
+	}
+
 	/**
 	 * Gets the member of the {@link EnumMap} as {@link JsonPrimitive}.
 	 *

io.openems.common/src/io/openems/common/utils/JsonUtils.java

@@ -5,12 +5,19 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
+import java.util.stream.Collector;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Function;
+import com.google.common.base.Supplier;
+import com.google.common.collect.Sets;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -291,8 +298,49 @@ public JsonObject build() {
 
 	}
 
+	public static class JsonArrayCollector implements Collector<JsonElement, JsonUtils.JsonArrayBuilder, JsonArray> {
+
+		@Override
+		public Set<Characteristics> characteristics() {
+			return Sets.<Characteristics>newHashSet().stream().collect(Sets.toImmutableEnumSet());
+		}
+
+		@Override
+		public Supplier<JsonArrayBuilder> supplier() {
+			return JsonUtils::buildJsonArray;
+		}
+
+		@Override
+		public BiConsumer<JsonArrayBuilder, JsonElement> accumulator() {
+			return JsonUtils.JsonArrayBuilder::add;
+		}
+
+		@Override
+		public BinaryOperator<JsonArrayBuilder> combiner() {
+			return (t, u) -> {
+				u.build().forEach(j -> t.add(j));
+				return t;
+			};
+		}
+
+		@Override
+		public Function<JsonArrayBuilder, JsonArray> finisher() {
+			return JsonArrayBuilder::build;
+		}
+
+	}
+
 	private static final Logger LOG = LoggerFactory.getLogger(JsonUtils.class);
 
+	/**
+	 * Returns a Collector that accumulates the input elements into a new JsonArray. 
+	 * 
+	 * @return a Collector which collects all the input elements into a JsonArray
+	 */
+	public static Collector<JsonElement, JsonUtils.JsonArrayBuilder, JsonArray> toJsonArray() {
+		return new JsonUtils.JsonArrayCollector();
+	}
+
 	/**
 	 * Creates a JsonArray using a Builder.
 	 *

io.openems.edge.common/src/io/openems/edge/common/test/DummyComponentManager.java

@@ -1,21 +1,29 @@
 package io.openems.edge.common.test;
 
+import java.io.IOException;
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.component.ComponentContext;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
 import io.openems.common.exceptions.OpenemsError;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
+import io.openems.common.exceptions.OpenemsException;
+import io.openems.common.jsonrpc.base.GenericJsonrpcResponseSuccess;
 import io.openems.common.jsonrpc.base.JsonrpcRequest;
 import io.openems.common.jsonrpc.base.JsonrpcResponseSuccess;
 import io.openems.common.jsonrpc.request.GetEdgeConfigRequest;
+import io.openems.common.jsonrpc.request.UpdateComponentConfigRequest;
 import io.openems.common.jsonrpc.response.GetEdgeConfigResponse;
 import io.openems.common.session.Role;
 import io.openems.common.types.EdgeConfig;
@@ -33,6 +41,8 @@ public class DummyComponentManager implements ComponentManager {
 	private final Clock clock;
 	private JsonObject edgeConfigJson;
 
+	private ConfigurationAdmin configurationAdmin = null;
+
 	public DummyComponentManager() {
 		this(Clock.systemDefaultZone());
 	}
@@ -56,7 +66,7 @@ public List<OpenemsComponent> getAllComponents() {
 	public <T extends OpenemsComponent> List<T> getEnabledComponentsOfType(Class<T> clazz) {
 		List<T> result = new ArrayList<>();
 		for (OpenemsComponent component : this.components) {
-			if (component.getClass().isInstance(clazz)) {
+			if (clazz.isInstance(component)) {
 				result.add((T) component);
 			}
 		}
@@ -167,6 +177,8 @@ public CompletableFuture<JsonrpcResponseSuccess> handleJsonrpcRequest(User user,
 
 		case GetEdgeConfigRequest.METHOD:
 			return this.handleGetEdgeConfigRequest(user, GetEdgeConfigRequest.from(request));
+		case UpdateComponentConfigRequest.METHOD:
+			return this.handleUpdateComponentConfigRequest(user, UpdateComponentConfigRequest.from(request));
 
 		default:
 			throw OpenemsError.JSONRPC_UNHANDLED_METHOD.exception(request.getMethod());
@@ -188,9 +200,33 @@ private CompletableFuture<JsonrpcResponseSuccess> handleGetEdgeConfigRequest(Use
 		return CompletableFuture.completedFuture(response);
 	}
 
+	private CompletableFuture<JsonrpcResponseSuccess> handleUpdateComponentConfigRequest(User user,
+			UpdateComponentConfigRequest request) throws OpenemsNamedException {
+		if (this.configurationAdmin == null) {
+			throw new OpenemsException("Can not update Component Config. ConfigurationAdmin is null!");
+		}
+		try {
+			for (var configuration : this.configurationAdmin.listConfigurations(request.getComponentId())) {
+				var properties = new Hashtable<String, JsonElement>();
+				for (var property : request.getProperties()) {
+					properties.put(property.getName(), property.getValue());
+				}
+				configuration.update(properties);
+				break;
+			}
+			return CompletableFuture.completedFuture(new GenericJsonrpcResponseSuccess(request.getId()));
+		} catch (IOException | InvalidSyntaxException e) {
+			throw new OpenemsException("Can not update Component Config.");
+		}
+	}
+
 	@Override
 	public Clock getClock() {
 		return this.clock;
 	}
 
+	public void setConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
+		this.configurationAdmin = configurationAdmin;
+	}
+
 }

io.openems.edge.core/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,4 @@
 eclipse.preferences.version=1
+encoding//src/io/openems/edge/core/appmanager/dependency/translation_de.properties=UTF-8
+encoding//src/io/openems/edge/core/appmanager/translation_de.properties=UTF-8
 encoding/<project>=UTF-8

io.openems.edge.core/src/io/openems/edge/app/api/ModbusTcpApiReadOnly.java

@@ -2,7 +2,6 @@
 
 import java.util.EnumMap;
 import java.util.List;
-import java.util.Map;
 import java.util.TreeMap;
 
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -14,7 +13,8 @@
 import com.google.gson.JsonElement;
 
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
-import io.openems.common.function.ThrowingBiFunction;
+import io.openems.common.function.ThrowingTriFunction;
+import io.openems.common.session.Language;
 import io.openems.common.types.EdgeConfig;
 import io.openems.common.utils.JsonUtils;
 import io.openems.edge.app.api.ModbusTcpApiReadOnly.Property;
@@ -29,8 +29,7 @@
 import io.openems.edge.core.appmanager.OpenemsAppCardinality;
 import io.openems.edge.core.appmanager.OpenemsAppCategory;
 import io.openems.edge.core.appmanager.validator.CheckAppsNotInstalled;
-import io.openems.edge.core.appmanager.validator.Validator;
-import io.openems.edge.core.appmanager.validator.Validator.Builder;
+import io.openems.edge.core.appmanager.validator.ValidatorConfig;
 
 /**
  * Describes a App for ReadOnly Modbus/TCP Api.
@@ -45,8 +44,7 @@
     	"CONTROLLER_ID": "ctrlApiModbusTcp0"
     },
     "appDescriptor": {
-    	"websiteUrl": <a href=
-"https://docs.fenecon.de/de/_/latest/fems/apis.html#_fems_app_modbustcp_api_lesend">https://docs.fenecon.de/de/_/latest/fems/apis.html#_fems_app_modbustcp_api_lesend</a>
+    	"websiteUrl": URL
     }
   }
  * </pre>
@@ -66,8 +64,8 @@ public ModbusTcpApiReadOnly(@Reference ComponentManager componentManager, Compon
 	}
 
 	@Override
-	public AppAssistant getAppAssistant() {
-		return AppAssistant.create(this.getName()) //
+	public AppAssistant getAppAssistant(Language language) {
+		return AppAssistant.create(this.getName(language)) //
 				.build();
 	}
 
@@ -82,29 +80,19 @@ public OpenemsAppCategory[] getCategorys() {
 		return new OpenemsAppCategory[] { OpenemsAppCategory.API };
 	}
 
-	@Override
-	public String getImage() {
-		return OpenemsApp.FALLBACK_IMAGE;
-	}
-
-	@Override
-	public String getName() {
-		return "Modbus/TCP-Api Read-Only";
-	}
-
 	@Override
 	public OpenemsAppCardinality getCardinality() {
 		return OpenemsAppCardinality.SINGLE;
 	}
 
 	@Override
-	protected ThrowingBiFunction<ConfigurationTarget, EnumMap<Property, JsonElement>, AppConfiguration, OpenemsNamedException> appConfigurationFactory() {
-		return (t, p) -> {
+	protected ThrowingTriFunction<ConfigurationTarget, EnumMap<Property, JsonElement>, Language, AppConfiguration, OpenemsNamedException> appConfigurationFactory() {
+		return (t, p, l) -> {
 
 			var controllerId = this.getId(t, p, Property.CONTROLLER_ID, "ctrlApiModbusTcp0");
 
 			List<EdgeConfig.Component> components = Lists.newArrayList(//
-					new EdgeConfig.Component(controllerId, this.getName(), "Controller.Api.ModbusTcp.ReadOnly",
+					new EdgeConfig.Component(controllerId, this.getName(l), "Controller.Api.ModbusTcp.ReadOnly",
 							JsonUtils.buildJsonObject() //
 									.build()));
 
@@ -113,14 +101,13 @@ protected ThrowingBiFunction<ConfigurationTarget, EnumMap<Property, JsonElement>
 	}
 
 	@Override
-	public Builder getValidateBuilder() {
-		return Validator.create() //
-				.setInstallableCheckableNames(new Validator.MapBuilder<>(new TreeMap<String, Map<String, ?>>()) //
-						.put(CheckAppsNotInstalled.COMPONENT_NAME, //
-								new Validator.MapBuilder<>(new TreeMap<String, Object>()) //
+	protected io.openems.edge.core.appmanager.validator.ValidatorConfig.Builder getValidateBuilder() {
+		return ValidatorConfig.create() //
+				.setInstallableCheckableConfigs(
+						Lists.newArrayList(new ValidatorConfig.CheckableConfig(CheckAppsNotInstalled.COMPONENT_NAME,
+								new ValidatorConfig.MapBuilder<>(new TreeMap<String, Object>()) //
 										.put("appIds", new String[] { "App.Api.ModbusTcp.ReadWrite" }) //
-										.build())
-						.build());
+										.build())));
 	}
 
 	@Override