</dependency>
<dependency>
<groupId>org.onap.so.adapters</groupId>
- <artifactId>etsi-sol003-package-management-adapter</artifactId>
+ <artifactId>etsi-sol003-pkgm-adapter</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.so.adapters</groupId>
- <artifactId>etsi-sol003-package-management</artifactId>
+ <artifactId>etsi-sol003-pkgm</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
- <artifactId>etsi-sol003-package-management-adapter</artifactId>
+ <artifactId>etsi-sol003-pkgm-adapter</artifactId>
<name>ETSI SOL003 VNF Package Management Adapter</name>
<build>
</dependency>
<dependency>
<groupId>org.onap.so.adapters</groupId>
- <artifactId>etsi-sol003-package-management-api</artifactId>
+ <artifactId>etsi-sol003-pkgm-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.so.adapters</groupId>
- <artifactId>etsi-sol003-package-management-ext-clients</artifactId>
+ <artifactId>etsi-sol003-pkgm-ext-clients</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement.cache;
+package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement.cache;
+package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
import java.util.Arrays;
import org.onap.so.adapters.etsisol003adapter.pkgm.PackageManagementConstants;
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement.cache;
+package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
/**
* Exception for failure to find the cache.
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement.cache;
+package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
import java.util.Map;
import java.util.Optional;
* @author Gareth Roper (gareth.roper@est.tech)
*
*/
-public interface PackageManagementCacheServiceProvider {
+public interface PkgmCacheServiceProvider {
/**
* Checks cache if subscription request Id is already present. If not, it adds the subscription to the cache.
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement.cache;
+package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
import java.util.Collections;
import java.util.HashMap;
* @author Gareth Roper (gareth.roper@est.tech)
*/
@Service
-public class PackageManagementCacheServiceProviderImpl extends AbstractCacheServiceProvider
- implements PackageManagementCacheServiceProvider {
+public class PkgmCacheServiceProviderImpl extends AbstractCacheServiceProvider implements PkgmCacheServiceProvider {
- private static final Logger LOGGER = LoggerFactory.getLogger(PackageManagementCacheServiceProviderImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PkgmCacheServiceProviderImpl.class);
@Autowired
- public PackageManagementCacheServiceProviderImpl(final CacheManager cacheManager) {
+ public PkgmCacheServiceProviderImpl(final CacheManager cacheManager) {
super(PackageManagementConstants.PACKAGE_MANAGEMENT_SUBSCRIPTION_CACHE, cacheManager);
}
import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgOnboardingNotification;
import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.InternalServerErrorException;
import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.NotificationTypeNotSupportedException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement.NotificationManager;
+import org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt.NotificationManager;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.ProblemDetails;
import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse201;
import org.onap.so.adapters.etsisol003adapter.pkgm.model.PkgmSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement.SubscriptionManager;
+import org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt.SubscriptionManager;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement;
+package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
import static org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.VnfmHttpServiceProviderConfiguration.VNFM_ADAPTER_HTTP_SERVICE_PROVIDER_BEAN;
import java.nio.charset.StandardCharsets;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement;
+package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
import static org.slf4j.LoggerFactory.getLogger;
import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement;
+package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.List;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement;
+package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication.AuthTypeEnum;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement;
+package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.HashMap;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement;
+package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
import static org.slf4j.LoggerFactory.getLogger;
import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement;
+package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
import java.io.Serializable;
import javax.xml.bind.annotation.XmlElement;
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement;
+package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
import static org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.SubscriptionAuthentication.AuthTypeEnum.BASIC;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.Optional;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.onap.so.adapters.etsi.sol003.adapter.common.VnfmAdapterUrlProvider;
+import org.onap.so.adapters.etsisol003adapter.pkgm.cache.PkgmCacheServiceProvider;
import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.EtsiCatalogServiceProvider;
import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.BasicAuth;
import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.NsdmSubscription;
import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.ConversionFailedException;
import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.InternalServerErrorException;
import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.SubscriptionNotFoundException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement.cache.PackageManagementCacheServiceProvider;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.convert.ConversionService;
public class SubscriptionManager {
private static final Logger logger = getLogger(SubscriptionManager.class);
- private final PackageManagementCacheServiceProvider packageManagementCacheServiceProvider;
+ private final PkgmCacheServiceProvider packageManagementCacheServiceProvider;
private final ConversionService conversionService;
private final EtsiCatalogServiceProvider etsiCatalogServiceProvider;
private final VnfmAdapterUrlProvider vnfmAdapterUrlProvider;
@Autowired
- public SubscriptionManager(final PackageManagementCacheServiceProvider packageManagementCacheServiceProvider,
+ public SubscriptionManager(final PkgmCacheServiceProvider packageManagementCacheServiceProvider,
final ConversionService conversionService, final EtsiCatalogServiceProvider etsiCatalogServiceProvider,
final VnfmAdapterUrlProvider vnfmAdapterUrlProvider) {
this.packageManagementCacheServiceProvider = packageManagementCacheServiceProvider;
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmanagement;
+package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
import static org.slf4j.LoggerFactory.getLogger;
import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.so.adapters</groupId>
- <artifactId>etsi-sol003-package-management</artifactId>
+ <artifactId>etsi-sol003-pkgm</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
- <artifactId>etsi-sol003-package-management-api</artifactId>
+ <artifactId>etsi-sol003-pkgm-api</artifactId>
<name>ETSI SOL003 VNF Package Management Adapter API</name>
<build>
<plugins>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.so.adapters</groupId>
- <artifactId>etsi-sol003-package-management</artifactId>
+ <artifactId>etsi-sol003-pkgm</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
- <artifactId>etsi-sol003-package-management-ext-clients</artifactId>
+ <artifactId>etsi-sol003-pkgm-ext-clients</artifactId>
<name>ETSI SOL003 VNF Package Management Adapter Ext Clients</name>
<build>
<plugins>
<artifactId>etsi-sol003-adapter</artifactId>
<version>1.6.0-SNAPSHOT</version>
</parent>
- <artifactId>etsi-sol003-package-management</artifactId>
+ <artifactId>etsi-sol003-pkgm</artifactId>
<name>ETSI SOL003 VNF Package Management</name>
<packaging>pom</packaging>
<modules>
- <module>etsi-sol003-package-management-api</module>
- <module>etsi-sol003-package-management-ext-clients</module>
- <module>etsi-sol003-package-management-adapter</module>
+ <module>etsi-sol003-pkgm-api</module>
+ <module>etsi-sol003-pkgm-ext-clients</module>
+ <module>etsi-sol003-pkgm-adapter</module>
</modules>
</project>
\ No newline at end of file
<modules>
<module>etsi-sol003-adapter-common</module>
- <module>etsi-sol003-package-management</module>
+ <module>etsi-sol003-pkgm</module>
<module>etsi-sol003-lcm</module>
<module>etsi-sol003-adapter-application</module>
</modules>