Adding GetSystemInformation and verify system health calls to the sdk.

Author: rpmoore

ds3-sdk/src/main/java/com/spectralogic/ds3client/Ds3Client.java

@@ -296,6 +296,14 @@ NotificationResponse getTapeFailureNotification(GetTapeFailureNotificationReques
 
     DeleteNotificationResponse deleteTapeFailureNotification(DeleteTapeFailureNotificationRequest request)
             throws IOException, SignatureException;
+
+    GetSystemHealthResponse getSystemHealth(GetSystemHealthRequest request)
+            throws IOException, SignatureException;
+
+    GetSystemInformationResponse getSystemInformation(GetSystemInformationRequest request)
+            throws IOException, SignatureException;
+
+
     /**
      * Creates a new Ds3Client instance for the system pointed to by Node.
      */

ds3-sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientImpl.java

@@ -245,6 +245,16 @@ public DeleteNotificationResponse deleteTapeFailureNotification(DeleteTapeFailur
         return new DeleteNotificationResponse(this.netClient.getResponse(request));
     }
 
+    @Override
+    public GetSystemHealthResponse getSystemHealth(final GetSystemHealthRequest request) throws IOException, SignatureException {
+        return new GetSystemHealthResponse(this.netClient.getResponse(request));
+    }
+
+    @Override
+    public GetSystemInformationResponse getSystemInformation(final GetSystemInformationRequest request) throws IOException, SignatureException {
+        return new GetSystemInformationResponse(this.netClient.getResponse(request));
+    }
+
     @Override
     public Ds3Client newForNode(final Node node) {
         final ConnectionDetails newConnectionDetails = ConnectionDetailsImpl.newForNode(node, this.getConnectionDetails());

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetSystemHealthRequest.java

@@ -0,0 +1,30 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ****************************************************************************
+ */
+
+package com.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.HttpVerb;
+
+public class GetSystemHealthRequest extends AbstractRequest {
+    @Override
+    public String getPath() {
+        return "/_rest_/system_health";
+    }
+
+    @Override
+    public HttpVerb getVerb() {
+        return HttpVerb.GET;
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetSystemHealthResponse.java

@@ -0,0 +1,46 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ****************************************************************************
+ */
+
+package com.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.models.SystemHealth;
+import com.spectralogic.ds3client.networking.WebResponse;
+import com.spectralogic.ds3client.serializer.XmlOutput;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class GetSystemHealthResponse extends AbstractResponse {
+
+    private SystemHealth systemHealth;
+
+    public GetSystemHealthResponse(final WebResponse response) throws IOException {
+        super(response);
+    }
+
+    @Override
+    protected void processResponse() throws IOException {
+        try (final WebResponse response = getResponse()) {
+            this.checkStatusCode(200);
+            try (final InputStream inputStream = response.getResponseStream()) {
+                this.systemHealth = XmlOutput.fromXml(inputStream, SystemHealth.class);
+            }
+        }
+    }
+
+    public SystemHealth getSystemHealth() {
+        return this.systemHealth;
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetSystemInformationRequest.java

@@ -0,0 +1,30 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ****************************************************************************
+ */
+
+package com.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.HttpVerb;
+
+public class GetSystemInformationRequest extends AbstractRequest {
+    @Override
+    public String getPath() {
+        return "/_rest_/system_information";
+    }
+
+    @Override
+    public HttpVerb getVerb() {
+        return HttpVerb.GET;
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetSystemInformationResponse.java

@@ -0,0 +1,46 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ****************************************************************************
+ */
+
+package com.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.models.SystemInformation;
+import com.spectralogic.ds3client.networking.WebResponse;
+import com.spectralogic.ds3client.serializer.XmlOutput;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class GetSystemInformationResponse extends AbstractResponse {
+
+    private SystemInformation systemInformation;
+
+    public GetSystemInformationResponse(final WebResponse response) throws IOException {
+        super(response);
+    }
+
+    @Override
+    protected void processResponse() throws IOException {
+        try (final WebResponse response = getResponse()) {
+            this.checkStatusCode(200);
+            try (final InputStream inputStream = response.getResponseStream()) {
+                this.systemInformation = XmlOutput.fromXml(inputStream, SystemInformation.class);
+            }
+        }
+    }
+
+    public SystemInformation getSystemInformation() {
+        return this.systemInformation;
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/models/SystemHealth.java

@@ -0,0 +1,33 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ****************************************************************************
+ */
+
+package com.spectralogic.ds3client.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(namespace = "Data")
+public class SystemHealth {
+    @JsonProperty("MsRequiredToVerifyDataPlannerHealth")
+    private long timeToVerifyHealth;
+
+    public long getTimeToVerifyHealth() {
+      return timeToVerifyHealth;
+   }
+
+    public void setTimeToVerifyHealth(long timeToVerifyHealth) {
+      this.timeToVerifyHealth = timeToVerifyHealth;
+   }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/models/SystemInformation.java

@@ -0,0 +1,86 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ****************************************************************************
+ */
+
+package com.spectralogic.ds3client.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+
+@JacksonXmlRootElement(namespace = "Data")
+public class SystemInformation {
+    @JsonProperty("ApiVersion")
+    private String apiVersion;
+    @JsonProperty("BuildInformation")
+    private BuildInformation buildInformation;
+    @JsonProperty("SerialNumber")
+    private String serialNumber;
+
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    public BuildInformation getBuildInformation() {
+        return buildInformation;
+    }
+
+    public void setBuildInformation(BuildInformation buildInformation) {
+        this.buildInformation = buildInformation;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public static class BuildInformation {
+        @JsonProperty("Branch")
+        private String branch;
+        @JsonProperty("Revision")
+        private String revision;
+        @JsonProperty("Version")
+        private String version;
+
+        public String getBranch() {
+            return branch;
+        }
+
+        public void setBranch(String branch) {
+            this.branch = branch;
+        }
+
+        public String getRevision() {
+            return revision;
+        }
+
+        public void setRevision(String revision) {
+            this.revision = revision;
+        }
+
+        public String getVersion() {
+            return version;
+        }
+
+        public void setVersion(String version) {
+            this.version = version;
+        }
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/serializer/XmlOutput.java

@@ -25,6 +25,7 @@
 import com.spectralogic.ds3client.models.bulk.Ds3ObjectList;
 
 import java.io.IOException;
+import java.io.InputStream;
 
 public class XmlOutput {
     private static final JacksonXmlModule module;
@@ -68,4 +69,8 @@ public static String toXml(final Ds3ObjectList objects, final BulkCommand comman
     public static<T> T fromXml(final String xmlString, final Class<T> type) throws IOException {
         return mapper.readValue(xmlString, type);
     }
+
+    public static<T> T fromXml(final InputStream stream, final Class<T> type) throws IOException {
+        return mapper.readValue(stream, type);
+    }
 }