This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch
3117-onetimeplcrequestreader-does-not-remove-connection-after-reading-plc-data
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/3117-onetimeplcrequestreader-does-not-remove-connection-after-reading-plc-data
by this push:
new 7d653cb63c fix(#3117): Remove connection after plc data is read
7d653cb63c is described below
commit 7d653cb63c50659f6b645ee121436d98d9fd18bd
Author: Philipp Zehnder <[email protected]>
AuthorDate: Fri Aug 9 13:56:24 2024 +0200
fix(#3117): Remove connection after plc data is read
---
.../connection/OneTimePlcRequestReader.java | 5 ++
.../streampipes/model/monitoring/SpLogMessage.java | 7 +-
.../model/monitoring/SpLogMessageTest.java | 85 ++++++++++++++++++++++
3 files changed, 94 insertions(+), 3 deletions(-)
diff --git
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/connection/OneTimePlcRequestReader.java
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/connection/OneTimePlcRequestReader.java
index cab3a53ad6..255be71c84 100644
---
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/connection/OneTimePlcRequestReader.java
+++
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/connection/OneTimePlcRequestReader.java
@@ -23,6 +23,7 @@ import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.model.Pl
import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.PlcConnectionManager;
+import org.apache.plc4x.java.utils.cache.CachedPlcConnectionManager;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -53,6 +54,10 @@ public class OneTimePlcRequestReader {
var readRequest = requestProvider.makeReadRequest(plcConnection,
settings.nodes());
var readResponse = readRequest.execute().get(5000,
TimeUnit.MILLISECONDS);
return eventGenerator.makeEvent(readResponse);
+ } finally {
+ if (connectionManager instanceof CachedPlcConnectionManager) {
+ ((CachedPlcConnectionManager)
connectionManager).removeCachedConnection(settings.connectionString());
+ }
}
}
}
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/monitoring/SpLogMessage.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/monitoring/SpLogMessage.java
index e1123a26cc..d7b5f290c8 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/monitoring/SpLogMessage.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/monitoring/SpLogMessage.java
@@ -38,7 +38,8 @@ public class SpLogMessage {
public static SpLogMessage from(Exception exception,
String detail) {
- String cause = exception.getCause() != null ?
exception.getCause().getMessage() : exception.getMessage();
+ var cause = exception.getCause() != null ?
exception.getCause().getMessage() : exception.getMessage();
+
return new SpLogMessage(
SpLogLevel.ERROR,
exception.getMessage(),
@@ -77,7 +78,7 @@ public class SpLogMessage {
this.fullStackTrace = other.getFullStackTrace();
}
- public SpLogMessage(SpLogLevel level,
+ private SpLogMessage(SpLogLevel level,
String title,
String detail) {
this.level = level;
@@ -85,7 +86,7 @@ public class SpLogMessage {
this.detail = detail;
}
- public SpLogMessage(SpLogLevel level,
+ private SpLogMessage(SpLogLevel level,
String title,
String detail,
String fullStackTrace,
diff --git
a/streampipes-model/src/test/java/org/apache/streampipes/model/monitoring/SpLogMessageTest.java
b/streampipes-model/src/test/java/org/apache/streampipes/model/monitoring/SpLogMessageTest.java
new file mode 100644
index 0000000000..9e62db16a4
--- /dev/null
+++
b/streampipes-model/src/test/java/org/apache/streampipes/model/monitoring/SpLogMessageTest.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.model.monitoring;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class SpLogMessageTest {
+
+ private static final String EXCEPTION_TEXT = "Test exception";
+ private static final String CAUSE_EXCEPTION_TEXT = "Cause exception";
+
+
+ @Test
+ void from_ExceptionWithDetail() {
+ var exception = new Exception(EXCEPTION_TEXT);
+ var detail = "Test detail";
+
+ var logMessage = SpLogMessage.from(exception, detail);
+
+ assertEquals(SpLogLevel.ERROR, logMessage.getLevel());
+ assertEquals(EXCEPTION_TEXT, logMessage.getTitle());
+ assertEquals(detail, logMessage.getDetail());
+ assertEquals(ExceptionUtils.getStackTrace(exception),
logMessage.getFullStackTrace());
+ assertEquals(EXCEPTION_TEXT, logMessage.getCause());
+ }
+
+ @Test
+ void from_ExceptionWithCause() {
+ var cause = new Exception(CAUSE_EXCEPTION_TEXT);
+ var exception = new Exception(EXCEPTION_TEXT, cause);
+ var detail = "Test detail";
+ var logMessage = SpLogMessage.from(exception, detail);
+
+ assertEquals(SpLogLevel.ERROR, logMessage.getLevel());
+ assertEquals(EXCEPTION_TEXT, logMessage.getTitle());
+ assertEquals(detail, logMessage.getDetail());
+ assertEquals(ExceptionUtils.getStackTrace(exception),
logMessage.getFullStackTrace());
+ assertEquals(CAUSE_EXCEPTION_TEXT, logMessage.getCause());
+ }
+
+ @Test
+ void from_ExceptionWithoutDetail() {
+ var exception = new Exception(EXCEPTION_TEXT);
+ var logMessage = SpLogMessage.from(exception);
+
+ assertEquals(SpLogLevel.ERROR, logMessage.getLevel());
+ assertEquals(EXCEPTION_TEXT, logMessage.getTitle());
+ assertEquals("", logMessage.getDetail());
+ assertEquals(ExceptionUtils.getStackTrace(exception),
logMessage.getFullStackTrace());
+ assertEquals("Test exception", logMessage.getCause());
+ }
+
+ @Test
+ void from_ExceptionWithNullCause() {
+ var exception = new Exception(EXCEPTION_TEXT, null);
+ var detail = "Test detail";
+ var logMessage = SpLogMessage.from(exception, detail);
+
+ assertEquals(SpLogLevel.ERROR, logMessage.getLevel());
+ assertEquals(EXCEPTION_TEXT, logMessage.getTitle());
+ assertEquals(detail, logMessage.getDetail());
+ assertEquals(ExceptionUtils.getStackTrace(exception),
logMessage.getFullStackTrace());
+ assertEquals(EXCEPTION_TEXT, logMessage.getCause());
+ }
+
+}
