Repository: incubator-griffin Updated Branches: refs/heads/master 2bf056ac9 -> 8171ab254
fix bug of 500 internal error in getting organization list fix bug of 500 internal error in getting organization list Author: Yilia05 <[email protected]> Closes #277 from Yilia05/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/8171ab25 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/8171ab25 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/8171ab25 Branch: refs/heads/master Commit: 8171ab254f3fe97be45bf3dc93cb63bd49922675 Parents: 2bf056a Author: Yilia05 <[email protected]> Authored: Thu May 10 18:04:08 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Thu May 10 18:04:08 2018 +0800 ---------------------------------------------------------------------- griffin-doc/service/api-guide.md | 1 + .../org/apache/griffin/core/measure/MeasureOrgServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/8171ab25/griffin-doc/service/api-guide.md ---------------------------------------------------------------------- diff --git a/griffin-doc/service/api-guide.md b/griffin-doc/service/api-guide.md index 773465b..cdd73ac 100644 --- a/griffin-doc/service/api-guide.md +++ b/griffin-doc/service/api-guide.md @@ -98,6 +98,7 @@ Note that 'exception' field may not exist if it is caused by client error, and ' <h2 id = "2"></h2> ## Measures + ### Add measure `POST /api/v1/measures` http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/8171ab25/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 22b4347..c498893 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 @@ -19,6 +19,8 @@ under the License. package org.apache.griffin.core.measure; +import org.apache.commons.collections.CollectionUtils; +import org.apache.griffin.core.exception.GriffinException; import org.apache.griffin.core.measure.entity.GriffinMeasure; import org.apache.griffin.core.measure.entity.Measure; import org.apache.griffin.core.measure.repo.GriffinMeasureRepo; @@ -54,11 +56,9 @@ public class MeasureOrgServiceImpl implements MeasureOrgService { public Map<String, List<String>> getMeasureNamesGroupByOrg() { Map<String, List<String>> orgWithMetricsMap = new HashMap<>(); List<GriffinMeasure> measures = measureRepo.findByDeleted(false); - if (measures == null) { - return null; - } for (Measure measure : measures) { String orgName = measure.getOrganization(); + orgName = orgName == null ? "null" : orgName; String measureName = measure.getName(); List<String> measureList = orgWithMetricsMap.getOrDefault(orgName, new ArrayList<>()); measureList.add(measureName);
