diff options
author | 2017-09-28 17:04:44 +0800 | |
---|---|---|
committer | 2017-09-28 09:16:41 +0000 | |
commit | 687a149af6ff59fba9e614e060a598392b68db6b (patch) | |
tree | 018b99dc2c64ec32e53d6968fa679369a399ce82 /wfenginemgrservice/src/main/java/org/onap/workflow | |
parent | ca57c4bc2ce48c52f10bf6ef816492cf044430e0 (diff) |
Add unit test for vfc-nfvo-wfengine
Change-Id: I75acdc20d9aa6ccb650b80d93c675bab7c27dca9
Issue-id: VFC-454
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
Diffstat (limited to 'wfenginemgrservice/src/main/java/org/onap/workflow')
3 files changed, 2 insertions, 56 deletions
diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java index f179fe6..2eeb2fc 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/common/RestClient.java @@ -129,34 +129,6 @@ public class RestClient { * @param ip * @param port * @param url - * @return - * @throws ClientProtocolException - * @throws IOException - */ - public static String get(String ip, int port, String url) - throws ClientProtocolException, IOException { - return executeHttp(HttpMethod.GET, ip, port, url, null).getResult(); - } - - /** - * - * @param ip - * @param port - * @param url - * @return - * @throws ClientProtocolException - * @throws IOException - */ - public static RestResponse delete(String ip, int port, String url) - throws ClientProtocolException, IOException { - return executeHttp(HttpMethod.GET, ip, port, url, null); - } - - /** - * - * @param ip - * @param port - * @param url * @param requestBody * @return * @throws ClientProtocolException diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/common/ToolUtil.java b/wfenginemgrservice/src/main/java/org/onap/workflow/common/ToolUtil.java index c148eb3..d24a787 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/common/ToolUtil.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/common/ToolUtil.java @@ -1,11 +1,11 @@ /**
- * Copyright (C) 2017 ZTE, Inc. and others. All rights reserved. (ZTE)
+ * Copyright 2017 ZTE Corporation.
*
* 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
+ * 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,
@@ -40,18 +40,6 @@ public class ToolUtil { return authHeader;
}
- public static boolean isEmptyString(String val) {
- return ((val == null || "".equals(val)) ? true : false);
- }
-
- public static boolean isTrimedEmptyString(String val) {
- return ((val == null || "".equals(val.trim())) ? true : false);
- }
-
- public static boolean isTrimedEmptyArray(String[] val) {
- return ((val == null || val.length == 0) ? true : false);
- }
-
/**
* @param ins
*/
diff --git a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumer.java b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumer.java index 017cf35..593f382 100644 --- a/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumer.java +++ b/wfenginemgrservice/src/main/java/org/onap/workflow/externalservice/service/activitiservice/ActivitiServiceConsumer.java @@ -21,7 +21,6 @@ import java.io.InputStream; import javax.ws.rs.core.Response; import org.apache.http.client.ClientProtocolException; -import org.glassfish.jersey.client.ClientConfig; import org.onap.workflow.common.Config; import org.onap.workflow.common.EnumModuleUrl; import org.onap.workflow.common.RestClient; @@ -34,7 +33,6 @@ import org.onap.workflow.tools.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.eclipsesource.jaxrs.consumer.ConsumerFactory; import com.google.gson.Gson; /** @@ -47,18 +45,6 @@ public class ActivitiServiceConsumer { private static final String DEPLOY_BPMNFILE_URL = EnumModuleUrl.ACTIVITI.getApiRootDomain() + "/repository/deployments"; - private static IActivitiRestService activitiServiceProxy = null; - - private static IActivitiRestService getActivitiService() { - if (activitiServiceProxy == null) { - ClientConfig config = new ClientConfig(); - activitiServiceProxy = ConsumerFactory.createConsumer( - EnumModuleUrl.getBaseUrl(EnumModuleUrl.ACTIVITI), config, IActivitiRestService.class); - - } - return activitiServiceProxy; - } - public static RestResponse undeploybpmnfile(String deploymentId) { /* * IActivitiRestService activitiProxy = getActivitiService(); |