Repository: nifi-registry Updated Branches: refs/heads/master 6c0c05b73 -> d387a321a
NIFIREG-108 Change REST API buckets ordering Changes the list returned by GET /buckets to be alphabetically sorted by bucket name. This is accomplished by adding an ORDER BY clause the SQL in DatabaseMetadataService when querying buckets. This closes #81. Signed-off-by: Bryan Bende <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/d387a321 Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/d387a321 Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/d387a321 Branch: refs/heads/master Commit: d387a321ae8a06ed03453e2eed4916bb8b74ff2e Parents: 6c0c05b Author: Kevin Doran <[email protected]> Authored: Tue Jan 9 12:18:52 2018 -0500 Committer: Bryan Bende <[email protected]> Committed: Wed Jan 10 11:04:39 2018 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/registry/db/DatabaseMetadataService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/d387a321/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java ---------------------------------------------------------------------- diff --git a/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java b/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java index a3fe74f..4d32790 100644 --- a/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java +++ b/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java @@ -71,7 +71,7 @@ public class DatabaseMetadataService implements MetadataService { @Override public List<BucketEntity> getBucketsByName(final String name) { - final String sql = "SELECT * FROM bucket WHERE name = ?"; + final String sql = "SELECT * FROM bucket WHERE name = ? ORDER BY name ASC"; return jdbcTemplate.query(sql, new Object[] {name} , new BucketEntityRowMapper()); } @@ -114,14 +114,15 @@ public class DatabaseMetadataService implements MetadataService { } sqlBuilder.append("?"); } - sqlBuilder.append(")"); + sqlBuilder.append(") "); + sqlBuilder.append("ORDER BY name ASC"); return jdbcTemplate.query(sqlBuilder.toString(), bucketIds.toArray(), new BucketEntityRowMapper()); } @Override public List<BucketEntity> getAllBuckets() { - final String sql = "SELECT * FROM bucket"; + final String sql = "SELECT * FROM bucket ORDER BY name ASC"; return jdbcTemplate.query(sql, new BucketEntityRowMapper()); }
