cosmetic: cleanup code warnings

Author: stefanseifert

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/crypto/impl/AesCryptoSupport.java

@@ -31,7 +31,6 @@
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.wcm.devops.conga.plugins.aem.crypto.CryptoSupport;
 
 /**
@@ -96,7 +95,6 @@ private Cipher getCipher(int cipherMode, byte[] iv, Key key) throws GeneralSecur
     return cipher;
   }
 
-  @SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE")
   private byte[] generateIV() {
     byte[] iv = new byte[IV_SIZE];
     RANDOM.nextBytes(iv);

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AbstractFilterHelper.java

@@ -33,7 +33,7 @@
 abstract class AbstractFilterHelper implements HelperPlugin<Object> {
 
   @Override
-  @SuppressWarnings("PMD.PreserveStackTrace")
+  @SuppressWarnings({ "PMD.PreserveStackTrace", "PMD.AvoidThrowingNewInstanceOfSameException" })
   public final Object apply(Object context, Options options, HelperContext pluginContext) throws IOException {
     if (!(context instanceof Map)) {
       throw new IllegalArgumentException("Excpected map object for filter rule.");

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AemCryptoEncryptHelper.java

@@ -63,7 +63,7 @@ public String getName() {
   }
 
   @Override
-  @SuppressWarnings({ "java:S3776", "java:S5411" }) // ignore complexity
+  @SuppressWarnings({ "java:S3776", "java:S5411", "PMD.ExceptionAsFlowControl" }) // ignore complexity
   public Object apply(Object context, Options options, HelperContext pluginContext) throws IOException {
     if (context == null) {
       return null;

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackageOsgiConfigPostProcessor.java

@@ -40,7 +40,6 @@
 import org.apache.sling.provisioning.model.Model;
 import org.slf4j.Logger;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.wcm.devops.conga.generator.GeneratorException;
 import io.wcm.devops.conga.generator.plugins.postprocessor.AbstractPostProcessor;
 import io.wcm.devops.conga.generator.spi.context.FileContext;
@@ -78,7 +77,6 @@ public boolean accepts(FileContext file, PostProcessorContext context) {
   }
 
   @Override
-  @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
   public List<FileContext> apply(FileContext fileContext, PostProcessorContext context) {
     File file = fileContext.getFile();
     Logger logger = context.getLogger();
@@ -152,7 +150,6 @@ private boolean generateOsgiConfigurations(Model model, ContentPackage contentPa
       String rootPath, FileHeaderContext fileHeader, PostProcessorContext context) throws IOException {
     List<Void> result = ProvisioningUtil.visitOsgiConfigurations(model, new ConfigConsumer<Void>() {
       @Override
-      @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
       @SuppressWarnings("java:S3457") // log placeholders
       public Void accept(String path, Dictionary<String, Object> properties) throws IOException {
         String contentPath = rootPath + (StringUtils.contains(path, "/") ? "." : "/") + path;

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackagePostProcessor.java

@@ -32,7 +32,6 @@
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.wcm.devops.conga.generator.GeneratorException;
 import io.wcm.devops.conga.generator.plugins.postprocessor.AbstractPostProcessor;
 import io.wcm.devops.conga.generator.spi.context.FileContext;
@@ -72,7 +71,6 @@ public boolean accepts(FileContext file, PostProcessorContext context) {
   }
 
   @Override
-  @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
   public List<FileContext> apply(FileContext fileContext, PostProcessorContext context) {
     File file = fileContext.getFile();
     Logger logger = context.getLogger();

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/util/ContentPackageBinaryFile.java

@@ -28,7 +28,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.wcm.devops.conga.generator.UrlFileManager;
 
 /**
@@ -93,7 +92,6 @@ public String getPath() {
    * @param targetDir Target directory for configuration
    * @throws IOException I/O exception
    */
-  @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
   public void deleteIfRequired(UrlFileManager urlFileManager, File targetDir) throws IOException {
     if (delete) {
       if (StringUtils.isNotBlank(url)) {

conga-aem-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/crypto/CryptoStringTest.java

@@ -53,28 +53,28 @@ void testConversion() {
 
 
   @Test
-  void testToByteArrayNull() throws Exception {
+  void testToByteArrayNull() {
     assertThrows(IllegalArgumentException.class, () -> {
       CryptoString.toByteArray(null);
     });
   }
 
   @Test
-  void testToByteArrayIllegalString() throws Exception {
+  void testToByteArrayIllegalString() {
     assertThrows(IllegalArgumentException.class, () -> {
       CryptoString.toByteArray("abc");
     });
   }
 
   @Test
-  void testToStringNull() throws Exception {
+  void testToStringNull() {
     assertThrows(IllegalArgumentException.class, () -> {
       CryptoString.toString(null);
     });
   }
 
   @Test
-  void testToStringEmptyArray() throws Exception {
+  void testToStringEmptyArray() {
     assertThrows(IllegalArgumentException.class, () -> {
       CryptoString.toString(new byte[0]);
     });

conga-aem-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AemCryptoEncryptHelperTest.java

@@ -72,7 +72,7 @@ void testNull() throws Exception {
   }
 
   @Test
-  void testWithoutKey() throws Exception {
+  void testWithoutKey() {
     assertThrows(IOException.class, () -> {
       executeHelper(helper, INPUT, new MockOptions(), pluginContext);
     });

conga-aem-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/WebConsolePasswordHashHelperTest.java

@@ -73,15 +73,15 @@ void testCustomAlgorithm() throws Exception {
   }
 
   @Test
-  void testInvalidHashAlgorithm() throws Exception {
+  void testInvalidHashAlgorithm() {
     assertThrows(IOException.class, () -> {
       Object passwordHash = executeHelper(helper, PASSWORD_PLAIN, new MockOptions().withHash(WebConsolePasswordHashHelper.HASH_OPTION_ALGORITHM, "invalid"));
       assertEquals(PASSWORD_HASH_SHA256, passwordHash);
     });
   }
 
   @Test
-  void testInvalidEncoding() throws Exception {
+  void testInvalidEncoding() {
     assertThrows(IOException.class, () -> {
       Object passwordHash = executeHelper(helper, PASSWORD_PLAIN, new MockOptions().withHash(WebConsolePasswordHashHelper.HASH_OPTION_ENCODING, "invalid"));
       assertEquals(PASSWORD_HASH_SHA256, passwordHash);

conga-aem-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackagePropertiesPostProcessorTest.java

@@ -48,7 +48,7 @@ void setUp() {
 
   @SuppressWarnings("unchecked")
   @Test
-  void testContentPackage() throws Exception {
+  void testContentPackage() {
 
     FileContext fileContext = new FileContext()
         .file(new File("src/test/resources/package/example.zip"));
@@ -80,7 +80,7 @@ void testContentPackageOverridePackageType() throws Exception {
   }
 
   @Test
-  void testNonContentPackage() throws Exception {
+  void testNonContentPackage() {
 
     FileContext fileContext = new FileContext()
         .file(new File("src/test/resources/package/no-content-package.zip"));