merge status response into cluster status response

Author: BrandonArp

src/main/java/com/arpnetworking/clusteraggregator/http/Routes.java

@@ -45,8 +45,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import scala.compat.java8.FutureConverters;
 import scala.concurrent.Future;
@@ -131,11 +129,6 @@ private CompletionStage<HttpResponse> process(final HttpRequest request) {
                                                                 + (isHealthy ? HEALTHY_STATE : UNHEALTHY_STATE)
                                                                 + "\"}")));
             } else if (_statusPath.equals(request.getUri().path())) {
-                return CompletableFuture.completedFuture(
-                        HttpResponse.create()
-                                .withStatus(StatusCodes.OK)
-                                .withEntity(JSON_CONTENT_TYPE, ByteString.fromString(STATUS_JSON)));
-            } else if (STATUS_PATH.equals(request.getUri().path())) {
                 return ask("/user/status", new Status.StatusRequest(), (StatusResponse) null)
                         .thenApply(
                                 status -> {
@@ -197,29 +190,11 @@ private String createTimerName(final HttpRequest request) {
             CacheDirectives.MUST_REVALIDATE);
     private static final String UNHEALTHY_STATE = "UNHEALTHY";
     private static final String HEALTHY_STATE = "HEALTHY";
-    private static final String STATUS_JSON;
 
     private static final ContentType JSON_CONTENT_TYPE = ContentTypes.APPLICATION_JSON;
 
     private static final long serialVersionUID = -1573473630801540757L;
 
-    static {
-        String statusJson = "{}";
-        try {
-            statusJson = Resources.toString(Resources.getResource("status.json"), Charsets.UTF_8);
-            // CHECKSTYLE.OFF: IllegalCatch - Prevent program shutdown
-        } catch (final Exception e) {
-            // CHECKSTYLE.ON: IllegalCatch
-            LOGGER.error()
-                    .setMessage("Resource load failure")
-                    .addData("resource", "status.json")
-                    .setThrowable(e)
-                    .log();
-        }
-        STATUS_JSON = statusJson;
-
-    }
-
     private static class MemberSerializer extends JsonSerializer<Member> {
         @Override
         public void serialize(

src/main/java/com/arpnetworking/clusteraggregator/models/StatusResponse.java

@@ -19,13 +19,20 @@
 import akka.cluster.Member;
 import com.arpnetworking.clusteraggregator.ClusterStatusCache;
 import com.arpnetworking.commons.builder.OvalBuilder;
+import com.arpnetworking.commons.jackson.databind.ObjectMapperFactory;
+import com.arpnetworking.steno.Logger;
+import com.arpnetworking.steno.LoggerFactory;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.google.common.base.Charsets;
 import com.google.common.base.Optional;
 import com.google.common.collect.Iterables;
+import com.google.common.io.Resources;
+import net.sf.oval.constraint.NotEmpty;
+import net.sf.oval.constraint.NotNull;
 import org.joda.time.Period;
 import scala.collection.JavaConversions;
 
@@ -70,6 +77,18 @@ public Optional<List<ShardAllocation>> getAllocations() {
         return _allocations.transform(Collections::unmodifiableList);
     }
 
+    public String getVersion() {
+        return VERSION_INFO.getVersion();
+    }
+
+    public String getName() {
+        return VERSION_INFO.getName();
+    }
+
+    public String getSha() {
+        return VERSION_INFO.getSha();
+    }
+
     private StatusResponse(final Builder builder) {
         if (builder._clusterState == null) {
             _clusterLeader = null;
@@ -101,6 +120,31 @@ private <T> Optional<T> flatten(final Optional<Optional<T>> value) {
     private final Map<Period, PeriodMetrics> _localMetrics;
     private final Optional<List<ShardAllocation>> _allocations;
 
+    private static final VersionInfo VERSION_INFO;
+    private static final Logger LOGGER = LoggerFactory.getLogger(StatusResponse.class);
+
+    static {
+        StatusResponse.VersionInfo versionInfo = null;
+        try {
+            versionInfo =
+                    ObjectMapperFactory.getInstance().readValue(
+                            Resources.toString(Resources.getResource("status.json"), Charsets.UTF_8),
+                            StatusResponse.VersionInfo.class);
+        } catch (final IOException e) {
+            LOGGER.error()
+                    .setMessage("Resource load failure")
+                    .addData("resource", "status.json")
+                    .setThrowable(e)
+                    .log();
+            versionInfo = new StatusResponse.VersionInfo.Builder()
+                    .setVersion("UNKNOWN")
+                    .setName("UNKNOWN")
+                    .setSha("")
+                    .build();
+        }
+        VERSION_INFO = versionInfo;
+    }
+
     /**
      * Builder for a {@link StatusResponse}.
      */
@@ -162,6 +206,90 @@ public Builder setLocalMetrics(final Map<Period, PeriodMetrics> value) {
         private Map<Period, PeriodMetrics> _localMetrics;
     }
 
+    /**
+     * Represents the model for the version of the service currently running.
+     *
+     * @author Brandon Arp (brandon dot arp at smartsheet dot com)
+     */
+    private static final class VersionInfo {
+        public String getName() {
+            return _name;
+        }
+
+        public String getVersion() {
+            return _version;
+        }
+
+        public String getSha() {
+            return _sha;
+        }
+
+        private VersionInfo(final Builder builder) {
+            _name = builder._name;
+            _version = builder._version;
+            _sha = builder._sha;
+        }
+
+        private String _name;
+        private String _version;
+        private String _sha;
+
+        /**
+         * Builder for a {@link VersionInfo}.
+         */
+        private static final class Builder extends OvalBuilder<VersionInfo> {
+            /**
+             * Public constructor.
+             */
+            private Builder() {
+                super(VersionInfo::new);
+            }
+
+            /**
+             * Sets the name of the application. Required. Cannot be null. Cannot be empty.
+             *
+             * @param value The name of the application.
+             * @return This builder.
+             */
+            public Builder setName(final String value) {
+                _name = value;
+                return this;
+            }
+
+            /**
+             * Sets the name or tag of the version. Required. Cannot be null. Cannot be empty.
+             *
+             * @param value The name of the version.
+             * @return This builder.
+             */
+            public Builder setVersion(final String value) {
+                _version = value;
+                return this;
+            }
+
+            /**
+             * Sets the SHA. Required. Cannot be null. Cannot be empty.
+             *
+             * @param value The SHA.
+             * @return This builder.
+             */
+            public Builder setSha(final String value) {
+                _sha = value;
+                return this;
+            }
+
+            @NotNull
+            @NotEmpty
+            private String _name;
+            @NotNull
+            @NotEmpty
+            private String _version;
+            @NotNull
+            @NotEmpty
+            private String _sha;
+        }
+    }
+
     private static final class MemberSerializer extends JsonSerializer<Member> {
         /**
          * {@inheritDoc}