Implant vid-app-common org.onap.vid.job (main and test)

[vid.git] / vid-app-common / src / main / java / org / onap / vid / job / JobType.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/JobType.java b/vid-app-common/src/main/java/org/onap/vid/job/JobType.java
index e856ba0..b0cfa7a 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/job/JobType.java
+++ b/vid-app-common/src/main/java/org/onap/vid/job/JobType.java
@@ -1,3 +1,23 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 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.onap.vid.job;
 
 import org.onap.vid.job.command.*;
@@ -12,26 +32,20 @@ public enum JobType {
 
     HttpCall(HttpCallCommand.class),
     AggregateState(AggregateStateCommand.class),
-    ServiceInstantiation(MacroServiceInstantiationCommand.class),
-    MacroServiceInstantiation(MacroServiceInstantiationCommand.class),
-    ALaCarteServiceInstantiation(ALaCarteServiceInstantiationCommand.class),
+    ServiceInstantiation(MacroServiceCommand.class),
+    MacroServiceInstantiation(MacroServiceCommand.class),
+    ALaCarteServiceInstantiation(ALaCarteServiceCommand.class),
     ALaCarteService(ALaCarteServiceCommand.class),
-    VnfInstantiation(VnfInstantiationCommand.class),
-    VfmoduleInstantiation(VfmoduleInstantiationCommand.class),
-    VolumeGroupInstantiation(VolumeGroupInstantiationCommand.class),
-    VolumeGroupInProgressStatus(VolumeGroupInProgressStatusCommand.class),
-    NetworkInstantiation(NetworkInstantiationCommand.class),
-    InstanceGroupInstantiation(InstanceGroupInstantiationCommand.class),
+    VnfInstantiation(VnfCommand.class),
+    VfmoduleInstantiation(VfmoduleCommand.class),
+    VolumeGroupInstantiation(VolumeGroupCommand.class),
+    NetworkInstantiation(NetworkCommand.class),
     InstanceGroup(InstanceGroupCommand.class),
-    InProgressStatus(ServiceInProgressStatusCommand.class),
-    ResourceInProgressStatus(ResourceInProgressStatusCommand.class),
-    VnfInProgressStatus(VnfInProgressStatusCommand.class),
-    Watching(WatchingCommand.class),
-    WatchingBaseModule(WatchingCommandBaseModule.class),
+    InstanceGroupMember(InstanceGroupMemberCommand.class),
     NoOp(NoOpCommand.class);
 
     private static final Map<Class, JobType> REVERSE_MAP = Stream.of(values())
-            .filter(not(jobType -> jobType.equals(ServiceInstantiation)))
+            .filter(not(jobType -> (jobType == ServiceInstantiation) || (jobType == ALaCarteServiceInstantiation)))
             .collect(Collectors.toMap(t -> t.getCommandClass(), t -> t));
 
     private final Class commandClass;