From fd2f9e3fb31335e15a72ca3db728667874053d44 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 17 Jul 2020 15:24:26 -0400 Subject: Remove m2 model from drools-apps With the advent of the new Actor model, then m2 model is no longer needed in drools-apps. Issue-ID: POLICY-2725 Change-Id: I3aa43619391552c00bd4e138aee96ca5d5bd55a8 Signed-off-by: Jim Hahn --- controlloop/m2/adapters/pom.xml | 40 --------------- .../policy/m2/adapters/VirtualOnsetAdapter.java | 60 ---------------------- .../m2/adapters/VirtualOnsetAdapterTest.java | 54 ------------------- 3 files changed, 154 deletions(-) delete mode 100644 controlloop/m2/adapters/pom.xml delete mode 100644 controlloop/m2/adapters/src/main/java/org/onap/policy/m2/adapters/VirtualOnsetAdapter.java delete mode 100644 controlloop/m2/adapters/src/test/java/org/onap/policy/m2/adapters/VirtualOnsetAdapterTest.java (limited to 'controlloop/m2/adapters') diff --git a/controlloop/m2/adapters/pom.xml b/controlloop/m2/adapters/pom.xml deleted file mode 100644 index 4045ff358..000000000 --- a/controlloop/m2/adapters/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - 4.0.0 - - org.onap.policy.drools-applications.controlloop.m2 - m2 - 1.7.1-SNAPSHOT - - adapters - adapters - - - - org.onap.policy.drools-applications.controlloop.m2 - base - ${project.version} - - - diff --git a/controlloop/m2/adapters/src/main/java/org/onap/policy/m2/adapters/VirtualOnsetAdapter.java b/controlloop/m2/adapters/src/main/java/org/onap/policy/m2/adapters/VirtualOnsetAdapter.java deleted file mode 100644 index 1a3a5f66c..000000000 --- a/controlloop/m2/adapters/src/main/java/org/onap/policy/m2/adapters/VirtualOnsetAdapter.java +++ /dev/null @@ -1,60 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * m2/adapters - * ================================================================================ - * Copyright (C) 2020 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.policy.m2.adapters; - -import java.io.Serializable; -import org.onap.policy.controlloop.ControlLoopEvent; -import org.onap.policy.controlloop.ControlLoopNotification; -import org.onap.policy.controlloop.VirtualControlLoopEvent; -import org.onap.policy.controlloop.VirtualControlLoopNotification; -import org.onap.policy.m2.base.OnsetAdapter; - -public class VirtualOnsetAdapter extends OnsetAdapter implements Serializable { - private static final long serialVersionUID = 1L; - - private static VirtualOnsetAdapter instance = new VirtualOnsetAdapter(); - - /** - * This method is called to register the 'VirtualOnsetAdapter' instance - * under the 'VirtualControlLoopEvent' class. This method called in the - * static initialization code of the 'Actor' classes that use this - * adapter -- namely, 'AppcLcmActor'. - */ - public static void register() { - OnsetAdapter.register(VirtualControlLoopEvent.class, instance); - } - - /** - * This method overrides the associated 'OnsetAdapter' method. - */ - @Override - public ControlLoopNotification createNotification(ControlLoopEvent event) { - if (event instanceof VirtualControlLoopEvent) { - return new VirtualControlLoopNotification((VirtualControlLoopEvent) event); - } - - // Right now, the onset event from the transaction is used to locate - // the adapter. It is expected that the 'event' passed here will - // be of the same class, but that isn't always guaranteed. If this - // is not the case, the appropriate adapter is located in this way. - return OnsetAdapter.get(event).createNotification(event); - } -} diff --git a/controlloop/m2/adapters/src/test/java/org/onap/policy/m2/adapters/VirtualOnsetAdapterTest.java b/controlloop/m2/adapters/src/test/java/org/onap/policy/m2/adapters/VirtualOnsetAdapterTest.java deleted file mode 100644 index 4b38b1e14..000000000 --- a/controlloop/m2/adapters/src/test/java/org/onap/policy/m2/adapters/VirtualOnsetAdapterTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * adapters - * ================================================================================ - * Copyright (C) 2020 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.policy.m2.adapters; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; -import org.onap.policy.controlloop.ControlLoopEvent; -import org.onap.policy.controlloop.ControlLoopNotification; -import org.onap.policy.controlloop.VirtualControlLoopEvent; -import org.onap.policy.controlloop.VirtualControlLoopNotification; -import org.onap.policy.m2.base.OnsetAdapter; - -public class VirtualOnsetAdapterTest { - - @Test - public void test() { - VirtualOnsetAdapter.register(); - VirtualControlLoopEvent virtualControlLoopEvent = new VirtualControlLoopEvent(); - VirtualOnsetAdapter virtualOnsetAdapter = - VirtualOnsetAdapter.class.cast(OnsetAdapter.get(virtualControlLoopEvent)); - assertNotNull(virtualOnsetAdapter); - - ControlLoopNotification notification = virtualOnsetAdapter.createNotification(virtualControlLoopEvent); - assertNotNull(notification); - // we want an exact class match, so 'instanceOf' is not being used - assertEquals(VirtualControlLoopNotification.class, notification.getClass()); - - ControlLoopEvent controlLoopEvent = new ControlLoopEvent() { - private static final long serialVersionUID = 1L; - }; - notification = virtualOnsetAdapter.createNotification(controlLoopEvent); - assertNotNull(notification); - } -} -- cgit 1.2.3-korg