You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/07/28 11:26:07 UTC
[incubator-streampipes] branch dev updated (bf076736f -> 83d1ec096)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
from bf076736f [hotfix] Filter transformation rules for timestamp rules
new 37e895b8d [hotfix] Remove obsolete adapter test
new 6447eca31 [hotfix] Use default value for OPC server url in adapter
new 83d1ec096 [hotfix] Add loading spinner to tree input
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../management/AdapterWorkerManagementTest.java | 32 ----------------------
.../connect/iiot/adapters/opcua/OpcUaAdapter.java | 2 +-
.../apache/streampipes/sdk/StaticProperties.java | 6 ++++
.../static-tree-input.component.html | 7 ++++-
4 files changed, 13 insertions(+), 34 deletions(-)
[incubator-streampipes] 03/03: [hotfix] Add loading spinner to tree input
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 83d1ec096aa15d9a8752218017816bcf94c6a44b
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Jul 28 13:25:55 2022 +0200
[hotfix] Add loading spinner to tree input
---
.../static-tree-input.component.html | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input.component.html b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input.component.html
index 753c76ad5..c9216e29c 100644
--- a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input.component.html
+++ b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input.component.html
@@ -20,10 +20,15 @@
<div>
<button mat-button mat-raised-button color="accent" class="small-button"
(click)="loadOptionsFromRestApi()"
- style="margin-right:10px;margin-left:10px;" [disabled]="!showOptions">
+ style="margin-right:10px;" [disabled]="!showOptions">
<span>Reload</span>
</button>
</div>
+ <div fxLayout="column" *ngIf="loading" class="mt-10">
+ <mat-spinner color="accent"
+ [mode]="'indeterminate'"
+ [diameter]="20"></mat-spinner>
+ </div>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" class="sp-tree">
<mat-tree-node *matTreeNodeDef="let node" matTreeNodeToggle>
<mat-checkbox color="accent"
[incubator-streampipes] 02/03: [hotfix] Use default value for OPC server url in adapter
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 6447eca31c6b50a187cad37ce1ac7e51f6861544
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Jul 28 13:25:36 2022 +0200
[hotfix] Use default value for OPC server url in adapter
---
.../streampipes/connect/iiot/adapters/opcua/OpcUaAdapter.java | 2 +-
.../src/main/java/org/apache/streampipes/sdk/StaticProperties.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaAdapter.java b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaAdapter.java
index 525ca38b7..257abf860 100644
--- a/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaAdapter.java
+++ b/streampipes-extensions/streampipes-connect-adapters-iiot/src/main/java/org/apache/streampipes/connect/iiot/adapters/opcua/OpcUaAdapter.java
@@ -190,7 +190,7 @@ public class OpcUaAdapter extends PullAdapter implements SupportsRuntimeConfig {
.requiredAlternatives(Labels.withId(OpcUaLabels.OPC_HOST_OR_URL.name()),
Alternatives.from(
Labels.withId(OpcUaLabels.OPC_URL.name()),
- StaticProperties.stringFreeTextProperty(Labels.withId(OpcUaLabels.OPC_SERVER_URL.name())))
+ StaticProperties.stringFreeTextProperty(Labels.withId(OpcUaLabels.OPC_SERVER_URL.name()), "opc.tcp://localhost:4840"))
,
Alternatives.from(Labels.withId(OpcUaLabels.OPC_HOST.name()),
StaticProperties.group(
diff --git a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java
index efacba41f..2d3cabd53 100644
--- a/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java
+++ b/streampipes-sdk/src/main/java/org/apache/streampipes/sdk/StaticProperties.java
@@ -48,6 +48,12 @@ public class StaticProperties {
return freeTextProperty(label, Datatypes.String);
}
+ public static FreeTextStaticProperty stringFreeTextProperty(Label label, String defaultValue) {
+ var property = freeTextProperty(label, Datatypes.String);
+ property.setValue(defaultValue);
+ return property;
+ }
+
public static FreeTextStaticProperty integerFreeTextProperty(Label label) {
return freeTextProperty(label, Datatypes.Integer);
}
[incubator-streampipes] 01/03: [hotfix] Remove obsolete adapter test
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 37e895b8dfbb501e3eeb179a001c0137bcd14553
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Jul 28 13:24:27 2022 +0200
[hotfix] Remove obsolete adapter test
---
.../management/AdapterWorkerManagementTest.java | 32 ----------------------
1 file changed, 32 deletions(-)
diff --git a/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java b/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java
index 631f3f970..f16a2e7c1 100644
--- a/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java
+++ b/streampipes-connect-container-worker/src/test/java/org/apache/streampipes/connect/container/worker/management/AdapterWorkerManagementTest.java
@@ -41,22 +41,6 @@ import static org.junit.Assert.*;
@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
public class AdapterWorkerManagementTest {
- @Test
- public void stopStreamAdapterFail() {
- String expected = "Adapter with id http://test.de was not found in this container and cannot be stopped.";
- AdapterStreamDescription asd = new GenericAdapterStreamDescription();
- asd.setUri("http://test.de");
-
- AdapterWorkerManagement adapterManagement = new AdapterWorkerManagement();
-
- try {
- adapterManagement.stopStreamAdapter(asd);
- fail();
- } catch (AdapterException e) {
- assertEquals(expected, e.getMessage());
- }
- }
-
@Test
public void stopStreamAdapterSuccess() throws AdapterException {
TestAdapter testAdapter = getTestAdapterInstance();
@@ -68,22 +52,6 @@ public class AdapterWorkerManagementTest {
}
- @Test
- public void stopSetAdapterFail() {
- String expected = "Adapter with id http://test.de was not found in this container and cannot be stopped.";
- AdapterSetDescription asd = new GenericAdapterSetDescription();
- asd.setUri("http://test.de");
-
- AdapterWorkerManagement adapterManagement = new AdapterWorkerManagement();
-
- try {
- adapterManagement.stopSetAdapter(asd);
- fail();
- } catch (AdapterException e) {
- assertEquals(expected, e.getMessage());
- }
- }
-
@Test
public void stopSetAdapterSuccess() throws AdapterException {
TestAdapter testAdapter = getTestAdapterInstance();