diff --git a/pom.xml b/pom.xml index 36bf4a99..cfa83779 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ api jar ${project.groupId}:${project.artifactId} - 3.4.32 + 3.4.33 Hygieia Rest API Layer https://github.com/Hygieia/api diff --git a/src/main/java/com/capitalone/dashboard/service/DashboardServiceImpl.java b/src/main/java/com/capitalone/dashboard/service/DashboardServiceImpl.java index 4d65f084..8c732955 100644 --- a/src/main/java/com/capitalone/dashboard/service/DashboardServiceImpl.java +++ b/src/main/java/com/capitalone/dashboard/service/DashboardServiceImpl.java @@ -30,6 +30,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.IterableUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -839,7 +840,11 @@ private void duplicateDashboardErrorCheck(Dashboard dashboard) throws HygieiaExc String compName = dashboard.getConfigurationItemBusAppName(); if(appName != null && !appName.isEmpty() && compName != null && !compName.isEmpty()){ - Dashboard existingDashboard = dashboardRepository.findByConfigurationItemBusServNameIgnoreCaseAndConfigurationItemBusAppNameIgnoreCase(appName, compName); + Iterable dashboards = dashboardRepository.findAllByConfigurationItemBusServNameAndConfigurationItemBusAppName(appName, compName); + Dashboard existingDashboard = null; + if (!IterableUtils.isEmpty(dashboards)) { + existingDashboard = dashboards.iterator().next(); + } if(existingDashboard != null && !existingDashboard.getId().equals(dashboard.getId())){ throw new HygieiaException("Existing Dashboard: " + existingDashboard.getTitle(), HygieiaException.DUPLICATE_DATA); }