diff options
-rw-r--r-- | pom.xml | 2 | ||||
-rw-r--r-- | src/main/java/io/swagger/api/Bootstrap.java | 2 | ||||
-rw-r--r-- | src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java | 4 | ||||
-rw-r--r-- | src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java | 12 | ||||
-rw-r--r-- | src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java | 22 | ||||
-rw-r--r-- | src/main/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImpl.java | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/InventoryApplication.java (renamed from src/main/java/org/openecomp/dcae/inventory/InventoryApplication.java) | 20 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/InventoryConfiguration.java (renamed from src/main/java/org/openecomp/dcae/inventory/InventoryConfiguration.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/LinkSerializer.java (renamed from src/main/java/org/openecomp/dcae/inventory/LinkSerializer.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java (renamed from src/main/java/org/openecomp/dcae/inventory/clients/DCAEControllerClient.java) | 10 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/clients/DatabusControllerClient.java (renamed from src/main/java/org/openecomp/dcae/inventory/clients/DatabusControllerClient.java) | 6 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/daos/DCAEServiceComponentsDAO.java (renamed from src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceComponentsDAO.java) | 6 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/daos/DCAEServiceTransactionDAO.java (renamed from src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTransactionDAO.java) | 6 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/daos/DCAEServiceTypesDAO.java (renamed from src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTypesDAO.java) | 6 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/daos/DCAEServicesComponentsMapsDAO.java (renamed from src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesComponentsMapsDAO.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/daos/DCAEServicesDAO.java (renamed from src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesDAO.java) | 6 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/daos/InventoryDAO.java (renamed from src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAO.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java (renamed from src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAOManager.java) | 6 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/dbthings/StringListArgument.java (renamed from src/main/java/org/openecomp/dcae/inventory/dbthings/StringListArgument.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapper.java (renamed from src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapper.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapper.java (renamed from src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapper.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java (renamed from src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObject.java (renamed from src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObject.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObject.java (renamed from src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObject.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java (renamed from src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerClientException.java (renamed from src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerClientException.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerConnectionException.java (renamed from src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerConnectionException.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerTimeoutException.java (renamed from src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerTimeoutException.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/exceptions/DatabusControllerClientException.java (renamed from src/main/java/org/openecomp/dcae/inventory/exceptions/DatabusControllerClientException.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/exceptions/mappers/DBIExceptionMapper.java (renamed from src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DBIExceptionMapper.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java (renamed from src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java (renamed from src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java) | 2 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java (renamed from src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java) | 4 | ||||
-rw-r--r-- | src/main/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapper.java (renamed from src/main/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapper.java) | 2 | ||||
-rw-r--r-- | src/test/java/DcaeServiceTypesApiServiceImplTests.java | 10 | ||||
-rw-r--r-- | src/test/java/DcaeServicesApiServiceImplTests.java | 25 | ||||
-rw-r--r-- | src/test/java/DcaeServicesGroupbyApiServiceImplTests.java | 6 | ||||
-rw-r--r-- | src/test/java/org/onap/dcae/inventory/daos/InventoryDAOManagerTests.java (renamed from src/test/java/org/openecomp/dcae/inventory/daos/InventoryDAOManagerTests.java) | 4 | ||||
-rw-r--r-- | src/test/java/org/onap/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java (renamed from src/test/java/org/openecomp/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java) | 10 | ||||
-rw-r--r-- | src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java (renamed from src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java) | 2 | ||||
-rw-r--r-- | src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java (renamed from src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java) | 2 | ||||
-rw-r--r-- | src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java (renamed from src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java) | 5 | ||||
-rw-r--r-- | src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java (renamed from src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java) | 2 | ||||
-rw-r--r-- | src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java (renamed from src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java) | 2 | ||||
-rw-r--r-- | src/test/java/org/onap/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java (renamed from src/test/java/org/openecomp/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java) | 6 | ||||
-rw-r--r-- | src/test/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapperTests.java (renamed from src/test/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapperTests.java) | 2 |
46 files changed, 113 insertions, 127 deletions
@@ -258,7 +258,7 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> <!-- add Main-Class to manifest file --> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.openecomp.dcae.inventory.InventoryApplication</mainClass> + <mainClass>org.onap.dcae.inventory.InventoryApplication</mainClass> </transformer> </transformers> </configuration> diff --git a/src/main/java/io/swagger/api/Bootstrap.java b/src/main/java/io/swagger/api/Bootstrap.java index 5050ed3..2d71ecb 100644 --- a/src/main/java/io/swagger/api/Bootstrap.java +++ b/src/main/java/io/swagger/api/Bootstrap.java @@ -38,7 +38,7 @@ public class Bootstrap extends HttpServlet { .description("DCAE Inventory is a web service that provides the following:\n\n1. Real-time data on all DCAE services and their components\n2. Comprehensive details on available DCAE service types\n") .termsOfService("") .contact(new Contact() - .email("dcae@lists.openecomp.org")) + .email("dcae@lists.onap.org")) .license(new License() .name("") .url("")); diff --git a/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java b/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java index 3c47b84..2fda7e7 100644 --- a/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java +++ b/src/main/java/io/swagger/api/factories/DcaeServicesApiServiceFactory.java @@ -20,8 +20,8 @@ package io.swagger.api.factories; -import org.openecomp.dcae.inventory.clients.DCAEControllerClient; -import org.openecomp.dcae.inventory.clients.DatabusControllerClient; +import org.onap.dcae.inventory.clients.DCAEControllerClient; +import org.onap.dcae.inventory.clients.DatabusControllerClient; import io.swagger.api.DcaeServicesApiService; import io.swagger.api.impl.DcaeServicesApiServiceImpl; diff --git a/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java index e12b6fc..696cd87 100644 --- a/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java +++ b/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java @@ -20,12 +20,12 @@ package io.swagger.api.impl; -import org.openecomp.dcae.inventory.daos.DCAEServiceTypesDAO; -import org.openecomp.dcae.inventory.daos.DCAEServicesDAO; -import org.openecomp.dcae.inventory.daos.InventoryDAOManager; -import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceTypeObjectMapper; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceTypeObject; +import org.onap.dcae.inventory.daos.DCAEServiceTypesDAO; +import org.onap.dcae.inventory.daos.DCAEServicesDAO; +import org.onap.dcae.inventory.daos.InventoryDAOManager; +import org.onap.dcae.inventory.dbthings.mappers.DCAEServiceTypeObjectMapper; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceTypeObject; import io.swagger.api.*; import io.swagger.model.*; diff --git a/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java index d311303..bc1888f 100644 --- a/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java +++ b/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java @@ -20,17 +20,17 @@ package io.swagger.api.impl; -import org.openecomp.dcae.inventory.clients.DCAEControllerClient; -import org.openecomp.dcae.inventory.clients.DatabusControllerClient; -import org.openecomp.dcae.inventory.daos.DCAEServiceComponentsDAO; -import org.openecomp.dcae.inventory.daos.DCAEServiceTransactionDAO; -import org.openecomp.dcae.inventory.daos.DCAEServicesDAO; -import org.openecomp.dcae.inventory.daos.InventoryDAOManager; -import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; -import org.openecomp.dcae.inventory.exceptions.DCAEControllerClientException; -import org.openecomp.dcae.inventory.exceptions.DatabusControllerClientException; +import org.onap.dcae.inventory.clients.DCAEControllerClient; +import org.onap.dcae.inventory.clients.DatabusControllerClient; +import org.onap.dcae.inventory.daos.DCAEServiceComponentsDAO; +import org.onap.dcae.inventory.daos.DCAEServiceTransactionDAO; +import org.onap.dcae.inventory.daos.DCAEServicesDAO; +import org.onap.dcae.inventory.daos.InventoryDAOManager; +import org.onap.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.onap.dcae.inventory.exceptions.DCAEControllerClientException; +import org.onap.dcae.inventory.exceptions.DatabusControllerClientException; import io.swagger.api.*; import io.swagger.model.*; diff --git a/src/main/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImpl.java index 09d3143..7c4e406 100644 --- a/src/main/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImpl.java +++ b/src/main/java/io/swagger/api/impl/DcaeServicesGroupbyApiServiceImpl.java @@ -20,8 +20,8 @@ package io.swagger.api.impl; -import org.openecomp.dcae.inventory.daos.InventoryDAOManager; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.onap.dcae.inventory.daos.InventoryDAOManager; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; import io.swagger.api.*; import io.swagger.model.DCAEServiceGroupByResults; import io.swagger.model.DCAEServiceGroupByResultsPropertyValues; diff --git a/src/main/java/org/openecomp/dcae/inventory/InventoryApplication.java b/src/main/java/org/onap/dcae/inventory/InventoryApplication.java index 9e78506..939cfdd 100644 --- a/src/main/java/org/openecomp/dcae/inventory/InventoryApplication.java +++ b/src/main/java/org/onap/dcae/inventory/InventoryApplication.java @@ -18,22 +18,20 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory; +package org.onap.dcae.inventory; import com.fasterxml.jackson.databind.ObjectMapper; -import io.dropwizard.cli.Cli; import io.dropwizard.configuration.ConfigurationFactory; import io.dropwizard.configuration.ConfigurationFactoryFactory; import io.dropwizard.configuration.JsonConfigurationFactory; import io.dropwizard.configuration.UrlConfigurationSourceProvider; -import io.dropwizard.util.JarLocation; -import org.openecomp.dcae.inventory.clients.DCAEControllerClient; -import org.openecomp.dcae.inventory.clients.DatabusControllerClient; -import org.openecomp.dcae.inventory.daos.InventoryDAOManager; -import org.openecomp.dcae.inventory.exceptions.mappers.DBIExceptionMapper; -import org.openecomp.dcae.inventory.exceptions.mappers.DCAEControllerConnectionExceptionMapper; -import org.openecomp.dcae.inventory.exceptions.mappers.DCAEControllerTimeoutExceptionMapper; -import org.openecomp.dcae.inventory.providers.NotFoundExceptionMapper; +import org.onap.dcae.inventory.clients.DCAEControllerClient; +import org.onap.dcae.inventory.clients.DatabusControllerClient; +import org.onap.dcae.inventory.exceptions.mappers.DBIExceptionMapper; +import org.onap.dcae.inventory.exceptions.mappers.DCAEControllerConnectionExceptionMapper; +import org.onap.dcae.inventory.exceptions.mappers.DCAEControllerTimeoutExceptionMapper; +import org.onap.dcae.inventory.providers.NotFoundExceptionMapper; +import org.onap.dcae.inventory.daos.InventoryDAOManager; import com.fasterxml.jackson.databind.module.SimpleModule; import io.dropwizard.Application; import io.dropwizard.client.JerseyClientBuilder; @@ -110,7 +108,7 @@ public class InventoryApplication extends Application<InventoryConfiguration> { // correctly. Info info = new Info().title("DCAE Inventory API").version("0.8.0") .description("DCAE Inventory is a web service that provides the following:\n\n1. Real-time data on all DCAE services and their components\n2. Comprehensive details on available DCAE service types\n") - .contact(new Contact().email("dcae@lists.openecomp.org")); + .contact(new Contact().email("dcae@lists.onap.org")); // Swagger/servlet/jax-rs magic! BeanConfig beanConfig = new BeanConfig(); beanConfig.setInfo(info); diff --git a/src/main/java/org/openecomp/dcae/inventory/InventoryConfiguration.java b/src/main/java/org/onap/dcae/inventory/InventoryConfiguration.java index 55bcca2..0dacb26 100644 --- a/src/main/java/org/openecomp/dcae/inventory/InventoryConfiguration.java +++ b/src/main/java/org/onap/dcae/inventory/InventoryConfiguration.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory; +package org.onap.dcae.inventory; import com.fasterxml.jackson.annotation.JsonProperty; import io.dropwizard.Configuration; diff --git a/src/main/java/org/openecomp/dcae/inventory/LinkSerializer.java b/src/main/java/org/onap/dcae/inventory/LinkSerializer.java index b83697f..ad5c6f3 100644 --- a/src/main/java/org/openecomp/dcae/inventory/LinkSerializer.java +++ b/src/main/java/org/onap/dcae/inventory/LinkSerializer.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory; +package org.onap.dcae.inventory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/org/openecomp/dcae/inventory/clients/DCAEControllerClient.java b/src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java index adbe8b7..a97aa9e 100644 --- a/src/main/java/org/openecomp/dcae/inventory/clients/DCAEControllerClient.java +++ b/src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java @@ -18,12 +18,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.clients; +package org.onap.dcae.inventory.clients; -import org.openecomp.dcae.inventory.InventoryConfiguration; -import org.openecomp.dcae.inventory.exceptions.DCAEControllerClientException; -import org.openecomp.dcae.inventory.exceptions.DCAEControllerConnectionException; -import org.openecomp.dcae.inventory.exceptions.DCAEControllerTimeoutException; +import org.onap.dcae.inventory.InventoryConfiguration; +import org.onap.dcae.inventory.exceptions.DCAEControllerClientException; +import org.onap.dcae.inventory.exceptions.DCAEControllerConnectionException; +import org.onap.dcae.inventory.exceptions.DCAEControllerTimeoutException; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/openecomp/dcae/inventory/clients/DatabusControllerClient.java b/src/main/java/org/onap/dcae/inventory/clients/DatabusControllerClient.java index 9df11d5..29330b0 100644 --- a/src/main/java/org/openecomp/dcae/inventory/clients/DatabusControllerClient.java +++ b/src/main/java/org/onap/dcae/inventory/clients/DatabusControllerClient.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.clients; +package org.onap.dcae.inventory.clients; -import org.openecomp.dcae.inventory.InventoryConfiguration; -import org.openecomp.dcae.inventory.exceptions.DatabusControllerClientException; +import org.onap.dcae.inventory.InventoryConfiguration; +import org.onap.dcae.inventory.exceptions.DatabusControllerClientException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceComponentsDAO.java b/src/main/java/org/onap/dcae/inventory/daos/DCAEServiceComponentsDAO.java index 9a674c9..a2d70d0 100644 --- a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceComponentsDAO.java +++ b/src/main/java/org/onap/dcae/inventory/daos/DCAEServiceComponentsDAO.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.daos; +package org.onap.dcae.inventory.daos; -import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceComponentObjectMapper; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.onap.dcae.inventory.dbthings.mappers.DCAEServiceComponentObjectMapper; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceComponentObject; import org.skife.jdbi.v2.sqlobject.Bind; import org.skife.jdbi.v2.sqlobject.BindBean; import org.skife.jdbi.v2.sqlobject.SqlQuery; diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTransactionDAO.java b/src/main/java/org/onap/dcae/inventory/daos/DCAEServiceTransactionDAO.java index c9d6dc8..cc7c88b 100644 --- a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTransactionDAO.java +++ b/src/main/java/org/onap/dcae/inventory/daos/DCAEServiceTransactionDAO.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.daos; +package org.onap.dcae.inventory.daos; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; import org.joda.time.DateTime; import org.skife.jdbi.v2.sqlobject.CreateSqlObject; import org.skife.jdbi.v2.sqlobject.Transaction; diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTypesDAO.java b/src/main/java/org/onap/dcae/inventory/daos/DCAEServiceTypesDAO.java index 50b79b2..bdb6298 100644 --- a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServiceTypesDAO.java +++ b/src/main/java/org/onap/dcae/inventory/daos/DCAEServiceTypesDAO.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.daos; +package org.onap.dcae.inventory.daos; -import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceTypeObjectMapper; +import org.onap.dcae.inventory.dbthings.mappers.DCAEServiceTypeObjectMapper; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceTypeObject; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceTypeObject; import io.swagger.model.DCAEServiceTypeRequest; import org.skife.jdbi.v2.sqlobject.Bind; import org.skife.jdbi.v2.sqlobject.BindBean; diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesComponentsMapsDAO.java b/src/main/java/org/onap/dcae/inventory/daos/DCAEServicesComponentsMapsDAO.java index 5bfd3cd..68ed59c 100644 --- a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesComponentsMapsDAO.java +++ b/src/main/java/org/onap/dcae/inventory/daos/DCAEServicesComponentsMapsDAO.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.daos; +package org.onap.dcae.inventory.daos; import org.joda.time.DateTime; import org.skife.jdbi.v2.sqlobject.Bind; diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesDAO.java b/src/main/java/org/onap/dcae/inventory/daos/DCAEServicesDAO.java index 9200677..1398a26 100644 --- a/src/main/java/org/openecomp/dcae/inventory/daos/DCAEServicesDAO.java +++ b/src/main/java/org/onap/dcae/inventory/daos/DCAEServicesDAO.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.daos; +package org.onap.dcae.inventory.daos; -import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.onap.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; import org.joda.time.DateTime; import org.skife.jdbi.v2.sqlobject.Bind; import org.skife.jdbi.v2.sqlobject.BindBean; diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAO.java b/src/main/java/org/onap/dcae/inventory/daos/InventoryDAO.java index ef2fb8d..a369cb1 100644 --- a/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAO.java +++ b/src/main/java/org/onap/dcae/inventory/daos/InventoryDAO.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.daos; +package org.onap.dcae.inventory.daos; /** * Created by mhwang on 4/19/16. diff --git a/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAOManager.java b/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java index 77611b5..b5f0b04 100644 --- a/src/main/java/org/openecomp/dcae/inventory/daos/InventoryDAOManager.java +++ b/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.daos; +package org.onap.dcae.inventory.daos; -import org.openecomp.dcae.inventory.InventoryConfiguration; -import org.openecomp.dcae.inventory.dbthings.StringListArgument; +import org.onap.dcae.inventory.InventoryConfiguration; +import org.onap.dcae.inventory.dbthings.StringListArgument; import io.dropwizard.jdbi.DBIFactory; import io.dropwizard.setup.Environment; import org.skife.jdbi.v2.DBI; diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/StringListArgument.java b/src/main/java/org/onap/dcae/inventory/dbthings/StringListArgument.java index afd0e78..b08bec1 100644 --- a/src/main/java/org/openecomp/dcae/inventory/dbthings/StringListArgument.java +++ b/src/main/java/org/onap/dcae/inventory/dbthings/StringListArgument.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings; +package org.onap.dcae.inventory.dbthings; import org.skife.jdbi.v2.StatementContext; import org.skife.jdbi.v2.tweak.Argument; diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapper.java b/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapper.java index 23b42b1..f214839 100644 --- a/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapper.java +++ b/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapper.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.mappers; +package org.onap.dcae.inventory.dbthings.mappers; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceComponentObject; import org.joda.time.DateTime; import org.skife.jdbi.v2.StatementContext; import org.skife.jdbi.v2.tweak.ResultSetMapper; diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapper.java b/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapper.java index 27cb22f..f60be7b 100644 --- a/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapper.java +++ b/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapper.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.mappers; +package org.onap.dcae.inventory.dbthings.mappers; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; import org.joda.time.DateTime; import org.skife.jdbi.v2.StatementContext; import org.skife.jdbi.v2.tweak.ResultSetMapper; diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java b/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java index dc64423..bda4423 100644 --- a/src/main/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java +++ b/src/main/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapper.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.mappers; +package org.onap.dcae.inventory.dbthings.mappers; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceTypeObject; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceTypeObject; import org.joda.time.DateTime; import org.skife.jdbi.v2.StatementContext; import org.skife.jdbi.v2.tweak.ResultSetMapper; diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObject.java b/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObject.java index 0ec9c19..b262fc0 100644 --- a/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObject.java +++ b/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObject.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.models; +package org.onap.dcae.inventory.dbthings.models; import io.swagger.model.DCAEServiceComponentRequest; import org.joda.time.DateTime; diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObject.java b/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObject.java index 4374acd..83e2bfe 100644 --- a/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObject.java +++ b/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObject.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.models; +package org.onap.dcae.inventory.dbthings.models; import io.swagger.model.DCAEServiceRequest; import org.joda.time.DateTime; diff --git a/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java b/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java index b57a28f..f264c99 100644 --- a/src/main/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java +++ b/src/main/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceTypeObject.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.models; +package org.onap.dcae.inventory.dbthings.models; import org.joda.time.DateTime; diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerClientException.java b/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerClientException.java index eb30ae7..b549ee1 100644 --- a/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerClientException.java +++ b/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerClientException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.exceptions; +package org.onap.dcae.inventory.exceptions; /** * Created by mhwang on 5/13/16. diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerConnectionException.java b/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerConnectionException.java index 2b9e6e7..f96ffbe 100644 --- a/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerConnectionException.java +++ b/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerConnectionException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.exceptions; +package org.onap.dcae.inventory.exceptions; /** * Created by mhwang on 8/23/16. diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerTimeoutException.java b/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerTimeoutException.java index 8aa9255..48f5044 100644 --- a/src/main/java/org/openecomp/dcae/inventory/exceptions/DCAEControllerTimeoutException.java +++ b/src/main/java/org/onap/dcae/inventory/exceptions/DCAEControllerTimeoutException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.exceptions; +package org.onap.dcae.inventory.exceptions; /** * Created by mhwang on 8/23/16. diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/DatabusControllerClientException.java b/src/main/java/org/onap/dcae/inventory/exceptions/DatabusControllerClientException.java index 6209521..14855a8 100644 --- a/src/main/java/org/openecomp/dcae/inventory/exceptions/DatabusControllerClientException.java +++ b/src/main/java/org/onap/dcae/inventory/exceptions/DatabusControllerClientException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.exceptions; +package org.onap.dcae.inventory.exceptions; /** * Created by mhwang on 5/25/16. diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DBIExceptionMapper.java b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DBIExceptionMapper.java index 5dce2dd..016ac27 100644 --- a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DBIExceptionMapper.java +++ b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DBIExceptionMapper.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.exceptions.mappers; +package org.onap.dcae.inventory.exceptions.mappers; -import org.openecomp.dcae.inventory.daos.InventoryDAOManager; +import org.onap.dcae.inventory.daos.InventoryDAOManager; import io.swagger.api.ApiResponseMessage; import org.skife.jdbi.v2.exceptions.DBIException; import org.skife.jdbi.v2.exceptions.UnableToCreateStatementException; diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java index 76936e0..e345c6e 100644 --- a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java +++ b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerConnectionExceptionMapper.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.exceptions.mappers; +package org.onap.dcae.inventory.exceptions.mappers; -import org.openecomp.dcae.inventory.exceptions.DCAEControllerConnectionException; +import org.onap.dcae.inventory.exceptions.DCAEControllerConnectionException; import javax.ws.rs.core.Response; diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java index b9ffda0..8e4eb3b 100644 --- a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java +++ b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerExceptionMapper.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.exceptions.mappers; +package org.onap.dcae.inventory.exceptions.mappers; import io.swagger.api.ApiResponseMessage; diff --git a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java index 9939aee..67eb6ca 100644 --- a/src/main/java/org/openecomp/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java +++ b/src/main/java/org/onap/dcae/inventory/exceptions/mappers/DCAEControllerTimeoutExceptionMapper.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.exceptions.mappers; +package org.onap.dcae.inventory.exceptions.mappers; -import org.openecomp.dcae.inventory.exceptions.DCAEControllerTimeoutException; +import org.onap.dcae.inventory.exceptions.DCAEControllerTimeoutException; import javax.ws.rs.core.Response; diff --git a/src/main/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapper.java b/src/main/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapper.java index 0f54b46..7967470 100644 --- a/src/main/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapper.java +++ b/src/main/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapper.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.providers; +package org.onap.dcae.inventory.providers; import io.swagger.api.ApiResponseMessage; import io.swagger.api.NotFoundException; diff --git a/src/test/java/DcaeServiceTypesApiServiceImplTests.java b/src/test/java/DcaeServiceTypesApiServiceImplTests.java index c4ada1f..3882c53 100644 --- a/src/test/java/DcaeServiceTypesApiServiceImplTests.java +++ b/src/test/java/DcaeServiceTypesApiServiceImplTests.java @@ -18,11 +18,11 @@ * ============LICENSE_END========================================================= */ -import org.openecomp.dcae.inventory.daos.DCAEServiceTypesDAO; -import org.openecomp.dcae.inventory.daos.DCAEServicesDAO; -import org.openecomp.dcae.inventory.daos.InventoryDAOManager; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceTypeObject; +import org.onap.dcae.inventory.daos.DCAEServiceTypesDAO; +import org.onap.dcae.inventory.daos.DCAEServicesDAO; +import org.onap.dcae.inventory.daos.InventoryDAOManager; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceTypeObject; import io.swagger.api.impl.DcaeServiceTypesApiServiceImpl; import io.swagger.model.DCAEServiceType; import io.swagger.model.DCAEServiceTypeRequest; diff --git a/src/test/java/DcaeServicesApiServiceImplTests.java b/src/test/java/DcaeServicesApiServiceImplTests.java index 50d6e5b..75e3e00 100644 --- a/src/test/java/DcaeServicesApiServiceImplTests.java +++ b/src/test/java/DcaeServicesApiServiceImplTests.java @@ -21,22 +21,18 @@ import io.swagger.api.NotFoundException; import io.swagger.api.impl.DcaeServicesApiServiceImpl; import io.swagger.model.DCAEService; -import io.swagger.model.DCAEServiceComponent; import io.swagger.model.DCAEServiceRequest; -import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; -import org.junit.internal.runners.statements.Fail; import org.junit.runner.RunWith; -import org.openecomp.dcae.inventory.clients.DCAEControllerClient; -import org.openecomp.dcae.inventory.clients.DatabusControllerClient; -import org.openecomp.dcae.inventory.daos.DCAEServiceComponentsDAO; -import org.openecomp.dcae.inventory.daos.DCAEServiceTypesDAO; -import org.openecomp.dcae.inventory.daos.DCAEServicesDAO; -import org.openecomp.dcae.inventory.daos.InventoryDAOManager; -import org.openecomp.dcae.inventory.dbthings.mappers.DCAEServiceObjectMapper; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceComponentObject; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.onap.dcae.inventory.clients.DCAEControllerClient; +import org.onap.dcae.inventory.clients.DatabusControllerClient; +import org.onap.dcae.inventory.daos.DCAEServiceComponentsDAO; +import org.onap.dcae.inventory.daos.DCAEServiceTypesDAO; +import org.onap.dcae.inventory.daos.DCAEServicesDAO; +import org.onap.dcae.inventory.daos.InventoryDAOManager; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceComponentObject; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -44,15 +40,10 @@ import org.powermock.modules.junit4.PowerMockRunner; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; -import org.skife.jdbi.v2.Foreman; -import org.skife.jdbi.v2.Handle; -import org.skife.jdbi.v2.Query; -import org.skife.jdbi.v2.tweak.Argument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.ws.rs.core.Response; -import javax.ws.rs.core.SecurityContext; import javax.ws.rs.core.UriInfo; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java b/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java index ffe7cb2..7ca8200 100644 --- a/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java +++ b/src/test/java/DcaeServicesGroupbyApiServiceImplTests.java @@ -22,14 +22,10 @@ import io.swagger.api.impl.DcaeServicesGroupbyApiServiceImpl; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.stubbing.OngoingStubbing; -import org.openecomp.dcae.inventory.daos.InventoryDAOManager; -import org.openecomp.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.onap.dcae.inventory.daos.InventoryDAOManager; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import org.skife.jdbi.v2.Handle; -import org.skife.jdbi.v2.Query; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; diff --git a/src/test/java/org/openecomp/dcae/inventory/daos/InventoryDAOManagerTests.java b/src/test/java/org/onap/dcae/inventory/daos/InventoryDAOManagerTests.java index 16e3688..8346372 100644 --- a/src/test/java/org/openecomp/dcae/inventory/daos/InventoryDAOManagerTests.java +++ b/src/test/java/org/onap/dcae/inventory/daos/InventoryDAOManagerTests.java @@ -18,9 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.daos; +package org.onap.dcae.inventory.daos; -import org.openecomp.dcae.inventory.InventoryConfiguration; +import org.onap.dcae.inventory.InventoryConfiguration; import io.dropwizard.setup.Environment; import org.junit.Test; import static org.mockito.Mockito.mock; diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java index 2a909f4..c0ad9b8 100644 --- a/src/test/java/org/openecomp/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java @@ -18,14 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.daos; +package org.onap.dcae.inventory.dbthings.daos; import org.joda.time.DateTime; import org.junit.Test; -import org.openecomp.dcae.inventory.daos.DCAEServiceComponentsDAO; -import org.openecomp.dcae.inventory.daos.DCAEServiceTransactionDAO; -import org.openecomp.dcae.inventory.daos.DCAEServicesComponentsMapsDAO; -import org.openecomp.dcae.inventory.daos.DCAEServicesDAO; +import org.onap.dcae.inventory.daos.DCAEServiceComponentsDAO; +import org.onap.dcae.inventory.daos.DCAEServiceTransactionDAO; +import org.onap.dcae.inventory.daos.DCAEServicesComponentsMapsDAO; +import org.onap.dcae.inventory.daos.DCAEServicesDAO; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java index cb3c7f1..bb511e2 100644 --- a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.mappers; +package org.onap.dcae.inventory.dbthings.mappers; import org.junit.Test; diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java index 1946343..ab150bb 100644 --- a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.mappers; +package org.onap.dcae.inventory.dbthings.mappers; import org.junit.Test; diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java index f8c2428..c1caa29 100644 --- a/src/test/java/org/openecomp/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java @@ -18,8 +18,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.mappers; +package org.onap.dcae.inventory.dbthings.mappers; +import junit.framework.TestCase; import org.junit.Test; import java.sql.Array; @@ -100,7 +101,7 @@ public class DCAEServiceTypeObjectMapperTests { } }); - assertNotNull(mapper.map(0, resultSet, null)); + TestCase.assertNotNull(mapper.map(0, resultSet, null)); } catch(Exception e) { fail("Unexpected exception"); } diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java index 44f4f73..cb81131 100644 --- a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.models; +package org.onap.dcae.inventory.dbthings.models; import io.swagger.model.DCAEServiceComponentRequest; import org.junit.Test; diff --git a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java index 9f7b6f8..7a39883 100644 --- a/src/test/java/org/openecomp/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.dbthings.models; +package org.onap.dcae.inventory.dbthings.models; import io.swagger.model.DCAEServiceRequest; import org.junit.Test; diff --git a/src/test/java/org/openecomp/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java b/src/test/java/org/onap/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java index 6e72182..7c04295 100644 --- a/src/test/java/org/openecomp/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/exception/mappers/DBIExceptionMapperTests.java @@ -18,10 +18,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.exception.mappers; +package org.onap.dcae.inventory.exception.mappers; -import org.openecomp.dcae.inventory.daos.InventoryDAOManager; -import org.openecomp.dcae.inventory.exceptions.mappers.DBIExceptionMapper; +import org.onap.dcae.inventory.daos.InventoryDAOManager; +import org.onap.dcae.inventory.exceptions.mappers.DBIExceptionMapper; import io.swagger.api.ApiResponseMessage; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapperTests.java b/src/test/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapperTests.java index 083b237..8e2b767 100644 --- a/src/test/java/org/openecomp/dcae/inventory/providers/NotFoundExceptionMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapperTests.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.dcae.inventory.providers; +package org.onap.dcae.inventory.providers; import io.swagger.api.NotFoundException; import org.junit.Test; |