From commits-return-19521-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Sun Jul 22 19:36:59 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id DACDE18062F for ; Sun, 22 Jul 2018 19:36:58 +0200 (CEST) Received: (qmail 64566 invoked by uid 500); 22 Jul 2018 17:36:58 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 64557 invoked by uid 99); 22 Jul 2018 17:36:57 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2018 17:36:57 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 54327801F4; Sun, 22 Jul 2018 17:36:57 +0000 (UTC) Date: Sun, 22 Jul 2018 17:36:57 +0000 To: "commits@airavata.apache.org" Subject: [airavata] branch develop updated: Fix bug when passing empty list to SQL IN clause MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153228101727.5080.18118736462707897236@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: c06a1ba83e96a49c1ef0a6829b29280490be1568 X-Git-Newrev: f4269d61d25660e482707b0d62431f100074ad26 X-Git-Rev: f4269d61d25660e482707b0d62431f100074ad26 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git The following commit(s) were added to refs/heads/develop by this push: new f4269d6 Fix bug when passing empty list to SQL IN clause f4269d6 is described below commit f4269d61d25660e482707b0d62431f100074ad26 Author: Marcus Christie AuthorDate: Sun Jul 22 13:27:55 2018 -0400 Fix bug when passing empty list to SQL IN clause --- .../appcatalog/ApplicationDeploymentRepository.java | 11 +++++++---- .../appcatalog/ApplicationInterfaceRepository.java | 13 +++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationDeploymentRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationDeploymentRepository.java index d797d3c..d85e5cd 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationDeploymentRepository.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationDeploymentRepository.java @@ -31,10 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class ApplicationDeploymentRepository extends AppCatAbstractRepository implements ApplicationDeployment { private final static Logger logger = LoggerFactory.getLogger(ApplicationDeploymentRepository.class); @@ -187,6 +184,9 @@ public class ApplicationDeploymentRepository extends AppCatAbstractRepository getAccessibleApplicationDeployments(String gatewayId, List accessibleAppIds, List accessibleCompHostIds) throws AppCatalogException { + if (accessibleAppIds.isEmpty() || accessibleCompHostIds.isEmpty()) { + return Collections.emptyList(); + } Map queryParameters = new HashMap<>(); queryParameters.put(DBConstants.ApplicationDeployment.GATEWAY_ID, gatewayId); queryParameters.put(DBConstants.ApplicationDeployment.ACCESSIBLE_APPLICATION_DEPLOYMENT_IDS, accessibleAppIds); @@ -198,6 +198,9 @@ public class ApplicationDeploymentRepository extends AppCatAbstractRepository getAccessibleApplicationDeployments(String gatewayId, String appModuleId, List accessibleAppIds, List accessibleComputeResourceIds) throws AppCatalogException { + if (accessibleAppIds.isEmpty() || accessibleComputeResourceIds.isEmpty()) { + return Collections.emptyList(); + } Map queryParameters = new HashMap<>(); queryParameters.put(DBConstants.ApplicationDeployment.GATEWAY_ID, gatewayId); queryParameters.put(DBConstants.ApplicationDeployment.APPLICATION_MODULE_ID, appModuleId); diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationInterfaceRepository.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationInterfaceRepository.java index 2bad1bf..080fdd0 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationInterfaceRepository.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationInterfaceRepository.java @@ -19,16 +19,19 @@ */ package org.apache.airavata.registry.core.repositories.appcatalog; -import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule; import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription; import org.apache.airavata.model.appcatalog.appinterface.application_interface_modelConstants; import org.apache.airavata.model.application.io.InputDataObjectType; import org.apache.airavata.model.application.io.OutputDataObjectType; -import org.apache.airavata.registry.core.utils.*; +import org.apache.airavata.registry.core.entities.appcatalog.AppModuleMappingEntity; +import org.apache.airavata.registry.core.entities.appcatalog.ApplicationInterfaceEntity; +import org.apache.airavata.registry.core.entities.appcatalog.ApplicationModuleEntity; +import org.apache.airavata.registry.core.utils.DBConstants; +import org.apache.airavata.registry.core.utils.ObjectMapperSingleton; +import org.apache.airavata.registry.core.utils.QueryConstants; import org.apache.airavata.registry.cpi.AppCatalogException; import org.apache.airavata.registry.cpi.ApplicationInterface; -import org.apache.airavata.registry.core.entities.appcatalog.*; import org.dozer.Mapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -216,8 +219,10 @@ public class ApplicationInterfaceRepository extends AppCatAbstractRepository getAccessibleApplicationModules(String gatewayId, List accessibleAppIds, List accessibleCompHostIds) throws AppCatalogException { + if (accessibleAppIds.isEmpty() || accessibleCompHostIds.isEmpty()) { + return Collections.emptyList(); + } ApplicationModuleRepository applicationModuleRepository = new ApplicationModuleRepository(); - ApplicationDeploymentRepository deploymentRepository = new ApplicationDeploymentRepository(); Map queryParameters = new HashMap<>(); queryParameters.put(DBConstants.ApplicationModule.GATEWAY_ID, gatewayId); queryParameters.put(DBConstants.ApplicationDeployment.ACCESSIBLE_APPLICATION_DEPLOYMENT_IDS, accessibleAppIds);