Merge branch 'release/2021.5.0'

OpenEMS · Mar 11, 2021 · 5c9a9c5 · 5c9a9c5
2 parents 7a4e205 + 617c208
commit 5c9a9c5
Show file tree

Hide file tree

Showing 351 changed files with 7,613 additions and 5,870 deletions.
diff --git a/cnf/checkstyle.xml b/cnf/checkstyle.xml
@@ -201,7 +201,7 @@
     </module>
     <module name="MissingJavadocMethod">
       <property name="allowedAnnotations" value="Before,Test,After,Override"/>
-      <property name="ignoreMethodNamesRegex" value="doc"/>
+      <property name="ignoreMethodNamesRegex" value="doc|set.+"/>
       <property name="tokens" value="METHOD_DEF,ANNOTATION_FIELD_DEF"/>
     </module>
   </module>

diff --git a/doc/modules/ROOT/pages/single_document.adoc b/doc/modules/ROOT/pages/single_document.adoc
@@ -1,7 +1,7 @@
 = OpenEMS - Open Energy Management System
 ifndef::toc[]
 (c) 2020 OpenEMS Association e.V.
-Version 2021.4.0
+Version 2021.5.0
 :sectnums:
 :sectnumlevels: 4
 :toc:

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -6,11 +6,16 @@
 
 -runproperties: \
 	org.osgi.service.http.port=8079,\
-	felix.cm.dir=c:/openems-backend-config
+	felix.cm.dir=c:/openems-backend-config,\
+	org.ops4j.pax.logging.DefaultServiceLog.level=INFO
 
 -runsystempackages: \
 	sun.misc
 
+-runbundles+: \
+	org.apache.felix.scr;startlevel=10,\
+    org.ops4j.pax.logging.pax-logging-log4j1;startlevel=12
+
 -runrequires: \
 	bnd.identity;id='org.ops4j.pax.logging.pax-logging-api',\
 	bnd.identity;id='org.ops4j.pax.logging.pax-logging-log4j1',\
@@ -24,13 +29,13 @@
 	bnd.identity;id='io.openems.backend.b2bwebsocket',\
 	bnd.identity;id='io.openems.backend.common',\
 	bnd.identity;id='io.openems.backend.core',\
-	bnd.identity;id='io.openems.backend.edgewebsocket.impl',\
+	bnd.identity;id='io.openems.backend.edgewebsocket',\
 	bnd.identity;id='io.openems.backend.metadata.dummy',\
 	bnd.identity;id='io.openems.backend.metadata.file',\
 	bnd.identity;id='io.openems.backend.metadata.odoo',\
 	bnd.identity;id='io.openems.backend.timedata.dummy',\
 	bnd.identity;id='io.openems.backend.timedata.influx',\
-	bnd.identity;id='io.openems.backend.uiwebsocket.impl',\
+	bnd.identity;id='io.openems.backend.uiwebsocket',\
 
 -runbundles: \
 	Java-WebSocket;version='[1.5.1,1.5.2)',\
@@ -43,17 +48,13 @@
 	io.openems.backend.b2bwebsocket;version=snapshot,\
 	io.openems.backend.common;version=snapshot,\
 	io.openems.backend.core;version=snapshot,\
-	io.openems.backend.edgewebsocket.api;version=snapshot,\
-	io.openems.backend.edgewebsocket.impl;version=snapshot,\
-	io.openems.backend.metadata.api;version=snapshot,\
+	io.openems.backend.edgewebsocket;version=snapshot,\
 	io.openems.backend.metadata.dummy;version=snapshot,\
 	io.openems.backend.metadata.file;version=snapshot,\
 	io.openems.backend.metadata.odoo;version=snapshot,\
-	io.openems.backend.timedata.api;version=snapshot,\
 	io.openems.backend.timedata.dummy;version=snapshot,\
 	io.openems.backend.timedata.influx;version=snapshot,\
-	io.openems.backend.uiwebsocket.api;version=snapshot,\
-	io.openems.backend.uiwebsocket.impl;version=snapshot,\
+	io.openems.backend.uiwebsocket;version=snapshot,\
 	io.openems.common;version=snapshot,\
 	io.openems.shared.influxdb;version=snapshot,\
 	io.openems.wrapper.fastexcel;version=snapshot,\

