<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<relativePath>../aai-parent/pom.xml</relativePath>
</parent>
<artifactId>aai-annotations</artifactId>
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<relativePath>../aai-parent/pom.xml</relativePath>
</parent>
<artifactId>aai-auth</artifactId>
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<relativePath>../aai-parent/pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<relativePath>../aai-parent/pom.xml</relativePath>
</parent>
<artifactId>aai-core</artifactId>
<properties>
<springframework.version>4.3.24.RELEASE</springframework.version>
- <!-- <httpclient.version>4.5.5</httpclient.version> <jackson.version>2.2.3</jackson.version>
- <eelf.core.version>1.0.1-oss</eelf.core.version> <logback.version>1.2.3</logback.version>
- <freemarker.version>2.3.21</freemarker.version> -->
-
<jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit>
<gremlin.version>3.2.2</gremlin.version>
<groovy.version>2.4.15</groovy.version>
- <!-- <jetty.version>9.4.11.v20180605</jetty.version> -->
<!-- Start of Default ONAP Schema Properties -->
<aai.wiki.link>https://wiki.onap.org/</aai.wiki.link>
<gendoc.version>v15</gendoc.version>
<dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
+ <exclusions><!-- excluding transitive dependency coming from this artifact, as we would need powermock-api-mockito2-->
+ <exclusion>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
MultivaluedMap<String, String> result = new MultivaluedHashMap<>();
String queryParams = uri.getRawQuery();
if (queryParams != null) {
- try {
- String[] sections = queryParams.split("&");
- String[] query = null;
- String key, value = "";
- for (String section : sections) {
- query = section.split("=");
- key = UriUtils.decode(query[0], "UTF-8");
- if (query[1] != null) {
- query[1] = query[1].replaceAll("\\+", "%20");
- }
- value = UriUtils.decode(query[1], "UTF-8");
- if (result.containsKey(key)) {
- result.add(key, value);
- } else {
- result.putSingle(key, value);
- }
+ String[] sections = queryParams.split("&");
+ String[] query = null;
+ String key, value = "";
+ for (String section : sections) {
+ query = section.split("=");
+ key = UriUtils.decode(query[0], "UTF-8");
+ if (query[1] != null) {
+ query[1] = query[1].replaceAll("\\+", "%20");
}
- } catch (UnsupportedEncodingException e) {
-
- }
+ value = UriUtils.decode(query[1], "UTF-8");
+ if (result.containsKey(key)) {
+ result.add(key, value);
+ } else {
+ result.putSingle(key, value);
+ }
+ }
}
return result;
public static void mockPathed(UrlBuilder mock) throws AAIFormatVertexException {
Answer<String> answer = new Answer<String>() {
public String answer(InvocationOnMock invocation) throws Throwable {
- Vertex v = invocation.getArgumentAt(0, Vertex.class);
+ Vertex v = invocation.getArgument(0);
return v.<String>property(AAIProperties.AAI_URI).orElse("urimissing");
}
public void testOnChange() throws Exception {
FileWatcher fileWatcher = Mockito.mock(FileWatcher.class, Mockito.CALLS_REAL_METHODS);
- fileWatcher.onChange(Mockito.any(File.class));
+ File file=Mockito.mock(File.class);
+ fileWatcher.onChange(file);
+
+ Mockito.verify(fileWatcher).onChange(file);
- Mockito.verify(fileWatcher).onChange(Mockito.any(File.class));
}
}
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>aai-parent</artifactId>
<name>aai-parent</name>
<plexus.utils.version>3.1.1</plexus.utils.version>
<reflections.version>0.9.10</reflections.version>
<snakeyaml.version>1.25</snakeyaml.version>
+
<spring.boot.version>1.5.22.RELEASE</spring.boot.version>
<sonar.jacoco.reportPath />
<!-- we let things pass by default, set custom level for each child project -->
<jacoco.line.coverage.limit>0.00</jacoco.line.coverage.limit>
+
<jacoco.version>0.8.5</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<spring.jms.version>4.3.25.RELEASE</spring.jms.version>
<spring.test.version>4.3.25.RELEASE</spring.test.version>
<spring.security.rsa.version>1.0.8.RELEASE</spring.security.rsa.version>
+ <json.simple.version>1.1.1</json.simple.version>
+ <powermock.api.mockito2.version>2.0.4</powermock.api.mockito2.version>
</properties>
+
+ <profiles>
+ <profile>
+ <id>spring-boot-2-1</id>
+ <properties>
+ <spring.boot.version>2.1.6.RELEASE</spring.boot.version>
+ </properties>
+ </profile>
+ </profiles>
+
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>${json.simple.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-schema-ingest</artifactId>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>${powermock.version}</version>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>${powermock.api.mockito2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>${powermock.api.mockito2.version}</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<relativePath>../aai-parent/pom.xml</relativePath>
</parent>
<artifactId>aai-rest</artifactId>
public void init() throws Exception {
HttpClient client = HttpClients.createDefault();
restTemplate =
- new RestTemplateBuilder().requestFactory(new HttpComponentsClientHttpRequestFactory(client)).build();
+ new RestTemplateBuilder().requestFactory(() -> new HttpComponentsClientHttpRequestFactory(client)).build();
restTemplate.setErrorHandler(new RestClientResponseErrorHandler());
}
HttpClients.custom().setSSLContext(sslContext).setSSLHostnameVerifier((s, sslSession) -> true).build();
restTemplate =
- new RestTemplateBuilder().requestFactory(new HttpComponentsClientHttpRequestFactory(client)).build();
+ new RestTemplateBuilder().requestFactory(() -> new HttpComponentsClientHttpRequestFactory(client)).build();
restTemplate.setErrorHandler(new RestClientResponseErrorHandler());
HttpClients.custom().setSSLContext(sslContext).setSSLHostnameVerifier((s, sslSession) -> true).build();
restTemplate =
- new RestTemplateBuilder().requestFactory(new HttpComponentsClientHttpRequestFactory(client)).build();
+ new RestTemplateBuilder().requestFactory(() -> new HttpComponentsClientHttpRequestFactory(client)).build();
restTemplate.setErrorHandler(new RestClientResponseErrorHandler());
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<relativePath>../aai-parent/pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<relativePath>../aai-parent/pom.xml</relativePath>
</parent>
<artifactId>aai-schema-ingest</artifactId>
return schemaVersionsBean().getSchemaVersions();
}
- @Bean(name = "schemaVersions")
+ @Bean(name = "schemaVersions2")
public SchemaVersions schemaVersions() {
return schemaServiceVersions();
}
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:forWiringTests/testUsingPropFileContext.xml"})
+@TestPropertySource(locations="classpath:forWiringTests/schema-ingest-for-xml-test.properties")
public class SchemaLocationsBeanXMLSetterWithPropFileTest {
@Autowired
SchemaLocationsBean bean;
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<relativePath>../aai-parent/pom.xml</relativePath>
</parent>
<artifactId>aai-utils</artifactId>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.6.5-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>aai-aai-common</name>
<description>Contains all of the common code for resources and traversal repos</description>
major_version=1
minor_version=6
-patch_version=5
+patch_version=6
base_version=${major_version}.${minor_version}.${patch_version}