SDC-WF: Align Workflow studio implementation with Activity Spec implementation in SDC
Change-Id: I83fbf51a6399459c0e99c11f150616ceca69111a
Issue-ID: SDC-1402
Signed-off-by: priyanshu <pagarwal@amdocs.com>
defaultName: ${DW_DEFAULT_NAME:-Stranger}
-adapterType: DEFAULT
+adapterType: SDC
sdcServiceProxy:
serviceAddr: http://127.0.0.1:8080
xEcompInstanceId: workflow
authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
+activitySpecServiceProxy:
+ serviceAddr: http://127.0.0.1:8090
+ xEcompInstanceId: workflow
+ userId: workflow
+ authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
+
# use the simple server factory if you only want to run on a single port
server:
type: simple
--- /dev/null
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed 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.onap.sdc.workflowdesigner;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ */
+public class ActivitySpecServiceProxyInfo {
+ private String serviceAddr;
+
+ private String xEcompInstanceId;
+
+ private String authorization;
+
+ private String userId;
+
+ /**
+ * @return the serviceAddr
+ */
+ @JsonProperty
+ public String getServiceAddr() {
+ return serviceAddr;
+ }
+
+ /**
+ * @param serviceAddr the serviceAddr to set
+ */
+ @JsonProperty
+ public void setServiceAddr(String serviceAddr) {
+ this.serviceAddr = serviceAddr;
+ }
+
+ /**
+ * @return the xEcompInstanceId
+ */
+ @JsonProperty
+ public String getxEcompInstanceId() {
+ return xEcompInstanceId;
+ }
+
+ /**
+ * @param xEcompInstanceId the xEcompInstanceId to set
+ */
+ @JsonProperty
+ public void setxEcompInstanceId(String xEcompInstanceId) {
+ this.xEcompInstanceId = xEcompInstanceId;
+ }
+
+ /**
+ * @return the authorization
+ */
+ @JsonProperty
+ public String getAuthorization() {
+ return authorization;
+ }
+
+ /**
+ * @param authorization the authorization to set
+ */
+ @JsonProperty
+ public void setAuthorization(String authorization) {
+ this.authorization = authorization;
+ }
+
+ /**
+ * @return the userId
+ */
+ @JsonProperty
+ public String getUserId() {
+ return userId;
+ }
+
+ /**
+ * @param userId the userId to set
+ */
+ @JsonProperty
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+}
private void saveAppConfig(WorkflowDesignerConfiguration configuration) {
AppConfig.setAdapterType(AdapterType.valueOf(configuration.getAdapterType()));
AppConfig.setSdcServiceProxy(configuration.getSdcServiceProxy());
+ AppConfig.setActivitySpecServiceProxy(configuration.getActivitySpecServiceProxy());
}
/**
@NotNull
private SDCServiceProxyInfo sdcServiceProxy;
+
+ @NotNull
+ private ActivitySpecServiceProxyInfo activitySpecServiceProxy;
@JsonProperty
this.sdcServiceProxy = sdcServiceProxy;
}
+ /**
+ * @return the activitySpecServiceProxy
+ */
+ @JsonProperty
+ public ActivitySpecServiceProxyInfo getActivitySpecServiceProxy() {
+ return activitySpecServiceProxy;
+ }
+
+ /**
+ * @param activitySpecServiceProxy the activitySpecServiceProxy to set
+ */
+ @JsonProperty
+ public void setActivitySpecServiceProxy(ActivitySpecServiceProxyInfo activitySpecServiceProxy) {
+ this.activitySpecServiceProxy = activitySpecServiceProxy;
+ }
+
}
--- /dev/null
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed 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.onap.sdc.workflowdesigner.common;
+
+public class ActivitySpecProxyException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
+ public ActivitySpecProxyException() {
+ super();
+ }
+
+ public ActivitySpecProxyException(String msg, Exception e) {
+ super(msg, e);
+ }
+
+ public ActivitySpecProxyException(String msg) {
+ super(msg);
+ }
+}
package org.onap.sdc.workflowdesigner.config;
import org.onap.sdc.workflowdesigner.SDCServiceProxyInfo;
+import org.onap.sdc.workflowdesigner.ActivitySpecServiceProxyInfo;
/**
*
private static AdapterType adapterType;
private static SDCServiceProxyInfo sdcServiceProxy;
+
+ private static ActivitySpecServiceProxyInfo activitySpecServiceProxy;
private AppConfig() {}
return adapterType.equals(AdapterType.SDC);
}
+ /**
+ * @param activitySpecServiceProxy
+ */
+ public static void setActivitySpecServiceProxy(ActivitySpecServiceProxyInfo activitySpecServiceProxy) {
+ AppConfig.activitySpecServiceProxy = activitySpecServiceProxy;
+ }
+
+ /**
+ * @return the activitySpecServiceProxy
+ */
+ public static ActivitySpecServiceProxyInfo getActivitySpecServiceProxy() {
+ return activitySpecServiceProxy;
+ }
}
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.ActivitySpec;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.GenericCollectionWrapper;
@Path("")
public interface ActivitySpecService {
@Path("/activity-spec?Filter=Certified")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public ActivitySpec[] getActivitySpecs(
+ public GenericCollectionWrapper getActivitySpecs(
+ @HeaderParam("USER_ID") String userId,
@HeaderParam("X-ECOMP-InstanceID") String xEcompInstanceId,
@HeaderParam("Authorization") String authorization) throws Exception;
+ @GET
+ @Path("/activity-spec/{id}/versions/{versionId}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public ActivitySpec getActivitySpec(
+ @HeaderParam("USER_ID") String userId,
+ @HeaderParam("X-ECOMP-InstanceID") String xEcompInstanceId,
+ @HeaderParam("Authorization") String authorization,
+ @PathParam("versionId") String versionId,
+ @PathParam("id") String id) throws Exception;
+
}
*/
package org.onap.sdc.workflowdesigner.externalservice.sdc;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import org.glassfish.jersey.client.ClientConfig;
-import org.onap.sdc.workflowdesigner.common.SDCProxyException;
+import org.onap.sdc.workflowdesigner.common.ActivitySpecProxyException;
import org.onap.sdc.workflowdesigner.config.AppConfig;
import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.ActivitySpec;
+import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.GenericCollectionWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
*
*/
public class ActivitySpecServiceProxy {
- private static final Logger LOGGER = LoggerFactory.getLogger(SDCService.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ActivitySpecServiceProxy.class);
- private static final String AUTHORIZATION = AppConfig.getSdcServiceProxy().getAuthorization();
+ private static final String AUTHORIZATION = AppConfig.getActivitySpecServiceProxy().getAuthorization();
+
+ private static final String X_ECOMP_INSTANCE_ID = AppConfig.getActivitySpecServiceProxy().getxEcompInstanceId();
+
+ private static final String USER_ID = AppConfig.getActivitySpecServiceProxy().getUserId();
- private static final String X_ECOMP_INSTANCE_ID =
- AppConfig.getSdcServiceProxy().getxEcompInstanceId();
/** */
- private static final String ACTIVITY_ROOT_PATH = "/activityspec-api/v1.0";
+ private static final String ACTIVITY_ROOT_PATH = "/activity-spec-api/v1.0";
+ private static final String ACTIVITY_SPEC_VERSION_ID_DEFAULT_VALUE = "latest";
private static String getActivityRootPath() {
- return AppConfig.getSdcServiceProxy().getServiceAddr() + ACTIVITY_ROOT_PATH;
+ return AppConfig.getActivitySpecServiceProxy().getServiceAddr() + ACTIVITY_ROOT_PATH;
}
/**
* @return
*/
- private ActivitySpecService getActivityServiceProxy() {
+ private ActivitySpecService getActivitySpecServiceProxy() {
ClientConfig config = new ClientConfig();
return ConsumerFactory.createConsumer(getActivityRootPath(), config, ActivitySpecService.class);
}
/**
*
* @return
- * @throws SDCProxyException
+ * @throws ActivitySpecProxyException
*/
- public ActivitySpec[] getActivitySpecs() throws SDCProxyException {
- ActivitySpecService serviceProxy = getActivityServiceProxy();
+ public ActivitySpec[] getActivitySpecs() throws ActivitySpecProxyException {
+ ActivitySpecService serviceProxy = getActivitySpecServiceProxy();
+ List<ActivitySpec> activitySpecList = new ArrayList<>();
try {
- return serviceProxy.getActivitySpecs(X_ECOMP_INSTANCE_ID, AUTHORIZATION);
+ GenericCollectionWrapper activityCollection = serviceProxy.getActivitySpecs(USER_ID, X_ECOMP_INSTANCE_ID, AUTHORIZATION);
+ for (Object obj : activityCollection.getResults()) {
+ if (obj instanceof Map){
+ Map activitySpecMap = (Map) obj;
+ String activitySpecId = activitySpecMap.get("id").toString();
+ ActivitySpec activitySpec = serviceProxy.getActivitySpec(USER_ID, X_ECOMP_INSTANCE_ID, AUTHORIZATION, ACTIVITY_SPEC_VERSION_ID_DEFAULT_VALUE, activitySpecId);
+ activitySpec.setId(activitySpecId);
+ activitySpecList.add(activitySpec);
+ }
+ }
} catch (Exception e) {
LOGGER.error("Get Activity Specifications Failed.", e);
- throw new SDCProxyException("Get Activity Specifications Failed.", e);
+ throw new ActivitySpecProxyException("Get Activity Specifications Failed.", e);
}
+ return activitySpecList.toArray(new ActivitySpec[activitySpecList.size()]);
}
\r
private String type;\r
\r
- private ActivityContent content = new ActivityContent();\r
+ private String content;\r
\r
private String[] categoryList;\r
\r
/**\r
* @return the content\r
*/\r
- public ActivityContent getContent() {\r
+ public String getContent() {\r
return content;\r
}\r
\r
/**\r
* @param content the content to set\r
*/\r
- public void setContent(ActivityContent content) {\r
+ public void setContent(String content) {\r
this.content = content;\r
}\r
\r
--- /dev/null
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed 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.onap.sdc.workflowdesigner.externalservice.sdc.entity;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GenericCollectionWrapper<T> implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private transient List<T> results;
+ private int listCount;
+
+ public GenericCollectionWrapper() {
+ this.results = new ArrayList<>();
+ }
+
+ /**
+ * Instantiates a new Generic collection wrapper.
+ *
+ * @param list the list
+ */
+ public GenericCollectionWrapper(List<T> list) {
+ if (!list.isEmpty()) {
+ this.results = list;
+ this.listCount = list.size();
+ }
+ }
+
+ public List<T> getResults() {
+ return results;
+ }
+
+ public void setResults(List<T> results) {
+ this.results = results;
+ }
+
+ public int getListCount() {
+ return listCount;
+ }
+
+ public void setListCount(int listCount) {
+ this.listCount = listCount;
+ }
+
+}
import javax.ws.rs.core.Response;
import org.eclipse.jetty.http.HttpStatus;
-import org.onap.sdc.workflowdesigner.common.SDCProxyException;
+import org.onap.sdc.workflowdesigner.common.ActivitySpecProxyException;
import org.onap.sdc.workflowdesigner.config.AppConfig;
import org.onap.sdc.workflowdesigner.externalservice.sdc.ActivitySpecServiceProxy;
import org.onap.sdc.workflowdesigner.externalservice.sdc.entity.ActivitySpec;
ActivitySpec[] activitySpecs = proxy.getActivitySpecs();
ExtActivity[] extActivities = convert2ExtActivities(activitySpecs);
return Response.status(Response.Status.OK).entity(extActivities).build();
- } catch (SDCProxyException e) {
+ } catch (ActivitySpecProxyException e) {
LOGGER.error("Get ExtActivities from sdc failed.", e);
throw RestUtils.newInternalServerErrorException(e);
}
*/
private Content buildContent(ActivitySpec activitySpec) {
Content content = new Content();
-// content.setClass(activitySpec.getContent().getClazz());
- content.clazz = activitySpec.getContent().clazz;
- content.setScript(activitySpec.getContent().getScript());
- content.setScriptFormat(activitySpec.getContent().getScriptFormat());
+ content.setScript(activitySpec.getContent());
content.setInputs(convert2InputOutputs(activitySpec.getInputs()));
content.setOutputs(convert2InputOutputs(activitySpec.getOutputs()));
return content;
ActivitySpec[] activitySpecs = proxy.getActivitySpecs();
ExtActivityDisplayInfo displayInfo = convert2ExtActivityDisplayInfo(activitySpecs);
return Response.status(Response.Status.OK).entity(displayInfo).build();
- } catch (SDCProxyException e) {
+ } catch (ActivitySpecProxyException e) {
LOGGER.error("Get Extend Activities DisplayInfo from sdc failed.", e);
throw RestUtils.newInternalServerErrorException(e);
}
String name = "";\r
String description = "";\r
String type = "";\r
- ActivityContent content = new ActivityContent();\r
+ String content = "";\r
String[] categoryList = new String[]{"aaa"};\r
Parameter[] inputs = new Parameter[0];\r
Parameter[] outputs = new Parameter[0];\r
Code Review / sdc / sdc-workflow-designer.git / commitdiff