diff --git a/io.openems.backend.application/bnd.bnd b/io.openems.backend.application/bnd.bnd
@@ -6,12 +6,8 @@ Bundle-Version: 1.0.0.${tstamp}
 -buildpath: \
 	${buildpath},\
 	io.openems.backend.common,\
-	io.openems.backend.edgewebsocket.api,\
-	io.openems.backend.metadata.api,\
-	io.openems.backend.timedata.api,\
-	io.openems.backend.uiwebsocket.api,\
 	io.openems.common,\
-	Java-WebSocket;version=1.4.1
+	Java-WebSocket;version='1.4.1'
 
 -testpath: \
 	${testpath}
diff --git a/io.openems.backend.b2brest/bnd.bnd b/io.openems.backend.b2brest/bnd.bnd
@@ -6,9 +6,8 @@ Bundle-Version: 1.0.0.${tstamp}
 -buildpath: \
 	${buildpath},\
 	io.openems.backend.common,\
-	io.openems.backend.metadata.api,\
 	io.openems.common,\
-	Java-WebSocket;version=1.4.1,\
+	Java-WebSocket;version='1.4.1',\
 	javax.servlet-api,\
 	org.apache.felix.http.jetty
 

diff --git a/io.openems.backend.b2brest/src/io/openems/backend/b2brest/B2bRest.java b/io.openems.backend.b2brest/src/io/openems/backend/b2brest/B2bRest.java
@@ -14,7 +14,7 @@
 
 import io.openems.backend.common.component.AbstractOpenemsBackendComponent;
 import io.openems.backend.common.jsonrpc.JsonRpcRequestHandler;
-import io.openems.backend.metadata.api.Metadata;
+import io.openems.backend.common.metadata.Metadata;
 import io.openems.common.exceptions.OpenemsException;
 
 @Designate(ocd = Config.class, factory = true)

diff --git a/io.openems.backend.b2brest/src/io/openems/backend/b2brest/RestHandler.java b/io.openems.backend.b2brest/src/io/openems/backend/b2brest/RestHandler.java
@@ -25,7 +25,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-import io.openems.backend.metadata.api.BackendUser;
+import io.openems.backend.common.metadata.BackendUser;
 import io.openems.common.exceptions.OpenemsError;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;

diff --git a/io.openems.backend.b2bwebsocket/bnd.bnd b/io.openems.backend.b2bwebsocket/bnd.bnd
@@ -6,10 +6,8 @@ Bundle-Version: 1.0.0.${tstamp}
 -buildpath: \
 	${buildpath},\
 	io.openems.backend.common,\
-	io.openems.backend.metadata.api,\
-	io.openems.backend.timedata.api,\
 	io.openems.common,\
-	Java-WebSocket;version=1.4.1
+	Java-WebSocket;version='1.4.1'
 
 -testpath: \
 	${testpath}
diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/B2bWebsocket.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/B2bWebsocket.java
@@ -12,8 +12,8 @@
 
 import io.openems.backend.common.component.AbstractOpenemsBackendComponent;
 import io.openems.backend.common.jsonrpc.JsonRpcRequestHandler;
