Skip to content

Commit e209e6f

Browse files
committed
eliminate code warnings
1 parent e26b400 commit e209e6f

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

  • tooling
    • conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli
    • conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage

tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/AnsibleVault.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.File;
2323
import java.io.FileNotFoundException;
2424
import java.io.IOException;
25+
import java.nio.file.Files;
2526
import java.util.function.Function;
2627

2728
import org.apache.commons.io.FileUtils;
@@ -96,7 +97,7 @@ private static void handleFile(File file, Function<byte[], byte[]> vaultHandler)
9697
}
9798
byte[] input = FileUtils.readFileToByteArray(file);
9899
byte[] output = vaultHandler.apply(input);
99-
file.delete();
100+
Files.delete(file.toPath());
100101
FileUtils.writeByteArrayToFile(file, output);
101102
}
102103

tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import java.util.HashSet;
4444
import java.util.List;
4545
import java.util.Map;
46+
import java.util.Objects;
4647
import java.util.Optional;
4748
import java.util.Properties;
4849
import java.util.Set;
@@ -522,7 +523,7 @@ private String buildPackagePath(ContentPackageFile pkg, String rootPath, String
522523
String runModeSuffix = buildRunModeSuffix(pkg, environmentRunMode);
523524

524525
// add run mode suffix to both install folder path and package file name
525-
String path = rootPath + "/" + StringUtils.defaultString(pkg.getPackageType(), "misc") + "/install" + runModeSuffix;
526+
String path = rootPath + "/" + Objects.toString(pkg.getPackageType(), "misc") + "/install" + runModeSuffix;
526527

527528
String versionSuffix = "";
528529
String packageVersion = pkg.getVersion();

0 commit comments

Comments
 (0)