summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jorge.hernandez-herrero@att.com>2019-07-16 16:40:32 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-16 16:40:32 +0000
commitfdba698893edf2a143f1c523a868e828adef5cef (patch)
tree8d6772f88a747ae2c13e6f1829893015d83e17ee
parent11c0c4ee1a15e135c3e9598dac94d34cf0017bfb (diff)
parentaffd783174f1fe5b92dc54a69388f9bb8bde1d88 (diff)
Merge "Fix checkstyle issues in feature-state-management"
-rw-r--r--feature-state-management/checkstyle-suppressions.xml30
-rw-r--r--feature-state-management/pom.xml3
-rw-r--r--feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DbAudit.java6
-rw-r--r--feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPdpIntegrityMonitor.java (renamed from feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPDPIntegrityMonitor.java)16
-rw-r--r--feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/IntegrityMonitorRestManager.java6
-rw-r--r--feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/RepositoryAudit.java6
-rw-r--r--feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java8
7 files changed, 22 insertions, 53 deletions
diff --git a/feature-state-management/checkstyle-suppressions.xml b/feature-state-management/checkstyle-suppressions.xml
deleted file mode 100644
index 3c394a9c..00000000
--- a/feature-state-management/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ============LICENSE_START=======================================================
- Copyright (C) 2018 AT&T Technologies. 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.
-
- SPDX-License-Identifier: Apache-2.0
- ============LICENSE_END=========================================================
--->
-
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.0//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-
-<suppressions>
- <suppress checks="AbbreviationAsWordInName"
- files="DroolsPDPIntegrityMonitor.java"
- lines="1-9999"/>
-</suppressions>
diff --git a/feature-state-management/pom.xml b/feature-state-management/pom.xml
index f32276b8..95f0feaa 100644
--- a/feature-state-management/pom.xml
+++ b/feature-state-management/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
feature-state-management
================================================================================
- Copyright (C) 2017-2018 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.
@@ -100,7 +100,6 @@
<includeTestResources>true</includeTestResources>
<excludes>
</excludes>
- <suppressionsLocation>${project.baseUri}checkstyle-suppressions.xml</suppressionsLocation>
<consoleOutput>true</consoleOutput>
<failsOnViolation>true</failsOnViolation>
<violationSeverity>warning</violationSeverity>
diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DbAudit.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DbAudit.java
index 108ee6b0..b34d64e6 100644
--- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DbAudit.java
+++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DbAudit.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* feature-state-management
* ================================================================================
- * Copyright (C) 2017-2018 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.
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
/** This class audits the database.
*/
-public class DbAudit extends DroolsPDPIntegrityMonitor.AuditBase {
+public class DbAudit extends DroolsPdpIntegrityMonitor.AuditBase {
// get an instance of logger
private static Logger logger = LoggerFactory.getLogger(DbAudit.class);
// single global instance of this audit object
@@ -66,7 +66,7 @@ public class DbAudit extends DroolsPDPIntegrityMonitor.AuditBase {
* Get the instance.
*
* @return the single 'DbAudit' instance. */
- public static DroolsPDPIntegrityMonitor.AuditBase getInstance() {
+ public static DroolsPdpIntegrityMonitor.AuditBase getInstance() {
return instance;
}
diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPDPIntegrityMonitor.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPdpIntegrityMonitor.java
index a0b709b5..1e528b2d 100644
--- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPDPIntegrityMonitor.java
+++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/DroolsPdpIntegrityMonitor.java
@@ -36,15 +36,15 @@ import org.slf4j.LoggerFactory;
* This class extends 'IntegrityMonitor' for use in the 'Drools PDP' virtual machine. The included
* audits are 'Database' and 'Repository'.
*/
-public class DroolsPDPIntegrityMonitor extends IntegrityMonitor {
+public class DroolsPdpIntegrityMonitor extends IntegrityMonitor {
private static final String INVALID_PROPERTY_VALUE = "init: property {} does not have the expected value of {}";
// get an instance of logger
- private static final Logger logger = LoggerFactory.getLogger(DroolsPDPIntegrityMonitor.class);
+ private static final Logger logger = LoggerFactory.getLogger(DroolsPdpIntegrityMonitor.class);
// static global instance
- private static DroolsPDPIntegrityMonitor im = null;
+ private static DroolsPdpIntegrityMonitor im = null;
// list of audits to run
private static AuditBase[] audits = new AuditBase[] {DbAudit.getInstance(), RepositoryAudit.getInstance()};
@@ -61,7 +61,7 @@ public class DroolsPDPIntegrityMonitor extends IntegrityMonitor {
* @param properties properties used locally, as well as by 'IntegrityMonitor'
* @throws IntegrityMonitorException (passed from superclass)
*/
- private DroolsPDPIntegrityMonitor(String resourceName, Properties consolidatedProperties)
+ private DroolsPdpIntegrityMonitor(String resourceName, Properties consolidatedProperties)
throws IntegrityMonitorException {
super(resourceName, consolidatedProperties);
}
@@ -85,7 +85,7 @@ public class DroolsPDPIntegrityMonitor extends IntegrityMonitor {
*
* @throws IntegrityMonitorException exception
*/
- public static DroolsPDPIntegrityMonitor init(String configDir) throws IntegrityMonitorException {
+ public static DroolsPdpIntegrityMonitor init(String configDir) throws IntegrityMonitorException {
logger.info("init: Entering and invoking PropertyUtil.getProperties() on '{}'", configDir);
@@ -150,11 +150,11 @@ public class DroolsPDPIntegrityMonitor extends IntegrityMonitor {
* @return monitor object
* @throws IntegrityMonitorException exception
*/
- private static DroolsPDPIntegrityMonitor makeMonitor(String resourceName, Properties properties)
+ private static DroolsPdpIntegrityMonitor makeMonitor(String resourceName, Properties properties)
throws IntegrityMonitorException {
try {
- return new DroolsPDPIntegrityMonitor(resourceName, properties);
+ return new DroolsPdpIntegrityMonitor(resourceName, properties);
} catch (Exception e) {
throw new IntegrityMonitorException(e);
@@ -426,7 +426,7 @@ public class DroolsPDPIntegrityMonitor extends IntegrityMonitor {
* @return DroolsPDPIntegrityMonitor object
* @throws IntegrityMonitorException exception
*/
- public static DroolsPDPIntegrityMonitor getInstance() throws IntegrityMonitorException {
+ public static DroolsPdpIntegrityMonitor getInstance() throws IntegrityMonitorException {
if (logger.isDebugEnabled()) {
logger.debug("getInstance() called");
}
diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/IntegrityMonitorRestManager.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/IntegrityMonitorRestManager.java
index 77c188d0..7dca9e63 100644
--- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/IntegrityMonitorRestManager.java
+++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/IntegrityMonitorRestManager.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* feature-state-management
* ================================================================================
- * Copyright (C) 2017-2018 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.
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
@Path("/")
public class IntegrityMonitorRestManager {
private static Logger logger = LoggerFactory.getLogger(IntegrityMonitorRestManager.class);
- private DroolsPDPIntegrityMonitor im;
+ private DroolsPdpIntegrityMonitor im;
/**
* Test interface for Integrity Monitor.
@@ -78,7 +78,7 @@ public class IntegrityMonitorRestManager {
if (im == null) {
try {
- im = DroolsPDPIntegrityMonitor.getInstance();
+ im = DroolsPdpIntegrityMonitor.getInstance();
} catch (Exception e) {
logger.error("IntegrityMonitorRestManager: test() interface caught an exception", e);
body.append("\nException: " + e + "\n");
diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/RepositoryAudit.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/RepositoryAudit.java
index 92ec2ac0..e78b0a1a 100644
--- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/RepositoryAudit.java
+++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/RepositoryAudit.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* feature-state-management
* ================================================================================
- * Copyright (C) 2017-2018 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.
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
/**
* This class audits the Maven repository.
*/
-public class RepositoryAudit extends DroolsPDPIntegrityMonitor.AuditBase {
+public class RepositoryAudit extends DroolsPdpIntegrityMonitor.AuditBase {
private static final long DEFAULT_TIMEOUT = 60; //timeout in 60 seconds
// get an instance of logger
@@ -59,7 +59,7 @@ public class RepositoryAudit extends DroolsPDPIntegrityMonitor.AuditBase {
*
* @return the single 'RepositoryAudit' instance
*/
- public static DroolsPDPIntegrityMonitor.AuditBase getInstance() {
+ public static DroolsPdpIntegrityMonitor.AuditBase getInstance() {
return instance;
}
diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java
index 94f35409..be9cc53c 100644
--- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java
+++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* feature-state-management
* ================================================================================
- * Copyright (C) 2017-2018 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.
@@ -49,7 +49,7 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
private static final Logger logger =
LoggerFactory.getLogger(StateManagementFeature.class);
- private DroolsPDPIntegrityMonitor droolsPdpIntegrityMonitor = null;
+ private DroolsPdpIntegrityMonitor droolsPdpIntegrityMonitor = null;
private StateManagement stateManagement = null;
public StateManagementFeature() {
@@ -62,7 +62,7 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
logger.debug("StateManagementFeature.globalInit({}) entry", configDir);
try {
- droolsPdpIntegrityMonitor = DroolsPDPIntegrityMonitor.init(configDir);
+ droolsPdpIntegrityMonitor = DroolsPdpIntegrityMonitor.init(configDir);
} catch (Exception e) {
logger.debug("DroolsPDPIntegrityMonitor initialization exception: ", e);
logger.error("DroolsPDPIntegrityMonitor.init()", e);
@@ -72,7 +72,7 @@ public class StateManagementFeature implements StateManagementFeatureAPI,
//At this point the DroolsPDPIntegrityMonitor instance must exist. Let's check it.
try {
- droolsPdpIntegrityMonitor = DroolsPDPIntegrityMonitor.getInstance();
+ droolsPdpIntegrityMonitor = DroolsPdpIntegrityMonitor.getInstance();
stateManagement = droolsPdpIntegrityMonitor.getStateManager();
if (stateManagement == null) {