You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by bo...@apache.org on 2023/10/23 12:09:23 UTC

[streampipes] 01/08: Merge remote-tracking branch 'origin/dev' into 2045-implement-migration-for-adapter-and-pipeline-element-configurations

This is an automated email from the ASF dual-hosted git repository.

bossenti pushed a commit to branch 2045-implement-migration-for-adapter-and-pipeline-element-configurations
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit 599c83be176d2a907f9e5d7ef279c29048ea5799
Merge: a86a7c31b 774d75caf
Author: bossenti <bo...@posteo.de>
AuthorDate: Mon Oct 23 11:44:45 2023 +0200

    Merge remote-tracking branch 'origin/dev' into 2045-implement-migration-for-adapter-and-pipeline-element-configurations

 pom.xml                                            |  6 ------
 .../management/management/WorkerRestClient.java    | 22 +++++++++++-----------
 .../streampipes-connect-adapters-iiot/pom.xml      |  4 ----
 .../streampipes-connect-adapters/pom.xml           |  4 ----
 .../svcdiscovery/SpServiceRegistration.java        |  4 ++++
 .../streampipes/model/message/Notification.java    |  7 ++++++-
 .../manager/health/ServiceHealthCheck.java         |  2 +-
 .../svcdiscovery/SpServiceDiscoveryCore.java       |  2 +-
 8 files changed, 23 insertions(+), 28 deletions(-)

diff --cc streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
index ba0a21383,5efefd652..bbb92edc7
--- a/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
+++ b/streampipes-connect-management/src/main/java/org/apache/streampipes/connect/management/management/WorkerRestClient.java
@@@ -77,9 -77,11 +77,9 @@@ public class WorkerRestClient 
            .extServiceGetRequest(url)
            .execute().returnContent().asString();
  
 -      List<AdapterDescription> result = JacksonSerializer.getObjectMapper().readValue(responseString, List.class);
 -
 -      return result;
 +      return JacksonSerializer.getObjectMapper().readValue(responseString, List.class);
      } catch (IOException e) {
-       logger.error("List of running adapters could not be fetched", e);
+       LOG.error("List of running adapters could not be fetched", e);
        throw new AdapterException("List of running adapters could not be fetched from: " + url);
      }
    }