Merge pull request #527 from SpectraLogic/ltfs_metadata_3_5

Adding ltfs header prefix to metadata.

Author: rpmoore

ds3-sdk/src/test/java/com/spectralogic/ds3client/commands/MetadataImpl_Test.java

@@ -68,6 +68,30 @@ public void getMultiValueWithSpace() {
         assertThat(value.get(2), is("value3"));
     }
 
+    @Test
+    public void getSingleValueLtfs() {
+        final String userGuid = "060a2b340101010101010f0013-000000-709e29c2d1e20085-e7610015b2a9-a854";
+        final Metadata metadata = genMetadata(new BasicHeader("x-spectra-ltfs-user.guid", userGuid));
+        final List<String> userGuids = metadata.get("user.guid");
+        assertThat(userGuids, is(notNullValue()));
+        assertFalse(userGuids.isEmpty());
+        assertThat(userGuids.size(), is(1));
+        assertThat(userGuids.get(0), is(userGuid));
+    }
+
+    @Test
+    public void getTwoValuesLtfs() {
+        final String userGuid1 = "060a2b340101010101010f0013-000000-709e29c2d1e20085-e7610015b2a9-a854";
+        final String userGuid2 = "160a2b340101010101010f0013-000000-709e29c2d1e20085-e7610015b2a9-a854";
+        final Metadata metadata = genMetadata(new BasicHeader("x-spectra-ltfs-user.guid", userGuid1 + "," + userGuid2));
+        final List<String> userGuids = metadata.get("user.guid");
+        assertThat(userGuids, is(notNullValue()));
+        assertFalse(userGuids.isEmpty());
+        assertThat(userGuids.size(), is(2));
+        assertThat(userGuids.get(0), is(userGuid1));
+        assertThat(userGuids.get(1), is(userGuid2));
+    }
+
     private Metadata genMetadata(final Header... headers) {
 
         final ImmutableMultimap.Builder<String, String> mapBuilder = ImmutableMultimap.builder();

ds3-utils/src/main/java/com/spectralogic/ds3client/commands/interfaces/MetadataImpl.java

@@ -30,7 +30,8 @@
 public class MetadataImpl implements Metadata {
 
     private static final String X_AMZ_META = "x-amz-meta-";
-    final ImmutableMultimap<String, String> metadata;
+    private static final String LTFS_METADATA_PREFIX = "x-spectra-ltfs-";
+    private final ImmutableMultimap<String, String> metadata;
 
     public MetadataImpl(final Headers headers) {
         this.metadata  = genMetadata(headers);
@@ -45,17 +46,27 @@ private static ImmutableMultimap<String, String> genMetadata(final Headers heade
         final ImmutableMultimap.Builder<String, String> mapBuilder = ImmutableMultimap.builder();
 
         for (final String key : headers.keys()) {
-            if (key.startsWith(X_AMZ_META)) {
-                final String name = toDecodedString(key.substring(X_AMZ_META.length()));
+            final String keyWithoutPrefix = metadataKey(key);
 
+            if ( ! keyWithoutPrefix.isEmpty()) {
                 final List<String> values = getValues(headers, key);
-                mapBuilder.putAll(name, values);
+                mapBuilder.putAll(keyWithoutPrefix, values);
             }
         }
 
         return mapBuilder.build();
     }
 
+    private static String metadataKey(final String key) {
+        if (key.startsWith(X_AMZ_META)) {
+            return toDecodedString(key.substring(X_AMZ_META.length()));
+        } else if (key.startsWith(LTFS_METADATA_PREFIX)) {
+            return toDecodedString(key.substring(LTFS_METADATA_PREFIX.length()));
+        }
+
+        return "";
+    }
+
     private static List<String> getValues(final Headers headers, final String key) {
         final List<String> valueList = headers.get(key);
         final List<String> returnList = new ArrayList<>(valueList.size());