Merge pull request #460 from RachelTucker/net_4_1

SA-227 4.1 API for Net module with blob checksum header support

Author: rpmoore

ds3-autogen-net/src/main/resources/tmpls/net/parsers/response/head_object_parser.ftl

@@ -14,6 +14,8 @@ namespace Ds3.ResponseParsers
             using (response)
             {
                 return new ${responseName}(
+                    ResponseParseUtilities.ParseBlobChecksumHeaders(response.Headers),
+                    ResponseParseUtilities.ParseBlobChecksumTypeHeader(response.Headers),
                     long.Parse(response.Headers.Single(kvp => kvp.Key.ToLowerInvariant() == "content-length").Value),
                     response.Headers.Single(kvp => kvp.Key.ToLowerInvariant() == "etag").Value,
                     ResponseParseUtilities.ExtractCustomMetadata(response.Headers)

ds3-autogen-net/src/main/resources/tmpls/net/response/head_object_response.ftl

@@ -1,22 +1,25 @@
 <#include "../common/copyright.ftl" />
 
 
-using System.Net;
-using System.IO;
 using System.Collections.Generic;
+using Ds3.Models;
 
 using Ds3.Runtime;
 
 namespace Ds3.Calls
 {
     public class ${name}
     {
+        public IDictionary<long, string> BlobChecksums { get; private set; }
+        public ChecksumType.Type BlobChecksumType { get; private set; }
         public IDictionary<string, string> Metadata { get; private set; }
         public string ETag { get; private set; }
         public long Length { get; private set; }
 
-        public ${name}(long length, string eTag, IDictionary<string, string> metadata)
+        public ${name}(IDictionary<long, string> blobChecksums, ChecksumType.Type blobChecksumType, long length, string eTag, IDictionary<string, string> metadata)
         {
+            this.BlobChecksums = blobChecksums;
+            this.BlobChecksumType = blobChecksumType;
             this.Length = length;
             this.ETag = eTag;
             this.Metadata = metadata;

ds3-autogen-net/src/test/java/com/spectralogic/ds3autogen/net/NetFunctionalTests.java

@@ -43,7 +43,7 @@
 public class NetFunctionalTests {
 
     private final static Logger LOG = LoggerFactory.getLogger(NetFunctionalTests.class);
-    private final static GeneratedCodeLogger CODE_LOGGER = new GeneratedCodeLogger(FileTypeToLog.REQUEST, LOG);
+    private final static GeneratedCodeLogger CODE_LOGGER = new GeneratedCodeLogger(FileTypeToLog.PARSER, LOG);
 
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();
@@ -1433,13 +1433,26 @@ public void headObjectRequest() throws IOException, TemplateModelException {
         final String responseCode = codeGenerator.getResponseCode();
         CODE_LOGGER.logFile(responseCode, FileTypeToLog.RESPONSE);
         assertTrue(hasContent(responseCode));
-        assertTrue(responseCode.contains("public HeadObjectResponse(long length, string eTag, IDictionary<string, string> metadata)"));
+        assertTrue(responseCode.contains("using System.Collections.Generic;"));
+        assertTrue(responseCode.contains("using Ds3.Models;"));
+        assertTrue(responseCode.contains("public IDictionary<long, string> BlobChecksums { get; private set; }"));
+        assertTrue(responseCode.contains("public ChecksumType.Type BlobChecksumType { get; private set; }"));
+        assertTrue(responseCode.contains("public IDictionary<string, string> Metadata { get; private set; }"));
+        assertTrue(responseCode.contains("public string ETag { get; private set; }"));
+        assertTrue(responseCode.contains("public long Length { get; private set; }"));
+        assertTrue(responseCode.contains("public HeadObjectResponse(IDictionary<long, string> blobChecksums, ChecksumType.Type blobChecksumType, long length, string eTag, IDictionary<string, string> metadata)"));
 
         //Generate Parser
         final String parserCode = codeGenerator.getParserCode();
         CODE_LOGGER.logFile(parserCode, FileTypeToLog.PARSER);
         assertTrue(hasContent(parserCode));
 
+        assertTrue(parserCode.contains("ResponseParseUtilities.ParseBlobChecksumHeaders(response.Headers),"));
+        assertTrue(parserCode.contains("ResponseParseUtilities.ParseBlobChecksumTypeHeader(response.Headers),"));
+        assertTrue(parserCode.contains("long.Parse(response.Headers.Single(kvp => kvp.Key.ToLowerInvariant() == \"content-length\").Value),"));
+        assertTrue(parserCode.contains("response.Headers.Single(kvp => kvp.Key.ToLowerInvariant() == \"etag\").Value,"));
+        assertTrue(parserCode.contains("ResponseParseUtilities.ExtractCustomMetadata(response.Headers)"));
+
         //Generate Client code
         final String commandName = requestName.replace("Request", "");
         final String clientCode = codeGenerator.getClientCode();