Clean up Process Engine selection logic

Several failed attempts to split the BPMN application into
multiple applications with separate camunda process engines
have left a mess of confusing classes and process engine
definitions.

In the Amsterdam release, there should be only one BPMN
application war.  This is MSOInfrastructureBPMN.
MSOCommonBPMN should not be deployed as a separate
application.  Its classes are compiled into a jar and
this is included inside MSOInfrastructureBPMN.

The MSOInfrastructureBPMN application should use the
"default" process engine.

WorkflowAsyncInfrastructureResource and
MSOCommonApplication classes are not needed.

Issue: SO-322
Change-Id: Ifdb3b33541346b561a16361d1aa791e8342a34fa
Signed-off-by: Rob Daugherty <rd472p@att.com>

2 files changed, 2 insertions, 52 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowAsyncInfrastructureResource.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowAsyncInfrastructureResource.java
deleted file mode 100644
index 33b40b7bf0..0000000000
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowAsyncInfrastructureResource.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

- * ================================================================================

- * 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.

- * ============LICENSE_END=========================================================

- */

-

-package org.openecomp.mso.bpmn.infrastructure.workflow.service;

-

-import javax.ws.rs.Path;

-

-import org.camunda.bpm.engine.ProcessEngineServices;

-import org.camunda.bpm.engine.ProcessEngines;

-import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;

-

-

-/**

- * 

- * @version 1.0

- * Asynchronous Workflow processing using JAX RS RESTeasy implementation

- * Both Synchronous and Asynchronous BPMN process can benefit from this implementation since the workflow gets executed in the background

- * and the server thread is freed up, server scales better to process more incoming requests

- * 

- * Usage: For synchronous process, when you are ready to send the response invoke the callback to write the response

- * For asynchronous process - the activity may send a acknowledgement response and then proceed further on executing the process

- */

-@Path("/async")

-public class WorkflowAsyncInfrastructureResource extends WorkflowAsyncResource {

-	

-    protected ProcessEngineServices getProcessEngineServices() {

-        return pes4junit.orElse(ProcessEngines.getProcessEngine("infrastructure"));

-    }

-}

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java
index 16811979c1..80b11bbdf5 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/service/WorkflowResourceApplication.java
@@ -26,14 +26,10 @@ import java.util.Set;
 import javax.ws.rs.ApplicationPath;

 import javax.ws.rs.core.Application;

 

+import org.openecomp.mso.bpmn.common.workflow.service.WorkflowAsyncResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowMessageResource;

 import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResource;

 

-/**

- * @version 1.0

- * RESTeasy workflow application which wires synchronous and asynchronous response

- *

- */

 @ApplicationPath("/")

 public class WorkflowResourceApplication extends Application {

     private Set<Object> singletons = new HashSet<Object>();

@@ -41,7 +37,7 @@ public class WorkflowResourceApplication extends Application {
 

     public WorkflowResourceApplication() {

         singletons.add(new WorkflowResource());

-        singletons.add(new WorkflowAsyncInfrastructureResource());

+        singletons.add(new WorkflowAsyncResource());

         singletons.add(new WorkflowMessageResource());

     }