From 1c32e0c17febcbef90756f3eef4868542723cc81 Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Wed, 26 Sep 2018 13:53:38 -0400
Subject: Fix for checkstyle declarations

I found the problem with policy-yaml. An exception was
occuring due to an extra line between an @return for
javadoc vs. just printing a warning.

See: https://github.com/checkstyle/checkstyle/issues/2398

I also messed up some of the other declarations in the
sub-modules.

Copyright

Issue-ID: POLICY-1153
Change-Id: I848e0b19340d494775e161bab86ffb60a97d83ab
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 controlloop/common/guard/checkstyle-suppressions.xml | 2 +-
 controlloop/common/guard/pom.xml                     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'controlloop/common/guard')

diff --git a/controlloop/common/guard/checkstyle-suppressions.xml b/controlloop/common/guard/checkstyle-suppressions.xml
index 9b071df87..7893c0b7d 100644
--- a/controlloop/common/guard/checkstyle-suppressions.xml
+++ b/controlloop/common/guard/checkstyle-suppressions.xml
@@ -25,6 +25,6 @@
  
 <suppressions>
   <suppress checks="AbbreviationAsWordInName"
-    files="PNFTargetLock.java|VNFTargetLock.java|VMTargetLock.java|PolicyGuardRequest.java|PolicyGuardResponse.java|PolicyGuardXacmlHelper.java|TargetLock.java"
+    files="PNFTargetLock.java|VNFTargetLock.java|VMTargetLock.java|PolicyGuardRequest.java|PolicyGuardResponse.java|PolicyGuardXacmlHelper.java|TargetLock.java|PolicyGuardXacmlRequestAttributes.java"
     lines="1-9999"/>
 </suppressions>
diff --git a/controlloop/common/guard/pom.xml b/controlloop/common/guard/pom.xml
index 08e403e41..a76f4b30c 100644
--- a/controlloop/common/guard/pom.xml
+++ b/controlloop/common/guard/pom.xml
@@ -124,12 +124,13 @@
                             with minor changes -->
                             <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
                             <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
-                            <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
                             <includeResources>true</includeResources>
                             <includeTestSourceDirectory>true</includeTestSourceDirectory>
                             <includeTestResources>true</includeTestResources>
                             <excludes>
                             </excludes>
+                            <suppressionsLocation>${project.basedir}/checkstyle-suppressions.xml</suppressionsLocation>
                             <consoleOutput>true</consoleOutput>
                             <failsOnViolation>true</failsOnViolation>
                             <violationSeverity>warning</violationSeverity>
-- 
cgit 1.2.3-korg