diff options
Diffstat (limited to 'src')
10 files changed, 26 insertions, 69 deletions
diff --git a/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java b/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java index 6aa180b..ecaff91 100644 --- a/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java +++ b/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java @@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Priority; import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.HttpMethod; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.PreMatching; @@ -86,11 +87,13 @@ public class RequestTransactionLogging extends AAIContainerFilter implements Con String contentType = headersMap.getFirst(CONTENT_TYPE); String acceptType = headersMap.getFirst(ACCEPT); - if(contentType == null || contentType.contains(TEXT_PLAIN)){ + if(contentType == null && !requestContext.getMethod().equals(HttpMethod.GET.toString())){ + LOGGER.debug("Content Type header missing in the request, adding one of [{}]", DEFAULT_CONTENT_TYPE); requestContext.getHeaders().putSingle(CONTENT_TYPE, DEFAULT_CONTENT_TYPE); } - if(acceptType == null || acceptType.contains(TEXT_PLAIN)){ + if(acceptType == null){ + LOGGER.debug("Accept header missing in the request, adding one of [{}]", DEFAULT_RESPONSE_TYPE); requestContext.getHeaders().putSingle(ACCEPT, DEFAULT_RESPONSE_TYPE); } } diff --git a/src/main/java/org/onap/aai/rest/util/EchoResponse.java b/src/main/java/org/onap/aai/rest/util/EchoResponse.java index 05ff38e..91841df 100644 --- a/src/main/java/org/onap/aai/rest/util/EchoResponse.java +++ b/src/main/java/org/onap/aai/rest/util/EchoResponse.java @@ -94,7 +94,7 @@ public class EchoResponse extends RESTAPI { response = Response.status(Status.OK) .entity(ErrorLogHelper.getRESTAPIInfoResponse( - headers.getAcceptableMediaTypes(), exceptionList)) + new ArrayList<>(headers.getAcceptableMediaTypes()), exceptionList)) .build(); } catch (Exception e) { @@ -106,7 +106,7 @@ public class EchoResponse extends RESTAPI { response = Response .status(Status.INTERNAL_SERVER_ERROR) .entity(ErrorLogHelper.getRESTAPIErrorResponse( - headers.getAcceptableMediaTypes(), ex, + new ArrayList<>(headers.getAcceptableMediaTypes()), ex, templateVars)).build(); } finally { diff --git a/src/test/java/org/onap/aai/MetricsConfigurationTest.java b/src/test/java/org/onap/aai/MetricsConfigurationTest.java index d0c0ce4..68b2ca8 100644 --- a/src/test/java/org/onap/aai/MetricsConfigurationTest.java +++ b/src/test/java/org/onap/aai/MetricsConfigurationTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue; import java.io.UnsupportedEncodingException; +import java.util.Arrays; import java.util.Base64; import java.util.Collections; import org.junit.Before; @@ -37,6 +38,7 @@ import org.onap.aai.exceptions.AAIException; import org.onap.aai.restclient.PropertyPasswordConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.web.server.LocalManagementPort; +import org.springframework.boot.test.autoconfigure.actuate.metrics.AutoConfigureMetrics; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.web.server.LocalServerPort; @@ -51,6 +53,7 @@ import org.springframework.web.client.RestTemplate; /** * Test management endpoints against configuration resource. */ +@AutoConfigureMetrics @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = {SpringContextAware.class, GraphAdminApp.class}) @ContextConfiguration(initializers = PropertyPasswordConfiguration.class, classes = {SpringContextAware.class}) @@ -91,14 +94,12 @@ public class MetricsConfigurationTest { headers = new HttpHeaders(); - headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON)); - headers.setContentType(MediaType.APPLICATION_JSON); + headers.setAccept(Arrays.asList(MediaType.TEXT_PLAIN)); headers.add("Real-Time", "true"); headers.add("X-FromAppId", "JUNIT"); headers.add("X-TransactionId", "JUNIT"); - String authorization = Base64.getEncoder().encodeToString("AAI:AAI".getBytes("UTF-8")); - headers.add("Authorization", "Basic " + authorization); + headers.setBasicAuth("AAI","AAI"); httpEntity = new HttpEntity<String>(headers); baseUrl = "http://localhost:" + randomPort; @@ -108,15 +109,16 @@ public class MetricsConfigurationTest { @Test public void testManagementEndpointConfiguration() { - ResponseEntity responseEntity = null; + ResponseEntity<String> responseEntity = null; String responseBody = null; //set Accept as text/plain in order to get access of endpoint "/actuator/prometheus" headers.set("Accept", "text/plain"); + headers.setAccept(Arrays.asList(MediaType.TEXT_PLAIN)); httpEntity = new HttpEntity<String>(headers); responseEntity = restTemplate.exchange(actuatorUrl + "/actuator/prometheus", HttpMethod.GET, httpEntity, String.class); - responseBody = (String) responseEntity.getBody(); + responseBody = responseEntity.getBody(); assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); //Set Accept as MediaType.APPLICATION_JSON in order to get access of endpoint "/actuator/info" and "/actuator/health" @@ -124,7 +126,7 @@ public class MetricsConfigurationTest { httpEntity = new HttpEntity<String>(headers); responseEntity = restTemplate.exchange(actuatorUrl + "/actuator/info", HttpMethod.GET, httpEntity, String.class); - responseBody = (String) responseEntity.getBody(); + responseBody = responseEntity.getBody(); assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); responseEntity = diff --git a/src/test/java/org/onap/aai/audit/AuditGraphson2SqlTest.java b/src/test/java/org/onap/aai/audit/AuditGraphson2SqlTest.java index 2bc6250..aa8236e 100644 --- a/src/test/java/org/onap/aai/audit/AuditGraphson2SqlTest.java +++ b/src/test/java/org/onap/aai/audit/AuditGraphson2SqlTest.java @@ -22,22 +22,18 @@ package org.onap.aai.audit; import com.google.gson.JsonObject; import org.junit.Before; -import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; -import org.junit.runners.MethodSorters; import org.mockito.Mock; -import static org.mockito.Matchers.*; -import static org.mockito.Mockito.mock; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.when; import org.onap.aai.AAISetup; import org.onap.aai.edges.EdgeIngestor; import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException; -import org.onap.aai.exceptions.AAIException; import org.onap.aai.rest.client.ApertureService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.TestPropertySource; import java.io.IOException; import java.util.HashMap; diff --git a/src/test/java/org/onap/aai/datasnapshot/DataSnapshot4HistInitTest.java b/src/test/java/org/onap/aai/datasnapshot/DataSnapshot4HistInitTest.java index c297f78..d3fbec7 100644 --- a/src/test/java/org/onap/aai/datasnapshot/DataSnapshot4HistInitTest.java +++ b/src/test/java/org/onap/aai/datasnapshot/DataSnapshot4HistInitTest.java @@ -35,7 +35,8 @@ import org.junit.Test; import org.onap.aai.AAISetup; import org.onap.aai.dbmap.AAIGraph; import org.onap.aai.exceptions.AAIException; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; + import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -66,7 +67,7 @@ public class DataSnapshot4HistInitTest extends AAISetup { private DataSnapshot4HistInit dataSnapshot4HistInit; @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Before public void setup() throws AAIException { diff --git a/src/test/java/org/onap/aai/datasnapshot/DataSnapshotTest.java b/src/test/java/org/onap/aai/datasnapshot/DataSnapshotTest.java index 7f511e6..9d74651 100644 --- a/src/test/java/org/onap/aai/datasnapshot/DataSnapshotTest.java +++ b/src/test/java/org/onap/aai/datasnapshot/DataSnapshotTest.java @@ -33,14 +33,8 @@ import org.junit.Test; import org.onap.aai.AAISetup; import org.onap.aai.dbmap.AAIGraph; import org.onap.aai.exceptions.AAIException; -import org.onap.aai.util.AAIConstants; -import org.onap.aai.util.FormatDate; -import org.onap.aai.util.GraphAdminDBUtils; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; -import com.beust.jcommander.ParameterException; - -import java.lang.NumberFormatException; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -66,7 +60,7 @@ public class DataSnapshotTest extends AAISetup { private static final int DELAYSINGLETHREADTEST = 90; @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Before public void setup() throws AAIException { diff --git a/src/test/java/org/onap/aai/datasnapshot/DataSnapshotTest4HistInit.java b/src/test/java/org/onap/aai/datasnapshot/DataSnapshotTest4HistInit.java index adcde4e..893a197 100644 --- a/src/test/java/org/onap/aai/datasnapshot/DataSnapshotTest4HistInit.java +++ b/src/test/java/org/onap/aai/datasnapshot/DataSnapshotTest4HistInit.java @@ -37,13 +37,8 @@ import org.onap.aai.datagrooming.DataGrooming; import org.onap.aai.dbmap.AAIGraph; import org.onap.aai.exceptions.AAIException; -import org.onap.aai.logging.LogFormatTools; -import org.onap.aai.util.AAISystemExitUtil; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; -import com.beust.jcommander.ParameterException; - -import java.lang.NumberFormatException; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -73,7 +68,7 @@ public class DataSnapshotTest4HistInit extends AAISetup { private DataSnapshot4HistInit dataSnapshot4HistInit; @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Before public void setup() throws AAIException { diff --git a/src/test/java/org/onap/aai/dbgen/schemamod/SchemaMod4HistTest.java b/src/test/java/org/onap/aai/dbgen/schemamod/SchemaMod4HistTest.java index 8c79cc1..b6d12cd 100644 --- a/src/test/java/org/onap/aai/dbgen/schemamod/SchemaMod4HistTest.java +++ b/src/test/java/org/onap/aai/dbgen/schemamod/SchemaMod4HistTest.java @@ -23,32 +23,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.janusgraph.core.JanusGraphTransaction; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; -import org.apache.tinkerpop.gremlin.structure.Edge; -import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.After; import org.junit.Before; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.mockito.Mock; -import org.mockito.Mockito; import org.onap.aai.AAISetup; import org.onap.aai.dbmap.AAIGraph; import org.onap.aai.exceptions.AAIException; -import org.onap.aai.introspection.LoaderFactory; -import org.onap.aai.setup.SchemaVersions; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import static org.mockito.Mockito.when; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.*; @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/src/test/java/org/onap/aai/dbgen/schemamod/SchemaModTest.java b/src/test/java/org/onap/aai/dbgen/schemamod/SchemaModTest.java index caccccf..e66cca3 100644 --- a/src/test/java/org/onap/aai/dbgen/schemamod/SchemaModTest.java +++ b/src/test/java/org/onap/aai/dbgen/schemamod/SchemaModTest.java @@ -23,32 +23,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.janusgraph.core.JanusGraphTransaction; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; -import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.junit.After; import org.junit.Before; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.mockito.Mock; -import org.mockito.Mockito; import org.onap.aai.AAISetup; import org.onap.aai.dbmap.AAIGraph; import org.onap.aai.exceptions.AAIException; -import org.onap.aai.introspection.LoaderFactory; -import org.onap.aai.setup.SchemaVersions; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import static org.mockito.Mockito.when; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.*; @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/src/test/java/org/onap/aai/migration/v20/MigrateL2DefaultToFalseTest.java b/src/test/java/org/onap/aai/migration/v20/MigrateL2DefaultToFalseTest.java index cba5c45..94413f8 100644 --- a/src/test/java/org/onap/aai/migration/v20/MigrateL2DefaultToFalseTest.java +++ b/src/test/java/org/onap/aai/migration/v20/MigrateL2DefaultToFalseTest.java @@ -33,7 +33,7 @@ import org.onap.aai.serialization.engines.QueryStyle; import org.onap.aai.serialization.engines.TransactionalGraphEngine; import org.onap.aai.setup.SchemaVersions; -import edu.emory.mathcs.backport.java.util.Arrays; +import java.util.Arrays; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.spy; |