*\r
*/\r
public class SDCServiceProxyInfo {\r
+ private String serviceAddr;\r
+ \r
private String xEcompInstanceId;\r
\r
private String authorization;\r
\r
+ /**\r
+ * @return the serviceAddr\r
+ */\r
+ public String getServiceAddr() {\r
+ return serviceAddr;\r
+ }\r
+\r
+ /**\r
+ * @param serviceAddr the serviceAddr to set\r
+ */\r
+ public void setServiceAddr(String serviceAddr) {\r
+ this.serviceAddr = serviceAddr;\r
+ }\r
+\r
/**\r
* @return the xEcompInstanceId\r
*/\r
@NotEmpty
private String defaultName = "Workflow Designer";
- @NotEmpty
- private String msbServerAddr;
-
@NotEmpty
private SDCServiceProxyInfo sdcServiceProxy;
public void setDefaultName(String name) {
this.defaultName = name;
}
-
- @JsonProperty
- public String getMsbServerAddr() {
- return msbServerAddr;
- }
-
- @JsonProperty
- public void setMsbServerAddr(String msbServerAddr) {
- this.msbServerAddr = msbServerAddr;
- }
/**
* @return the sdcServiceProxy
*
*/
public class AppConfig {
- private static String msbServerAddr;
private static SDCServiceProxyInfo sdcServiceProxy;
private AppConfig() {}
- public static String getMsbServerAddr() {
- return msbServerAddr;
- }
-
- public static void setMsbServerAddr(String msbServerAddr) {
- AppConfig.msbServerAddr = msbServerAddr;
- }
-
- public static String getSDCAddr() {
- return msbServerAddr + "/api/sdc/v1";
- }
-
/**
* @param sdcServiceProxy
*/
public class SDCServiceProxy {
private static final Logger LOGGER = LoggerFactory.getLogger(SDCService.class);
+ private static final String AUTHORIZATION = AppConfig.getSdcServiceProxy().getAuthorization();
+
+ private static final String X_ECOMP_INSTANCE_ID = AppConfig.getSdcServiceProxy().getxEcompInstanceId();
+ /** */
+ private static final String SDC_ROOT_PATH = "/sdc/v1";
+
+
+ private static String getSDCRootPath() {
+ return AppConfig.getSdcServiceProxy().getServiceAddr() + SDC_ROOT_PATH;
+ }
+
/**
* @return
*/
private SDCService getSDCServiceProxy() {
ClientConfig config = new ClientConfig();
SDCService sdcServiceProxy =
- ConsumerFactory.createConsumer(AppConfig.getSDCAddr(), config, SDCService.class);
+ ConsumerFactory.createConsumer(getSDCRootPath(), config, SDCService.class);
return sdcServiceProxy;
}
SDCService sdcServiceProxy = getSDCServiceProxy();
try {
sdcServiceProxy.saveWorkflowArtifact(uuid, operationId, workflowId,
- AppConfig.getSdcServiceProxy().getxEcompInstanceId(),
- AppConfig.getSdcServiceProxy().getAuthorization(), workflowArtifactInfo);
+ X_ECOMP_INSTANCE_ID,
+ AUTHORIZATION, workflowArtifactInfo);
} catch (Exception e) {
LOGGER.error("Save WorkflowArtifact Failed.", e);
throw new WorkflowDesignerException("Save WorkflowArtifact Failed.", e);
SDCService sdcServiceProxy = getSDCServiceProxy();
try {
return sdcServiceProxy.getWorkflowArtifact(uuid, operationId, workflowId,
- AppConfig.getSdcServiceProxy().getxEcompInstanceId(),
- AppConfig.getSdcServiceProxy().getAuthorization());
+ X_ECOMP_INSTANCE_ID,
+ AUTHORIZATION);
} catch (Exception e) {
LOGGER.error("Get WorkflowArtifact Failed.", e);
throw new WorkflowDesignerException("Save WorkflowArtifact Failed.", e);