-import io.openems.backend.metadata.api.Metadata;
-import io.openems.backend.timedata.api.Timedata;
+import io.openems.backend.common.metadata.Metadata;
+import io.openems.backend.common.timedata.Timedata;
 
 @Designate(ocd = Config.class, factory = true)
 @Component(//
@@ -40,23 +40,33 @@ public B2bWebsocket() {
 		super("Backend2Backend.Websocket");
 	}
 
+	private Config config;
+
+	private final Runnable startServerWhenMetadataIsInitialized = () -> {
+		this.startServer(config.port(), config.poolSize(), config.debugMode());
+	};
+
 	@Activate
 	void activate(Config config) {
-		this.startServer(config.port());
+		this.config = config;
+		this.metadata.addOnIsInitializedListener(this.startServerWhenMetadataIsInitialized);
 	}
 
 	@Deactivate
 	void deactivate() {
+		this.metadata.removeOnIsInitializedListener(this.startServerWhenMetadataIsInitialized);
 		this.stopServer();
 	}
 
 	/**
 	 * Create and start new server.
 	 * 
-	 * @param port the port
+	 * @param port      the port
+	 * @param poolSize  number of threads dedicated to handle the tasks
+	 * @param debugMode activate a regular debug log about the state of the tasks
 	 */
-	private synchronized void startServer(int port) {
-		this.server = new WebsocketServer(this, this.getName(), port);
+	private synchronized void startServer(int port, int poolSize, boolean debugMode) {
+		this.server = new WebsocketServer(this, this.getName(), port, poolSize, debugMode);
 		this.server.start();
 	}
 

diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/Config.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/Config.java
@@ -11,6 +11,12 @@
 	@AttributeDefinition(name = "Port", description = "The port of the websocket server.")
 	int port() default B2bWebsocket.DEFAULT_PORT;
 
+	@AttributeDefinition(name = "Number of Threads", description = "Pool-Size: the number of threads dedicated to handle the tasks")
+	int poolSize() default 10;
+
+	@AttributeDefinition(name = "Debug Mode", description = "Activates the debug mode")
+	boolean debugMode() default false;
+
 	String webconsole_configurationFactory_nameHint() default "Backend2Backend Websocket";
 
 }
diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnClose.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnClose.java
@@ -6,7 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.openems.backend.metadata.api.BackendUser;
+import io.openems.backend.common.metadata.BackendUser;
 import io.openems.common.exceptions.OpenemsException;
 
 public class OnClose implements io.openems.common.websocket.OnClose {

diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnOpen.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnOpen.java
@@ -9,7 +9,7 @@
 
 import com.google.gson.JsonObject;
 
-import io.openems.backend.metadata.api.BackendUser;
+import io.openems.backend.common.metadata.BackendUser;
 import io.openems.common.exceptions.OpenemsError;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.utils.JsonUtils;

diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnRequest.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/OnRequest.java
@@ -7,7 +7,7 @@
 import org.java_websocket.WebSocket;
 
 import io.openems.backend.b2bwebsocket.jsonrpc.request.SubscribeEdgesChannelsRequest;
-import io.openems.backend.metadata.api.BackendUser;
+import io.openems.backend.common.metadata.BackendUser;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.exceptions.OpenemsException;
 import io.openems.common.jsonrpc.base.GenericJsonrpcResponseSuccess;

diff --git a/...ckend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/SubscribedEdgesChannelsWorker.java b/...ckend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/SubscribedEdgesChannelsWorker.java
@@ -17,7 +17,7 @@
 
 import io.openems.backend.b2bwebsocket.jsonrpc.notification.EdgesCurrentDataNotification;
 import io.openems.backend.b2bwebsocket.jsonrpc.request.SubscribeEdgesChannelsRequest;
-import io.openems.backend.metadata.api.BackendUser;
+import io.openems.backend.common.metadata.BackendUser;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.session.Role;
 import io.openems.common.types.ChannelAddress;

diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/WebsocketServer.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/WebsocketServer.java
@@ -13,8 +13,8 @@ public class WebsocketServer extends AbstractWebsocketServer<WsData> {
 	private final OnError onError;
 	private final OnClose onClose;
 
-	public WebsocketServer(B2bWebsocket parent, String name, int port) {
-		super(name, port);
+	public WebsocketServer(B2bWebsocket parent, String name, int port, int poolSize, boolean debugMode) {
+		super(name, port, poolSize, debugMode);
 		this.parent = parent;
 		this.onOpen = new OnOpen(parent);
 		this.onRequest = new OnRequest(parent);

diff --git a/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/WsData.java b/io.openems.backend.b2bwebsocket/src/io/openems/backend/b2bwebsocket/WsData.java
@@ -6,7 +6,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import io.openems.backend.metadata.api.BackendUser;
+import io.openems.backend.common.metadata.BackendUser;
 import io.openems.common.exceptions.OpenemsError;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 

diff --git a/...et/src/io/openems/backend/b2bwebsocket/jsonrpc/request/SubscribeEdgesChannelsRequest.java b/...et/src/io/openems/backend/b2bwebsocket/jsonrpc/request/SubscribeEdgesChannelsRequest.java
@@ -1,7 +1,6 @@
 package io.openems.backend.b2bwebsocket.jsonrpc.request;
 
 import java.util.TreeSet;
-import java.util.UUID;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -36,7 +35,7 @@ public class SubscribeEdgesChannelsRequest extends JsonrpcRequest {
 	public static SubscribeEdgesChannelsRequest from(JsonrpcRequest r) throws OpenemsNamedException {
 		JsonObject p = r.getParams();
 		int count = JsonUtils.getAsInt(p, "count");
-		SubscribeEdgesChannelsRequest result = new SubscribeEdgesChannelsRequest(r.getId(), count);
+		SubscribeEdgesChannelsRequest result = new SubscribeEdgesChannelsRequest(r, count);
 		JsonArray edgeIds = JsonUtils.getAsJsonArray(p, "ids");
 		for (JsonElement edgeId : edgeIds) {
 			result.addEdgeId(JsonUtils.getAsString(edgeId));
@@ -57,13 +56,14 @@ public static SubscribeEdgesChannelsRequest from(JsonObject j) throws OpenemsNam
 	private final TreeSet<String> edgeIds = new TreeSet<>();
 	private final TreeSet<ChannelAddress> channels = new TreeSet<>();
 
-	public SubscribeEdgesChannelsRequest(UUID id, int count) {
-		super(id, METHOD);
+	private SubscribeEdgesChannelsRequest(JsonrpcRequest request, int count) {
+		super(request, METHOD);
 		this.count = count;
 	}
 
 	public SubscribeEdgesChannelsRequest(int count) {
-		this(UUID.randomUUID(), count);
+		super(METHOD);
+		this.count = count;
 	}
 
 	public void addEdgeId(String edgeId) {

diff --git a/io.openems.backend.common/.settings/org.eclipse.core.resources.prefs b/io.openems.backend.common/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,7 @@
 eclipse.preferences.version=1
+encoding//src/io/openems/backend/common/edgewebsocket/package-info.java=UTF-8
+encoding//src/io/openems/backend/common/metadata/package-info.java=UTF-8
+encoding//src/io/openems/backend/common/timedata/package-info.java=UTF-8
+encoding//src/io/openems/backend/common/uiwebsocket/package-info.java=UTF-8
 encoding//test/.gitignore=UTF-8
 encoding/bnd.bnd=UTF-8
diff --git a/io.openems.backend.common/bnd.bnd b/io.openems.backend.common/bnd.bnd
@@ -5,7 +5,6 @@ Bundle-Version:	1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\
-	io.openems.backend.metadata.api,\
 	io.openems.common
 
 -testpath: \

diff --git a/...kend/edgewebsocket/api/EdgeWebsocket.java → ...d/common/edgewebsocket/EdgeWebsocket.java b/...kend/edgewebsocket/api/EdgeWebsocket.java → ...d/common/edgewebsocket/EdgeWebsocket.java
@@ -1,4 +1,4 @@
-package io.openems.backend.edgewebsocket.api;
+package io.openems.backend.common.edgewebsocket;
 
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;

diff --git a/...backend/uiwebsocket/api/package-info.java → ...nd/common/edgewebsocket/package-info.java b/...backend/uiwebsocket/api/package-info.java → ...nd/common/edgewebsocket/package-info.java
@@ -1,3 +1,3 @@
 @org.osgi.annotation.versioning.Version("1.0.0")
 @org.osgi.annotation.bundle.Export
-package io.openems.backend.uiwebsocket.api;
+package io.openems.backend.common.edgewebsocket;
diff --git a/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/JsonRpcRequestHandler.java b/io.openems.backend.common/src/io/openems/backend/common/jsonrpc/JsonRpcRequestHandler.java
@@ -2,7 +2,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-import io.openems.backend.metadata.api.BackendUser;
+import io.openems.backend.common.metadata.BackendUser;
 import io.openems.common.exceptions.OpenemsError.OpenemsNamedException;
 import io.openems.common.jsonrpc.base.JsonrpcRequest;
 import io.openems.common.jsonrpc.base.JsonrpcResponseSuccess;