summaryrefslogtreecommitdiffstats
path: root/participant/participant-impl
diff options
context:
space:
mode:
authorRamesh Murugan Iyer <ramesh.murugan.iyer@est.tech>2023-10-04 09:25:14 +0000
committerGerrit Code Review <gerrit@onap.org>2023-10-04 09:25:14 +0000
commit8833b1dbfc0a8693acaec89801223542b29314f1 (patch)
tree4c12058ae8d07fbbe83ce6ee59025ee73ff38d0d /participant/participant-impl
parent5ea3c200aafea9ce1b117c7cf94b54249e4cd283 (diff)
parentae980791d1996041592fd45a56cfdce7801cecfa (diff)
Merge "Fix minor Sonar Issues for clamp/acm"
Diffstat (limited to 'participant/participant-impl')
-rw-r--r--participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/service/ChartStoreTest.java34
-rwxr-xr-xparticipant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/acm/participant/policy/client/AbstractHttpClient.java5
2 files changed, 19 insertions, 20 deletions
diff --git a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/service/ChartStoreTest.java b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/service/ChartStoreTest.java
index 70f80c8a7..b7e0f49dc 100644
--- a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/service/ChartStoreTest.java
+++ b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/service/ChartStoreTest.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2021-2022 Nordix Foundation.
+ * Copyright (C) 2021-2023 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -88,25 +88,25 @@ class ChartStoreTest {
@Test
void test_getHelmChartFile() {
- File file = chartStore.getHelmChartFile(charts.get(0));
+ var file = chartStore.getHelmChartFile(charts.get(0));
assertNotNull(file);
assertThat(file.getPath()).endsWith(charts.get(0).getChartId().getName());
}
@Test
void test_getOverrideFile() {
- File file = chartStore.getOverrideFile(charts.get(0));
+ var file = chartStore.getOverrideFile(charts.get(0));
assertNotNull(file);
assertThat(file.getPath()).endsWith("values.yaml");
}
@Test
void test_saveChart() throws IOException, ServiceException {
- MockMultipartFile mockChartFile = new MockMultipartFile("chart", "dummy".getBytes());
- MockMultipartFile mockOverrideFile = new MockMultipartFile("override", "dummy".getBytes());
- ChartInfo testChart = charts.get(0);
+ var mockChartFile = new MockMultipartFile("chart", "dummy".getBytes());
+ var mockOverrideFile = new MockMultipartFile("override", "dummy".getBytes());
+ var testChart = charts.get(0);
testChart.setChartId(new ToscaConceptIdentifier("testChart", "1.0.0"));
- ChartInfo result = chartStore.saveChart(charts.get(0), mockChartFile, mockOverrideFile);
+ var result = chartStore.saveChart(charts.get(0), mockChartFile, mockOverrideFile);
assertThat(result.getChartId().getName()).isEqualTo("testChart");
assertThat(chartStore.getLocalChartMap()).hasSize(1);
@@ -121,7 +121,7 @@ class ChartStoreTest {
assertNull(chartStore.getChart(charts.get(0).getChartId().getName(), charts.get(0).getChartId().getVersion()));
chartStore.getLocalChartMap().put(charts.get(0).getChartId().getName() + "_" + charts.get(0).getChartId()
.getVersion(), charts.get(0));
- ChartInfo chart = chartStore.getChart(charts.get(0).getChartId().getName(),
+ var chart = chartStore.getChart(charts.get(0).getChartId().getName(),
charts.get(0).getChartId().getVersion());
assertThat(chart.getChartId().getName()).isEqualTo(charts.get(0).getChartId().getName());
}
@@ -131,13 +131,13 @@ class ChartStoreTest {
// When the chart store is empty before adding any charts
assertThat(chartStore.getAllCharts()).isEmpty();
- for (ChartInfo chart : charts) {
+ for (var chart : charts) {
chartStore.getLocalChartMap().put(chart.getChartId().getName() + "_" + chart.getChartId().getVersion(),
chart);
}
- List<ChartInfo> retrievedChartList = chartStore.getAllCharts();
- assertThat(retrievedChartList).isNotEmpty();
- assertThat(retrievedChartList).hasSameSizeAs(charts);
+ var retrievedChartList = chartStore.getAllCharts();
+ assertThat(retrievedChartList).isNotEmpty()
+ .hasSameSizeAs(charts);
}
@Test
@@ -151,7 +151,7 @@ class ChartStoreTest {
@Test
void test_getAppPath() {
- Path path = chartStore.getAppPath(charts.get(0).getChartId());
+ var path = chartStore.getAppPath(charts.get(0).getChartId());
assertNotNull(path);
assertThat(path.toString()).endsWith(charts.get(0).getChartId().getVersion());
assertThat(path.toString()).startsWith("target");
@@ -159,16 +159,16 @@ class ChartStoreTest {
@Test
void test_chartSoreInstantiationWithExistingChartFiles() throws IOException, ServiceException {
- MockMultipartFile mockChartFile = new MockMultipartFile("HelmChartFile", "dummyData".getBytes());
- MockMultipartFile mockOverrideFile = new MockMultipartFile("overrideFile.yaml", "dummyData".getBytes());
- ChartInfo testChart = charts.get(0);
+ var mockChartFile = new MockMultipartFile("HelmChartFile", "dummyData".getBytes());
+ var mockOverrideFile = new MockMultipartFile("overrideFile.yaml", "dummyData".getBytes());
+ var testChart = charts.get(0);
testChart.setChartId(new ToscaConceptIdentifier("dummyChart", "1.0.0"));
//Creating a dummy chart in local dir.
chartStore.saveChart(charts.get(0), mockChartFile, mockOverrideFile);
//Instantiating a new chartStore object with pre available chart in local.
- ChartStore chartStore2 = new ChartStore(parameters);
+ var chartStore2 = new ChartStore(parameters);
assertThat(chartStore2.getLocalChartMap()).hasSize(1).containsKey("dummyChart_" + charts.get(0).getChartId()
.getVersion());
}
diff --git a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/acm/participant/policy/client/AbstractHttpClient.java b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/acm/participant/policy/client/AbstractHttpClient.java
index f0e0d65bb..6429d062e 100755
--- a/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/acm/participant/policy/client/AbstractHttpClient.java
+++ b/participant/participant-impl/participant-impl-policy/src/main/java/org/onap/policy/clamp/acm/participant/policy/client/AbstractHttpClient.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021,2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;
-import java.io.Closeable;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
@@ -36,7 +35,7 @@ import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class AbstractHttpClient implements Closeable {
+public abstract class AbstractHttpClient implements AutoCloseable {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractHttpClient.class);
private final HttpClient httpclient;