From fe5d78724f723a451ddc0d7cc41d6fc60092b314 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Thu, 13 Jun 2019 12:34:17 -0400
Subject: More sonar fixes in policy/common

Note: this does not increase code coverage, but should fix other
code issues.

Resolved cyclomatic complexity issue in ParameterValidationResult.
Refactored duplicate code in GroupValidationResult.
Removed IOException from NetworkUtil "throws".
Replaced null/empty string tests with StringUtils.isBlank().
Added @FunctionalInterface where needed.
Replaced anonymous classes with lambda expressions.
Replaced duplicate strings with a constant.
Added private constructors for utility classes.
Removed sleep() from tests.
Removed unused parameter from method call.
Made some protected methods private.
Compute integrity monitor's state-transition table once.
Use for-loop instead of iterator.
Moved constructors.
Fixed some checkstyle issues (tabs => spaces, trailing spaces).

Change-Id: I9a962ca45c4ff3f212c6014da799d06f07b232ef
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../src/main/resources/META-INF/persistence.xml    | 53 +++++++++++-----------
 1 file changed, 27 insertions(+), 26 deletions(-)

(limited to 'integrity-monitor/src/main/resources/META-INF/persistence.xml')

diff --git a/integrity-monitor/src/main/resources/META-INF/persistence.xml b/integrity-monitor/src/main/resources/META-INF/persistence.xml
index f5089b12..7aff9219 100644
--- a/integrity-monitor/src/main/resources/META-INF/persistence.xml
+++ b/integrity-monitor/src/main/resources/META-INF/persistence.xml
@@ -3,14 +3,14 @@
   ============LICENSE_START=======================================================
   Integrity Monitor
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  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.
@@ -19,30 +19,31 @@
   ============LICENSE_END=========================================================
   -->
 
-<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-	<persistence-unit name="schemaPU" transaction-type="RESOURCE_LOCAL">
-	<!-- Limited use for generating the DB and schema files for imtest DB - uses eclipselink -->
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.onap.policy.common.im.jpa.ImTestEntity</class>
-		<class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
-		<class>org.onap.policy.common.im.jpa.ForwardProgressEntity</class>
-		<class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
-		<shared-cache-mode>NONE</shared-cache-mode>
-		<properties>
-			<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+    <persistence-unit name="schemaPU" transaction-type="RESOURCE_LOCAL">
+    <!-- Limited use for generating the DB and schema files for imtest DB - uses eclipselink -->
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <class>org.onap.policy.common.im.jpa.ImTestEntity</class>
+        <class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
+        <class>org.onap.policy.common.im.jpa.ForwardProgressEntity</class>
+        <class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
+        <shared-cache-mode>NONE</shared-cache-mode>
+        <properties>
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create" />
         </properties>
-	</persistence-unit>
+    </persistence-unit>
 
-	<persistence-unit name="operationalPU" transaction-type="RESOURCE_LOCAL">
-	<!-- For operational use -->
-		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<class>org.onap.policy.common.im.jpa.ImTestEntity</class>
-		<class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
-		<class>org.onap.policy.common.im.jpa.ForwardProgressEntity</class>
-		<class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
-		<shared-cache-mode>NONE</shared-cache-mode>	
-		<properties>
-			<!-- none -->
+    <persistence-unit name="operationalPU" transaction-type="RESOURCE_LOCAL">
+    <!-- For operational use -->
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+        <class>org.onap.policy.common.im.jpa.ImTestEntity</class>
+        <class>org.onap.policy.common.im.jpa.StateManagementEntity</class>
+        <class>org.onap.policy.common.im.jpa.ForwardProgressEntity</class>
+        <class>org.onap.policy.common.im.jpa.ResourceRegistrationEntity</class>
+        <shared-cache-mode>NONE</shared-cache-mode>
+        <properties>
+            <!-- none -->
         </properties>
-	</persistence-unit>
+    </persistence-unit>
 </persistence>
-- 
cgit 1.2.3-korg