From 181aa2b8d9dd612805cdb5fed749566b171b5a35 Mon Sep 17 00:00:00 2001 From: niamhcore Date: Wed, 18 Nov 2020 16:29:15 +0000 Subject: Fix HTTP response for duplicate module Issue-ID: CPS-80 Signed-off-by: niamhcore Change-Id: I27b83d671a9f235a4e926ebe9897add36080fd6f --- .../org/onap/cps/spi/impl/ModelPersistenceServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'cps-ri') diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistenceServiceImpl.java index a54e50646..03679b316 100755 --- a/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistenceServiceImpl.java +++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/ModelPersistenceServiceImpl.java @@ -20,12 +20,14 @@ package org.onap.cps.spi.impl; +import org.onap.cps.exceptions.CpsValidationException; import org.onap.cps.spi.ModelPersistenceService; import org.onap.cps.spi.entities.Dataspace; import org.onap.cps.spi.entities.Module; import org.onap.cps.spi.repository.DataspaceRepository; import org.onap.cps.spi.repository.ModuleRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Component; @Component @@ -46,6 +48,11 @@ public class ModelPersistenceServiceImpl implements ModelPersistenceService { } dataspace.setId(dataspaceRepository.getByName(dataspaceName).getId()); final Module module = new Module(namespace, moduleContent, revision, dataspace); - moduleRepository.save(module); + try { + moduleRepository.save(module); + } catch (final DataIntegrityViolationException ex) { + throw new CpsValidationException("Duplicate Entry", + String.format("Module already exist in dataspace %s.", dataspaceName)); + } } -} \ No newline at end of file +} -- cgit 1.2.3-korg