You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/11/22 22:18:52 UTC
[incubator-streampipes] branch STREAMPIPES-257 updated: First
minimal version of the new connect master API is working
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch STREAMPIPES-257
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/STREAMPIPES-257 by this push:
new a7347e9 First minimal version of the new connect master API is working
a7347e9 is described below
commit a7347e9ef6e8497f6d1ed9cb176fe873ecbf048f
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Sun Nov 22 23:18:22 2020 +0100
First minimal version of the new connect master API is working
---
streampipes-backend/src/main/resources/shiro.ini | 1 +
.../connect/container/master/management/AdapterMasterManagement.java | 4 ++--
.../org/apache/streampipes/connect/config/ConnectContainerConfig.java | 2 +-
ui/src/app/connect/services/rest.service.ts | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/streampipes-backend/src/main/resources/shiro.ini b/streampipes-backend/src/main/resources/shiro.ini
index 166c774..dbd4180 100644
--- a/streampipes-backend/src/main/resources/shiro.ini
+++ b/streampipes-backend/src/main/resources/shiro.ini
@@ -68,5 +68,6 @@ securityManager.rememberMeManager.cookie.maxAge = 1000000000
/api/v2/users/*/labeling/* = anon
/api/v2/users/*/labeling = anon
/api/v2/connect/*/master/administration = anon
+/api/v2/connect/*/master/sources/* = anon
/api/** = customFilter
/** = customFilter
\ No newline at end of file
diff --git a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java
index 2449044..b1a47bd 100644
--- a/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java
+++ b/streampipes-connect-container-master/src/main/java/org/apache/streampipes/connect/container/master/management/AdapterMasterManagement.java
@@ -76,7 +76,7 @@ public class AdapterMasterManagement {
String uuid = UUID.randomUUID().toString();
// String newId = ConnectContainerConfig.INSTANCE.getConnectContainerMasterUrl() + "api/v1/" + username + "/master/sources/" + uuid;
- String newId = ConnectContainerConfig.INSTANCE.getBackendApiUrl() + "api/v1/" + username + "/master/sources/" + uuid;
+ String newId = ConnectContainerConfig.INSTANCE.getBackendApiUrl() + "api/v2/connect/" + username + "/master/sources/" + uuid;
ad.setElementId(newId);
@@ -95,7 +95,7 @@ public class AdapterMasterManagement {
}
// backend url is used to install data source in streampipes
- String backendBaseUrl = "http://" + ConnectContainerConfig.INSTANCE.getBackendApiUrl() + "api/v2/";
+ String backendBaseUrl = ConnectContainerConfig.INSTANCE.getBackendApiUrl() + "api/v2/";
String requestUrl = backendBaseUrl + "noauth/users/" + username + "/element";
LOG.info("Install source (source URL: " + newId + " in backend over URL: " + requestUrl);
diff --git a/streampipes-connect-container/src/main/java/org/apache/streampipes/connect/config/ConnectContainerConfig.java b/streampipes-connect-container/src/main/java/org/apache/streampipes/connect/config/ConnectContainerConfig.java
index 87eb80c..cbbb5e6 100644
--- a/streampipes-connect-container/src/main/java/org/apache/streampipes/connect/config/ConnectContainerConfig.java
+++ b/streampipes-connect-container/src/main/java/org/apache/streampipes/connect/config/ConnectContainerConfig.java
@@ -42,7 +42,7 @@ public enum ConnectContainerConfig {
}
public String getBackendApiUrl() {
- return config.getString(ConfigKeys.BACKEND_HOST) + ":" + config.getInteger(ConfigKeys.BACKEND_PORT) + "/streampipes-backend/";
+ return "http://" + config.getString( ConfigKeys.BACKEND_HOST) + ":" + config.getInteger(ConfigKeys.BACKEND_PORT) + "/streampipes-backend/";
}
public String getBackendHost() {
diff --git a/ui/src/app/connect/services/rest.service.ts b/ui/src/app/connect/services/rest.service.ts
index 54460e5..a8bc3ba 100644
--- a/ui/src/app/connect/services/rest.service.ts
+++ b/ui/src/app/connect/services/rest.service.ts
@@ -98,7 +98,7 @@ export class RestService {
getFormats(): Observable<FormatDescriptionList> {
- var self = this;
+ const self = this;
return this.http
.get(
'/streampipes-connect/api/v2/connect/riemer@fzi.de/master/description/formats'
@@ -110,7 +110,7 @@ export class RestService {
getProtocols(): Observable<ProtocolDescriptionList> {
return this.http
- .get(this.baseRoute + 'adapter/allProtocols')
+ .get(this.host + 'adapter/allProtocols')
.pipe(map(response => {
return response as ProtocolDescriptionList;
}));