aboutsummaryrefslogtreecommitdiffstats
path: root/mso-catalog-db/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'mso-catalog-db/src/main')
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BuildingBlockDetail.java3
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatusStateTransitionDirective.java3
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/NorthBoundRequest.java3
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/OrchestrationFlow.java3
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/RainyDayHandlerStatus.java16
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineAllottedResources.java64
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineNetworks.java72
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineService.java52
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineVfModules.java59
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineVnf.java76
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepository.java3
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/NetworkResourceCustomizationRepository.java3
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ServiceRepository.java3
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfCustomizationRepository.java7
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfcCustomizationRepository.java1
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/exceptions/NoEntityFoundException.java37
16 files changed, 65 insertions, 340 deletions
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BuildingBlockDetail.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BuildingBlockDetail.java
index 36a9db77ed..cc2abacce2 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BuildingBlockDetail.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/BuildingBlockDetail.java
@@ -30,6 +30,7 @@ import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
@@ -48,7 +49,7 @@ public class BuildingBlockDetail implements Serializable {
@Id
@Column(name = "id")
- @GeneratedValue
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@BusinessKey
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatusStateTransitionDirective.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatusStateTransitionDirective.java
index 517b17af91..245fcdcf92 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatusStateTransitionDirective.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatusStateTransitionDirective.java
@@ -27,6 +27,7 @@ import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
@@ -43,7 +44,7 @@ public class OrchestrationStatusStateTransitionDirective implements Serializable
@Id
@Column(name = "id")
- @GeneratedValue
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@Enumerated(EnumType.STRING)
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/NorthBoundRequest.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/NorthBoundRequest.java
index 67f23c1e43..0df176c3f8 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/NorthBoundRequest.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/NorthBoundRequest.java
@@ -28,6 +28,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
@@ -51,7 +52,7 @@ public class NorthBoundRequest implements Serializable {
@Id
@Column(name = "id")
- @GeneratedValue
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@BusinessKey
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/OrchestrationFlow.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/OrchestrationFlow.java
index 058947e6b1..fc017c63aa 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/OrchestrationFlow.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/OrchestrationFlow.java
@@ -27,6 +27,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
@@ -49,7 +50,7 @@ public class OrchestrationFlow implements Serializable {
@Id
@Column(name = "ID")
- @GeneratedValue
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@BusinessKey
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/RainyDayHandlerStatus.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/RainyDayHandlerStatus.java
index f341c4cb5c..23d9d7bc6c 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/RainyDayHandlerStatus.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/macro/RainyDayHandlerStatus.java
@@ -25,6 +25,7 @@ import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
@@ -45,7 +46,7 @@ public class RainyDayHandlerStatus implements Serializable {
@Id
@Column(name = "id")
- @GeneratedValue
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
@BusinessKey
@@ -71,12 +72,15 @@ public class RainyDayHandlerStatus implements Serializable {
@BusinessKey
@Column(name = "POLICY")
private String policy;
+
+ @Column(name = "SECONDARY_POLICY")
+ private String secondaryPolicy;
@Override
public String toString() {
return new ToStringBuilder(this).append("id", id).append("flowName", flowName)
.append("serviceType", serviceType).append("vnfType", vnfType).append("errorCode", errorCode)
- .append("workStep", workStep).append("policy", policy).toString();
+ .append("workStep", workStep).append("policy", policy).append("secondaryPolicy",secondaryPolicy).toString();
}
@Override
@@ -151,4 +155,12 @@ public class RainyDayHandlerStatus implements Serializable {
public void setPolicy(String policy) {
this.policy = policy;
}
+
+ public String getSecondaryPolicy() {
+ return secondaryPolicy;
+ }
+
+ public void setSecondaryPolicy(String secondaryPolicy) {
+ this.secondaryPolicy = secondaryPolicy;
+ }
}
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineAllottedResources.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineAllottedResources.java
deleted file mode 100644
index c03e988e2e..0000000000
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineAllottedResources.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.catalog.data.projections;
-
-import org.onap.so.db.catalog.beans.AllottedResourceCustomization;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.rest.core.config.Projection;
-
-@Projection(name = "InlineAllottedResources", types = { AllottedResourceCustomization.class })
-public interface InlineAllottedResources {
-
- String getModelCustomizationUUID();
- String getModelInstanceName();
- String getMaxInstances();
- String getMinInstances();
- String getNfNamingCode();
- String getNfRole();
- String getNfType();
- String getNfFunction();
- String getTargetNetworkRole();
- String getProvidingServiceModelInvariantUUID();
- String getProvidingServiceModelName();
- String getProvidingServiceModelUUID();
-
- @Value("#{target.getAllottedResource().getDescription()}")
- String getDescription();
-
- @Value("#{target.getAllottedResource().getCreated()}")
- String getCreated();
-
-
- @Value("#{target.getAllottedResource().getModelInvariantUUID()}")
- String getModelInvariantUuid ();
-
- @Value("#{target.getAllottedResource().getModelName()}")
- String getModelName ();
-
- @Value("#{target.getAllottedResource().getModelUUID()}")
- String getModelUuid ();
-
- @Value("#{target.getAllottedResource().getToscaNodeType()}")
- String getToscaNodeType ();
-
- @Value("#{target.getAllottedResource().getSubcategory()}")
- String getSubcategory ();
-} \ No newline at end of file
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineNetworks.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineNetworks.java
deleted file mode 100644
index 8311df8adf..0000000000
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineNetworks.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.catalog.data.projections;
-
-
-import java.sql.Timestamp;
-
-import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.rest.core.config.Projection;
-
-@Projection(name = "InlineNetworks", types = { NetworkResourceCustomization.class })
-public interface InlineNetworks {
-
- String getModelCustomizationUUID();
- String getModelInstanceName();
- String getNetworkTechnology();
- String getNetworkType();
- String getNetworkScope();
- String getNetworkRole();
-
- @Value("#{target.getNetworkResource().getDescription()}")
- String getDescription();
-
- @Value("#{target.getNetworkResource().getCreated()}")
- Timestamp getCreated();
-
- @Value("#{target.getNetworkResource().getModelVersion()}")
- String getModelVersion();
-
- @Value("#{target.getNetworkResource().getModelInvariantUUID()}")
- String getModelInvariantUUID();
-
- @Value("#{target.getNetworkResource().getModelName()}")
- String getModelName ();
-
- @Value("#{target.getNetworkResource().getModelUUID()}")
- String getModelUUID ();
-
- @Value("#{target.getNetworkResource().getNeutronNetworkType()}")
- String getNeutronNetworkType ();
-
- @Value("#{target.getNetworkResource().getAicVersionMin()}")
- String getAicVersionMin ();
-
- @Value("#{target.getNetworkResource().getAicVersionMax()}")
- String getAicVersionMax ();
-
- @Value("#{target.getNetworkResource().getOrchestrationMode()}")
- String getOrchestrationMode ();
-
- @Value("#{target.getNetworkResource().getToscaNodeType()}")
- String getToscaNodeType ();
-} \ No newline at end of file
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineService.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineService.java
deleted file mode 100644
index c7241acd8b..0000000000
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.catalog.data.projections;
-
-
-import java.util.List;
-import java.util.Map;
-
-import org.onap.so.db.catalog.beans.Service;
-import org.onap.so.db.catalog.beans.ServiceRecipe;
-import org.springframework.data.rest.core.config.Projection;
-
-@Projection(name = "InlineService", types = { Service.class })
-public interface InlineService {
-
- String getModelName();
- String getDescription();
- String getCreated();
- String getModelUUID();
- String getModelInvariantUUID();
- String getModelVersion();
- String getServiceType();
- String getServiceRole();
- String getEnvironmentContext();
- String getWorkloadContext();
-
- List<InlineNetworks> getNetworkCustomizations();
-
- List<InlineVnf> getVnfCustomizations();
-
- List<InlineAllottedResources> getAllottedCustomizations();
-
- Map<String, ServiceRecipe> getRecipes ();
-} \ No newline at end of file
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineVfModules.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineVfModules.java
deleted file mode 100644
index 316a02b016..0000000000
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineVfModules.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.catalog.data.projections;
-
-import org.onap.so.db.catalog.beans.VfModuleCustomization;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.rest.core.config.Projection;
-
-@Projection(name = "InlineVfModules", types = { VfModuleCustomization.class })
-public interface InlineVfModules {
-
- String getModelCustomizationUUID();
-
- @Value("#{target.getVfModule().getModelName()}")
- String getModelName ();
-
- @Value("#{target.getVfModule().getModelUUID()}")
- String getModelUUID ();
-
- @Value("#{target.getVfModule().getModelInvariantUUID()}")
- String getModelInvariantUUID ();
-
- @Value("#{target.getVfModule().getModelVersion()}")
- String getModelVersion ();
-
- @Value("#{target.getVfModule().getDescription()}")
- String getDescription();
-
- @Value("#{target.getVfModule().getIsBase()}")
- Boolean getIsBase();
-
- String getMinInstances();
- String getMaxInstances();
- String getAvailabilityZoneCount();
- String getLabel();
- String getInitialCount();
-
- @Value("#{target.getVfModule().getCreated()}")
- String getCreated();
-
-} \ No newline at end of file
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineVnf.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineVnf.java
deleted file mode 100644
index 17e54f9b45..0000000000
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/projections/InlineVnf.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.db.catalog.data.projections;
-
-import java.util.List;
-
-import org.onap.so.db.catalog.beans.VnfResourceCustomization;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.rest.core.config.Projection;
-
-@Projection(name = "InlineVnf", types = { VnfResourceCustomization.class })
-public interface InlineVnf {
-
- String getModelInstanceName();
-
- String getModelCustomizationUUID();
-
- @Value("#{target.getVnfResources().getModelUUID()}")
- String getModelUUID();
-
- @Value("#{target.getVnfResources().getModelInvariantUUID()}")
- String getModelInvariantUUID();
-
- @Value("#{target.getVnfResources().getModelName()}")
- String getModelName();
-
- @Value("#{target.getVnfResources().getModelVersion()}")
- String getModelVersion();
-
- @Value("#{target.getVnfResources().getToscaNodeType()}")
- String getToscaNodeType ();
-
- @Value("#{target.getVnfResources().getDescription()}")
- String getDescription();
-
- @Value("#{target.getVnfResources().getOrchestrationMode()}")
- String getOrchestrationMode();
-
- @Value("#{target.getVnfResources().getAicVersionMin()}")
- String getAicVersionMin();
-
- @Value("#{target.getVnfResources().getAicVersionMax()}")
- String getAicVersionMax();
-
- String getMinInstances();
- String getMaxInstances();
- String getAvailabilityZoneMaxCount();
- String getNfFunction();
- String getNfType();
- String getNfRole();
- String getNfNamingCode();
- String getMultiStageDesign();
-
- @Value("#{target.getVnfResources().getCreated()}")
- String getCreated();
-
- List<InlineVfModules> getVfModuleCustomizations();
-} \ No newline at end of file
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepository.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepository.java
index 3eeef07c97..0c82b84c0f 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepository.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/CvnfcCustomizationRepository.java
@@ -23,12 +23,11 @@ package org.onap.so.db.catalog.data.repository;
import java.util.List;
import org.onap.so.db.catalog.beans.CvnfcCustomization;
-import org.onap.so.db.catalog.data.projections.InlineVnf;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-@RepositoryRestResource(collectionResourceRel = "cvnfcCustomization", path = "cvnfcCustomization", excerptProjection = InlineVnf.class)
+@RepositoryRestResource(collectionResourceRel = "cvnfcCustomization", path = "cvnfcCustomization")
public interface CvnfcCustomizationRepository extends JpaRepository<CvnfcCustomization, String> {
CvnfcCustomization findOneByModelCustomizationUUID(String modelCustomizationUuid);
List<CvnfcCustomization> findByModelCustomizationUUID(String modelCustomizationUUID);
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/NetworkResourceCustomizationRepository.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/NetworkResourceCustomizationRepository.java
index c169f3661a..799d98c5e4 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/NetworkResourceCustomizationRepository.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/NetworkResourceCustomizationRepository.java
@@ -23,11 +23,10 @@ package org.onap.so.db.catalog.data.repository;
import java.util.List;
import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
-import org.onap.so.db.catalog.data.projections.InlineNetworks;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-@RepositoryRestResource(collectionResourceRel = "networkResourceCustomization", path = "networkResourceCustomization", excerptProjection = InlineNetworks.class)
+@RepositoryRestResource(collectionResourceRel = "networkResourceCustomization", path = "networkResourceCustomization")
public interface NetworkResourceCustomizationRepository extends JpaRepository<NetworkResourceCustomization, String> {
List<NetworkResourceCustomization> findByModelCustomizationUUID(String modelCustomizationUUID);
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ServiceRepository.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ServiceRepository.java
index 6d432c443c..2d29a78351 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ServiceRepository.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/ServiceRepository.java
@@ -21,14 +21,13 @@
package org.onap.so.db.catalog.data.repository;
import org.onap.so.db.catalog.beans.Service;
-import org.onap.so.db.catalog.data.projections.InlineService;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
import java.util.List;
-@RepositoryRestResource(collectionResourceRel = "service", path = "service", excerptProjection = InlineService.class)
+@RepositoryRestResource(collectionResourceRel = "service", path = "service")
public interface ServiceRepository extends JpaRepository<Service, String> {
List<Service> findByModelName(String modelName);
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfCustomizationRepository.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfCustomizationRepository.java
index 46a4cfba11..17ae017da4 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfCustomizationRepository.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfCustomizationRepository.java
@@ -20,15 +20,14 @@
package org.onap.so.db.catalog.data.repository;
+import java.util.List;
+
import org.onap.so.db.catalog.beans.VnfResourceCustomization;
-import org.onap.so.db.catalog.data.projections.InlineVnf;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import java.util.List;
-
-@RepositoryRestResource(collectionResourceRel = "vnfResourceCustomization", path = "vnfResourceCustomization", excerptProjection = InlineVnf.class)
+@RepositoryRestResource(collectionResourceRel = "vnfResourceCustomization", path = "vnfResourceCustomization")
public interface VnfCustomizationRepository extends JpaRepository<VnfResourceCustomization, String> {
List<VnfResourceCustomization> findByModelCustomizationUUID(String modelCustomizationUUID);
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfcCustomizationRepository.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfcCustomizationRepository.java
index 4ccbf5831f..64840f11f9 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfcCustomizationRepository.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/data/repository/VnfcCustomizationRepository.java
@@ -21,7 +21,6 @@
package org.onap.so.db.catalog.data.repository;
import org.onap.so.db.catalog.beans.VnfcCustomization;
-import org.onap.so.db.catalog.data.projections.InlineVnf;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.rest.core.annotation.RepositoryRestResource;
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/exceptions/NoEntityFoundException.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/exceptions/NoEntityFoundException.java
new file mode 100644
index 0000000000..f06d7c9c17
--- /dev/null
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/exceptions/NoEntityFoundException.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.db.catalog.exceptions;
+
+
+public class NoEntityFoundException extends Exception {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 545820289784366486L;
+
+ public NoEntityFoundException(String errorMessage) {
+ super(errorMessage);
+ }
+
+
+
+}