aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java4
-rw-r--r--framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java4
-rw-r--r--framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java4
-rw-r--r--framework/src/test/java/org/onap/cli/fw/store/OnapCommandExecutionStoreTest.java11
-rw-r--r--framework/src/test/java/org/onap/cli/fw/store/OnapCommandProfileStoreTest.java8
-rw-r--r--profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java4
6 files changed, 29 insertions, 6 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java
index d43b51d8..7ffe05e1 100644
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java
@@ -255,7 +255,9 @@ public class OnapCommandArtifactStore {
if (!aFile.exists()) {
throw new OnapCommandArtifactNotFound(name, category);
}
- aFile.delete();
+ if(!aFile.delete()){
+ log.error("Failed to delete the artifact " + aFile.getAbsolutePath());
+ }
}
public Artifact updateArtifact(String name, String category, Artifact artifact) throws OnapCommandArtifactNotFound, OnapCommandArtifactContentNotExist, OnapCommandArtifactAlreadyExist {
diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
index d09dfa50..a22eb084 100644
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
@@ -267,7 +267,9 @@ public class OnapCommandExecutionStore {
else
FileUtils.touch(new File(context.getStorePath() + File.separator + "failed"));
- new File(context.getStorePath() + File.separator + "in-progress").delete();
+ if(!new File(context.getStorePath() + File.separator + "in-progress").delete()){
+ log.error("Failed to delete "+ context.getStorePath() + File.separator + "in-progress");
+ }
} catch (IOException e) {
log.error("Failed to store the execution end details " + context.storePath);
}
diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java
index 68d57c77..6455447e 100644
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java
@@ -206,7 +206,9 @@ public class OnapCommandProfileStore {
String dataDir = getDataStorePath();
File file = new File(dataDir + File.separator + profile + DATA_PATH_PROFILE_JSON);
if (file.exists()) {
- file.delete();
+ if(!file.delete()){
+ log.error("Failed to delete profile "+file.getAbsolutePath());
+ }
}
}
diff --git a/framework/src/test/java/org/onap/cli/fw/store/OnapCommandExecutionStoreTest.java b/framework/src/test/java/org/onap/cli/fw/store/OnapCommandExecutionStoreTest.java
index 639f6239..1907be20 100644
--- a/framework/src/test/java/org/onap/cli/fw/store/OnapCommandExecutionStoreTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/store/OnapCommandExecutionStoreTest.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.*;
+import java.io.IOException;
public class OnapCommandExecutionStoreTest {
OnapCommandExecutionStore executionStore;
@@ -60,6 +61,16 @@ public class OnapCommandExecutionStoreTest {
executionStore.storeExectutionEnd(store, "abc", "abc", "abc", true);
assertTrue(new File(System.getProperty("user.dir") + File.separator + "abc").exists());
}
+ @Test
+ public void storeExectutionEndDeleteTest() throws IOException {
+ new File("target/in-progress").createNewFile();
+ OnapCommandExecutionStore.ExecutionStoreContext store = new OnapCommandExecutionStore.ExecutionStoreContext();
+ store.setExecutionId("abc");
+ store.setRequestId("abc");
+ store.setStorePath("target/");
+ executionStore.storeExectutionEnd(store, "abc", "abc", "abc", true);
+ assertFalse(new File("target" + File.separator + "in-progress").exists());
+ }
@Test
public void storeExectutionProgressTest() {
diff --git a/framework/src/test/java/org/onap/cli/fw/store/OnapCommandProfileStoreTest.java b/framework/src/test/java/org/onap/cli/fw/store/OnapCommandProfileStoreTest.java
index 3ffd45c0..1635b1b5 100644
--- a/framework/src/test/java/org/onap/cli/fw/store/OnapCommandProfileStoreTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/store/OnapCommandProfileStoreTest.java
@@ -22,13 +22,13 @@ import org.onap.cli.fw.cmd.execution.OnapCommandExceutionListCommandTest;
import org.onap.cli.fw.error.OnapCommandException;
import org.onap.cli.fw.error.OnapCommandPersistProfileFailed;
import org.onap.cli.fw.input.cache.OnapCommandParamEntity;
-import org.onap.cli.fw.utils.FileUtil;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.*;
+import java.io.IOException;
public class OnapCommandProfileStoreTest {
OnapCommandProfileStore onapCommandProfileStore;
@@ -62,6 +62,12 @@ public class OnapCommandProfileStoreTest {
onapCommandProfileStore.removeProfile("abc");
assertFalse(new File(System.getProperty("user.dir") + File.separator + "data/profiles/abc-profile.json").exists());
}
+ @Test
+ public void removeProfileDeleteTest() throws IOException {
+ new File(System.getProperty("user.dir") + File.separator + "data/profiles/abc-profile.json").createNewFile();
+ onapCommandProfileStore.removeProfile("abc");
+ assertFalse(new File(System.getProperty("user.dir") + File.separator + "data/profiles/abc-profile.json").exists());
+ }
@Test
public void addTest() {
diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
index eae0113a..3533e92d 100644
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
@@ -91,12 +91,12 @@ public class OnapHttpConnection {
}
@Override
- public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {
+ public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) { //NOSONAR
// No need to implement.
}
@Override
- public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {
+ public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) { //NOSONAR
// No need to implement.
}
}