From d859da901dfd362b13881e443c5bc86c38cefe09 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Fri, 29 Sep 2017 12:10:40 +0200 Subject: Fix the SO build issues Fix the AAI java package names that was still openecomp, remove the variable for LF repositories due to Oparent, Fix the jacoco to overwrite the oparent settings (fix test coverage) Change-Id: I40b9b326e33ff27992a1bf2cc9d3094d338f8828 Issue-ID: SO-168 Signed-off-by: Determe, Sebastien (sd378r) --- .../src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java | 6 +++--- .../main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java | 8 ++++---- .../main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'bpmn/MSOCommonBPMN/src/main') diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java index 725a289be0..ca815cf904 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClient.java @@ -23,9 +23,9 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.List; -import org.openecomp.aai.domain.yang.GenericVnf; -import org.openecomp.aai.domain.yang.Pserver; -import org.openecomp.aai.domain.yang.Pservers; +import org.onap.aai.domain.yang.GenericVnf; +import org.onap.aai.domain.yang.Pserver; +import org.onap.aai.domain.yang.Pservers; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java index 6b7b1692b2..c58f22f949 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIRestClientImpl.java @@ -35,10 +35,10 @@ import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; -import org.openecomp.aai.domain.yang.GenericVnf; -import org.openecomp.aai.domain.yang.GenericVnfs; -import org.openecomp.aai.domain.yang.Pserver; -import org.openecomp.aai.domain.yang.Pservers; +import org.onap.aai.domain.yang.GenericVnf; +import org.onap.aai.domain.yang.GenericVnfs; +import org.onap.aai.domain.yang.Pserver; +import org.onap.aai.domain.yang.Pservers; import org.openecomp.mso.bpmn.core.PropertyConfiguration; import org.openecomp.mso.client.aai.entities.CustomQuery; import org.openecomp.mso.client.aai.entities.Results; diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java index 724b2d378a..ce248f010c 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/aai/AAIValidatorImpl.java @@ -23,8 +23,8 @@ package org.openecomp.mso.client.aai; import java.io.IOException; import java.util.List; -import org.openecomp.aai.domain.yang.GenericVnf; -import org.openecomp.aai.domain.yang.Pserver; +import org.onap.aai.domain.yang.GenericVnf; +import org.onap.aai.domain.yang.Pserver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -- cgit 1.2.3-korg