Repository: incubator-griffin Updated Branches: refs/heads/master a5058fce7 -> 2bf056ac9
fix organization null bug and return similar response for not found Author: baozhu <[email protected]> Closes #275 from forshareIT/master. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/2bf056ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/2bf056ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/2bf056ac Branch: refs/heads/master Commit: 2bf056ac9e91fe4ce3728065340ae9ead896ac64 Parents: a5058fc Author: baozhu <[email protected]> Authored: Fri May 4 09:48:37 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Fri May 4 09:48:37 2018 +0800 ---------------------------------------------------------------------- .../apache/griffin/core/exception/GriffinExceptionMessage.java | 1 + .../org/apache/griffin/core/measure/MeasureOrgServiceImpl.java | 6 +++++- .../java/org/apache/griffin/core/measure/repo/MeasureRepo.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2bf056ac/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionMessage.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionMessage.java b/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionMessage.java index aab8769..e298797 100644 --- a/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionMessage.java +++ b/service/src/main/java/org/apache/griffin/core/exception/GriffinExceptionMessage.java @@ -37,6 +37,7 @@ public enum GriffinExceptionMessage { MEASURE_ID_DOES_NOT_EXIST(40401, "Measure id does not exist"), JOB_ID_DOES_NOT_EXIST(40402, "Job id does not exist"), JOB_NAME_DOES_NOT_EXIST(40403, "Job name does not exist"), + ORGANIZATION_NAME_DOES_NOT_EXIST(40404, "Organization name does not exist"), //409, "Conflict" MEASURE_NAME_ALREADY_EXIST(40901, "Measure name already exists"), http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2bf056ac/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java b/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java index 1d64830..22b4347 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java +++ b/service/src/main/java/org/apache/griffin/core/measure/MeasureOrgServiceImpl.java @@ -43,7 +43,11 @@ public class MeasureOrgServiceImpl implements MeasureOrgService { @Override public List<String> getMetricNameListByOrg(String org) { - return measureRepo.findNameByOrganization(org, false); + List<String> orgs = measureRepo.findNameByOrganization(org, false); + if (CollectionUtils.isEmpty(orgs)) { + throw new GriffinException.NotFoundException(ORGANIZATION_NAME_DOES_NOT_EXIST); + } + return orgs; } @Override http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2bf056ac/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java b/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java index c88cd3a..a5d3aef 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java +++ b/service/src/main/java/org/apache/griffin/core/measure/repo/MeasureRepo.java @@ -36,7 +36,7 @@ public interface MeasureRepo<T extends Measure> extends CrudRepository<T, Long> T findByIdAndDeleted(Long id, Boolean deleted); - @Query("select DISTINCT m.organization from #{#entityName} m where m.deleted = ?1") + @Query("select DISTINCT m.organization from #{#entityName} m where m.deleted = ?1 and m.organization is not null") List<String> findOrganizations(Boolean deleted); @Query("select m.name from #{#entityName} m " +
