AMBARI-22247 : Return display name when requesting mpack info (mradhakrishnan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5451ba53 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5451ba53 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5451ba53 Branch: refs/heads/branch-feature-AMBARI-14714-ui Commit: 5451ba53c69aa115719ef83ff6171787c0fbacdc Parents: 841cc7e Author: Madhuvanthi Radhakrishnan <[email protected]> Authored: Thu Oct 19 14:13:00 2017 -0700 Committer: Madhuvanthi Radhakrishnan <[email protected]> Committed: Thu Oct 19 14:15:23 2017 -0700 ---------------------------------------------------------------------- .../ambari/server/controller/RegistryMpackResponse.java | 11 ++++++++++- .../internal/RegistryMpackResourceProvider.java | 5 +++++ .../org/apache/ambari/server/registry/RegistryMpack.java | 6 ++++++ .../ambari/server/registry/json/JsonRegistryMpack.java | 6 ++++++ 4 files changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5451ba53/ambari-server/src/main/java/org/apache/ambari/server/controller/RegistryMpackResponse.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/RegistryMpackResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/RegistryMpackResponse.java index b12a866..1bc9659 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/RegistryMpackResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/RegistryMpackResponse.java @@ -27,6 +27,7 @@ import io.swagger.annotations.ApiModelProperty; public class RegistryMpackResponse { private Long registryId; private String mpackName; + private String mpackDisplayName; private String mpackDescription; private String mpackLogoUrl; @@ -34,12 +35,14 @@ public class RegistryMpackResponse { * Constructor * @param registryId registry id * @param mpackName mpack name + * @param mpackDisplayName mpack Display Name * @param mpackDescription mpack description * @param mpackLogoUrl mpack logo url */ - public RegistryMpackResponse(Long registryId, String mpackName, String mpackDescription, String mpackLogoUrl) { + public RegistryMpackResponse(Long registryId, String mpackName, String mpackDisplayName, String mpackDescription, String mpackLogoUrl) { this.registryId = registryId; this.mpackName = mpackName; + this.mpackDisplayName = mpackDisplayName; this.mpackDescription = mpackDescription; this.mpackLogoUrl = mpackLogoUrl; } @@ -61,6 +64,12 @@ public class RegistryMpackResponse { } /** + * Get mpack summary + * @return + */ + public String getMpackDisplayName() {return mpackDisplayName;} + + /** * Get mpack description * @return mpack description */ http://git-wip-us.apache.org/repos/asf/ambari/blob/5451ba53/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackResourceProvider.java index 69d3d63..3e5d896 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackResourceProvider.java @@ -50,6 +50,7 @@ public class RegistryMpackResourceProvider extends AbstractControllerResourcePro public static final String ALL_PROPERTIES = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "*"; public static final String REGISTRY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "registry_id"; public static final String REGISTRY_MPACK_NAME = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "mpack_name"; + public static final String REGISTRY_MPACK_DISPLAY_NAME = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "mpack_display_name"; public static final String REGISTRY_MPACK_DESC = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "mpack_description"; public static final String REGISTRY_MPACK_LOGO_URL = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "mpack_logo_url"; @@ -70,6 +71,7 @@ public class RegistryMpackResourceProvider extends AbstractControllerResourcePro // properties PROPERTY_IDS.add(REGISTRY_ID); PROPERTY_IDS.add(REGISTRY_MPACK_NAME); + PROPERTY_IDS.add(REGISTRY_MPACK_DISPLAY_NAME); PROPERTY_IDS.add(REGISTRY_MPACK_DESC); PROPERTY_IDS.add(REGISTRY_MPACK_LOGO_URL); @@ -129,6 +131,7 @@ public class RegistryMpackResourceProvider extends AbstractControllerResourcePro Resource resource = new ResourceImpl(Resource.Type.RegistryMpack); setResourceProperty(resource, REGISTRY_ID, response.getRegistryId(), requestedIds); setResourceProperty(resource, REGISTRY_MPACK_NAME, response.getMpackName(), requestedIds); + setResourceProperty(resource, REGISTRY_MPACK_DISPLAY_NAME, response.getMpackDisplayName(), requestedIds); setResourceProperty(resource, REGISTRY_MPACK_DESC, response.getMpackDescription(), requestedIds); setResourceProperty(resource, REGISTRY_MPACK_LOGO_URL, response.getMpackLogoUrl(), requestedIds); resources.add(resource); @@ -182,6 +185,7 @@ public class RegistryMpackResourceProvider extends AbstractControllerResourcePro RegistryMpackResponse response = new RegistryMpackResponse( registry.getRegistryId(), registryMpack.getMpackName(), + registryMpack.getSummary(), registryMpack.getMpackDescription(), registryMpack.getMpackLogoUrl()); responses.add(response); @@ -192,6 +196,7 @@ public class RegistryMpackResourceProvider extends AbstractControllerResourcePro RegistryMpackResponse response = new RegistryMpackResponse( registry.getRegistryId(), registryMpack.getMpackName(), + registryMpack.getSummary(), registryMpack.getMpackDescription(), registryMpack.getMpackLogoUrl()); responses.add(response); http://git-wip-us.apache.org/repos/asf/ambari/blob/5451ba53/ambari-server/src/main/java/org/apache/ambari/server/registry/RegistryMpack.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/registry/RegistryMpack.java b/ambari-server/src/main/java/org/apache/ambari/server/registry/RegistryMpack.java index dd8004f..d15a146 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/registry/RegistryMpack.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/registry/RegistryMpack.java @@ -32,6 +32,12 @@ public interface RegistryMpack { public String getMpackName(); /** + * Get mpack display name + * @return + */ + public String getMpackDisplayName(); + + /** * Get mpack description * @return */ http://git-wip-us.apache.org/repos/asf/ambari/blob/5451ba53/ambari-server/src/main/java/org/apache/ambari/server/registry/json/JsonRegistryMpack.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/registry/json/JsonRegistryMpack.java b/ambari-server/src/main/java/org/apache/ambari/server/registry/json/JsonRegistryMpack.java index 2aac1f0..d58a29d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/registry/json/JsonRegistryMpack.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/registry/json/JsonRegistryMpack.java @@ -35,6 +35,9 @@ public class JsonRegistryMpack implements RegistryMpack { @SerializedName("name") private String name; + @SerializedName("displayName") + private String displayName; + @SerializedName("description") private String description; @@ -50,6 +53,9 @@ public class JsonRegistryMpack implements RegistryMpack { } @Override + public String getMpackDisplayName() {return displayName;} + + @Override public String getMpackDescription() { return description; }
