From dbb838a594fde49ca337900e42a6e9b56bb2b60b Mon Sep 17 00:00:00 2001 From: rb7147 Date: Tue, 13 Mar 2018 00:13:25 -0400 Subject: Fixed the SDK Junits and cleaned unused code Moved file tmp object from try resources block. due to not closing the stream the inputstream read by xacmlpolicyscanner ended with premature file error. Cleaned unused code. Issue-ID: POLICY-584 Change-Id: I92c4d000d94a144736d9ac46db384785a7512593 Signed-off-by: rb7147 --- .../rest/adapter/ClosedLoopPerformanceMetrics.java | 40 ---------------------- .../rest/adapter/ClosedLoopPolicyAdaptersTest.java | 11 ------ 2 files changed, 51 deletions(-) delete mode 100644 ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPerformanceMetrics.java (limited to 'ONAP-REST') diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPerformanceMetrics.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPerformanceMetrics.java deleted file mode 100644 index 97546460a..000000000 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPerformanceMetrics.java +++ /dev/null @@ -1,40 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP Policy Engine - * ================================================================================ - * 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.onap.policy.rest.adapter; - - -public class ClosedLoopPerformanceMetrics { - public static final String CLPM_UIFIELD_ONSET_MESSAGE = "Onset Message"; - public static final String CLPM_UIJSON_ONSET_MESSAGE = "attributes.OnsetMessage"; - - public static final String CLPM_UIFIELD_POLICY_NAME = "PolicyName"; - public static final String CLPM_UIJSON_POLICY_NAME = "attributes.PolicyName"; - - public static final String CLPM_UIFIELD_ABATEMENT_MESSAGE = "Abatement Message"; - public static final String CLPM_UIJSON_ABATEMENT_MESSAGE = "attributes.AbatementMessage"; - - public static final String CLPM_UIFIELD_GEOLINK = "Geo Link"; - public static final String CLPM_UIJSON_GEOLINK = "geoLink"; - - private ClosedLoopPerformanceMetrics() { - // Empty constructor - } -} diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/adapter/ClosedLoopPolicyAdaptersTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/adapter/ClosedLoopPolicyAdaptersTest.java index 320c30213..085dde1b6 100644 --- a/ONAP-REST/src/test/java/org/onap/policy/rest/adapter/ClosedLoopPolicyAdaptersTest.java +++ b/ONAP-REST/src/test/java/org/onap/policy/rest/adapter/ClosedLoopPolicyAdaptersTest.java @@ -22,9 +22,6 @@ package org.onap.policy.rest.adapter; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -168,12 +165,4 @@ public class ClosedLoopPolicyAdaptersTest { assertEquals(ClosedLoopPolicyStatus.ACTIVE.toString(), "active"); assertEquals(ClosedLoopPolicyStatus.INACTIVE.toString(), "inactive"); } - - @Test - public void testConstructorIsPrivate() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { - Constructor constructor = ClosedLoopPerformanceMetrics.class.getDeclaredConstructor(); - assertTrue(Modifier.isPrivate(constructor.getModifiers())); - constructor.setAccessible(true); - constructor.newInstance(); - } } -- cgit 1.2.3-korg