Redesign the classes for sdk and test cases

Author: sulabhjain1991

ds3-sdk/src/main/java/com/spectralogic/ds3client/metadata/MACMetaDataRestore.java renamed to ds3-sdk/src/main/java/com/spectralogic/ds3client/metadata/MACMetadataRestore.java

@@ -13,10 +13,9 @@
  * ****************************************************************************
  */
 
-// This code is auto-generated, do not modify
 package com.spectralogic.ds3client.metadata;
 
-import com.spectralogic.ds3client.metadata.interfaces.MetaDataRestoreListener;
+import com.spectralogic.ds3client.metadata.interfaces.MetadataRestoreListener;
 import com.spectralogic.ds3client.networking.Metadata;
 
 import java.text.SimpleDateFormat;
@@ -25,9 +24,9 @@
 import static com.spectralogic.ds3client.utils.MetadataKeyConstants.*;
 
 
-public class MACMetaDataRestore extends PosixMetaDataRestore {
-    public MACMetaDataRestore(final Metadata metadata, final String filePath, final String localOS, final MetaDataRestoreListener metaDataRestoreListener) {
-        super(metadata, filePath, localOS,metaDataRestoreListener);
+public class MACMetadataRestore extends PosixMetadataRestore {
+    public MACMetadataRestore(final Metadata metadata, final String filePath, final String localOS, final MetadataRestoreListener metadataRestoreListener) {
+        super(metadata, filePath, localOS, metadataRestoreListener);
     }
 
     /**
@@ -76,10 +75,16 @@ public void restoreFileTimes() {
     private void restoreCreationTimeMAC(final String objectName, final String creationTime) {
         try {
             final ProcessBuilder processBuilder = new ProcessBuilder("touch", "-t", getDate(Long.parseLong(creationTime), "YYYYMMddHHmm"), objectName);
-            processBuilder.start();
+            final Process process = processBuilder.start();
+            //Wait to get exit value
+            final int exitValue = process.waitFor();
+            if(exitValue != 0) {
+                LOG.error("Unable to restore creation time::"+exitValue);
+                metadataRestoreListener.metadataRestoreFailed("Unable to restore creation time ::"+exitValue);
+            }
         } catch (final Exception e) {
             LOG.error("Unable to restore creation time", e);
-            metaDataRestoreListener.metadataRestoreFailed("Unable to restore creation time ::"+e.getMessage());
+            metadataRestoreListener.metadataRestoreFailed("Unable to restore creation time ::"+e.getMessage());
         }
 
     }
@@ -93,10 +98,16 @@ private void restoreCreationTimeMAC(final String objectName, final String creati
     private void restoreModifiedTimeMAC(final String objectName, final String modifiedTime) {
         try {
             final ProcessBuilder processBuilder = new ProcessBuilder("touch", "-mt", getDate(Long.parseLong(modifiedTime), "YYYYMMddHHmm"), objectName);
-            processBuilder.start();
+            final Process process = processBuilder.start();
+            //Wait to get exit value
+            final int exitValue = process.waitFor();
+            if(exitValue != 0) {
+                LOG.error("Unable to restore modified time::"+exitValue);
+                metadataRestoreListener.metadataRestoreFailed("Unable to restore creation time ::"+exitValue);
+            }
         } catch (final Exception e) {
             LOG.error("Unable to restore modified time", e);
-            metaDataRestoreListener.metadataRestoreFailed("Unable to restore modified time ::"+e.getMessage());
+            metadataRestoreListener.metadataRestoreFailed("Unable to restore modified time ::"+e.getMessage());
         }
 
     }

ds3-sdk/src/main/java/com/spectralogic/ds3client/metadata/MetaDataAccessImpl.java

@@ -0,0 +1,95 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2016 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.metadata;
+
+
+import com.google.common.collect.ImmutableMap;
+import com.spectralogic.ds3client.helpers.Ds3ClientHelpers;
+import com.spectralogic.ds3client.metadata.interfaces.MetadataStore;
+import com.spectralogic.ds3client.metadata.interfaces.MetadataStoreListener;
+import com.spectralogic.ds3client.utils.MetaDataUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.PosixFileAttributes;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Implementation of MetaDataAcess Interface
+ * Used to store meta data on Server
+ */
+public class MetadataAccessImpl implements Ds3ClientHelpers.MetadataAccess {
+    static private final Logger LOG = LoggerFactory.getLogger(MetadataAccessImpl.class);
+    private final Map<String, Path> fileMapper;
+    private final MetadataStoreListener metadataStoreListener;
+
+    public MetadataAccessImpl(final Map<String, Path> fileMapper , final MetadataStoreListener metadataStoreListener) {
+        this.fileMapper = fileMapper;
+        this.metadataStoreListener = metadataStoreListener;
+    }
+
+    @Override
+    public Map<String, String> getMetadataValue(final String filename) {
+        try {
+            final Path file = fileMapper.get(filename);
+            return storeMetaData(file).build();
+        } catch (final Exception e) {
+            LOG.error("failed to store Metadata", e);
+            metadataStoreListener.onMetadataFailed("Unable to get MetaData"+e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * @param file local path of file
+     * @return map builder containing the data to be stored on server
+     */
+    private ImmutableMap.Builder<String, String> storeMetaData(final Path file) {
+        final ImmutableMap.Builder<String, String> metadata = new ImmutableMap.Builder<>();
+        new ImmutableMap.Builder<String, String>();
+        try {
+            //get local os name
+            final String localOSName = MetaDataUtil.getOS();
+            final Set<String> setFileAttributes = MetaDataUtil.getSupportedFileAttributes(file);
+            //get metadata store based on os type
+            final MetadataStore metadataStore = new MetadataStoreFactory().getOsSpecificMetadataStore(localOSName, metadata,metadataStoreListener);
+            metadataStore.saveOSMetaData(localOSName);
+
+            final BasicFileAttributes attr = Files.readAttributes(file, BasicFileAttributes.class);
+            final PosixFileAttributes attrPosix = Files.readAttributes(file, PosixFileAttributes.class);
+
+            metadataStore.saveCreationTimeMetaData(attr);
+            metadataStore.saveAccessTimeMetaData(attr);
+            metadataStore.saveLastModifiedTime(attr);
+
+            if(attrPosix != null)
+                metadataStore.saveOSSpecificMetadata(file,attrPosix);
+            else
+                metadataStore.saveOSSpecificMetadata(file,attr);
+
+        } catch (final IOException ioe) {
+            LOG.error("unable to get metadata", ioe);
+            metadataStoreListener.onMetadataFailed("Unable to get MetaData"+ioe.getMessage());
+        }
+        return metadata;
+    }
+
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/metadata/MetadataAccessImpl.java

@@ -13,22 +13,21 @@
  * ****************************************************************************
  */
 
-// This code is auto-generated, do not modify
 package com.spectralogic.ds3client.metadata;
 
 import com.spectralogic.ds3client.helpers.MetadataReceivedListener;
-import com.spectralogic.ds3client.metadata.interfaces.MetaDataRestore;
-import com.spectralogic.ds3client.metadata.interfaces.MetaDataRestoreListener;
+import com.spectralogic.ds3client.metadata.interfaces.MetadataRestore;
+import com.spectralogic.ds3client.metadata.interfaces.MetadataRestoreListener;
 import com.spectralogic.ds3client.networking.Metadata;
 import com.spectralogic.ds3client.utils.MetaDataUtil;
 
 public class MetadataReceivedListenerImpl implements MetadataReceivedListener {
     private String localFilePath = null;
-    private final MetaDataRestoreListener metaDataRestoreListener;
+    private final MetadataRestoreListener metadataRestoreListener;
 
-    public MetadataReceivedListenerImpl(final String localFilePath ,final MetaDataRestoreListener metaDataRestoreListener) {
+    public MetadataReceivedListenerImpl(final String localFilePath ,final MetadataRestoreListener metadataRestoreListener) {
         this.localFilePath = localFilePath;
-        this.metaDataRestoreListener = metaDataRestoreListener;
+        this.metadataRestoreListener = metadataRestoreListener;
     }
 
     @Override
@@ -46,18 +45,16 @@ public void metadataReceived(final String filename, final Metadata metadata) {
     private void restoreMetaData(final String objectName, final Metadata metadata) {
         final String osName = System.getProperty("os.name");
         //get metadatarestore on the basis of os
-        final MetaDataRestore metaDataRestore = new MetaDataRestoreFactory().getOSSpecificMetadataRestore(metadata, objectName, osName,metaDataRestoreListener);
+        final MetadataRestore metadataRestore = new MetadataRestoreFactory().getOSSpecificMetadataRestore(metadata, objectName, osName, metadataRestoreListener);
         //restore os name
-        metaDataRestore.restoreOSName();
+        metadataRestore.restoreOSName();
         //restore user and owner based on OS
-        metaDataRestore.restoreUserAndOwner();
+        metadataRestore.restoreUserAndOwner();
         //restore creation and modified time based on OS
-        metaDataRestore.restoreFileTimes();
+        metadataRestore.restoreFileTimes();
         //restore permissions based on OS
-        metaDataRestore.restorePermissions();
-        if (metaDataRestore instanceof WindowsMetaDataRestore) {
-            ((WindowsMetaDataRestore) metaDataRestore).restoreFlags();
-        }
+        metadataRestore.restorePermissions();
+        
 
 
     }

ds3-sdk/src/main/java/com/spectralogic/ds3client/metadata/MetadataReceivedListenerImpl.java

@@ -13,22 +13,21 @@
  * ****************************************************************************
  */
 
-// This code is auto-generated, do not modify
 package com.spectralogic.ds3client.metadata;
 
-import com.spectralogic.ds3client.metadata.interfaces.MetaDataRestore;
-import com.spectralogic.ds3client.metadata.interfaces.MetaDataRestoreListener;
+import com.spectralogic.ds3client.metadata.interfaces.MetadataRestore;
+import com.spectralogic.ds3client.metadata.interfaces.MetadataRestoreListener;
 import com.spectralogic.ds3client.networking.Metadata;
 
 
-public class MetaDataRestoreFactory {
-    public MetaDataRestore getOSSpecificMetadataRestore(final Metadata metadata, final String filePath, final String localOS , final MetaDataRestoreListener metaDataRestoreListener) {
+public class MetadataRestoreFactory {
+    public MetadataRestore getOSSpecificMetadataRestore(final Metadata metadata, final String filePath, final String localOS , final MetadataRestoreListener metadataRestoreListener) {
         if (localOS.contains("Windows")) {
-            return new WindowsMetaDataRestore(metadata, filePath, localOS,metaDataRestoreListener);
+            return new WindowsMetadataRestore(metadata, filePath, localOS, metadataRestoreListener);
         } else if (localOS.contains("Mac")) {
-            return new MACMetaDataRestore(metadata, filePath, localOS,metaDataRestoreListener);
+            return new MACMetadataRestore(metadata, filePath, localOS, metadataRestoreListener);
         } else {
-            return new PosixMetaDataRestore(metadata, filePath, localOS,metaDataRestoreListener);
+            return new PosixMetadataRestore(metadata, filePath, localOS, metadataRestoreListener);
         }
     }
 }

ds3-sdk/src/main/java/com/spectralogic/ds3client/metadata/MetaDataRestoreFactory.java renamed to ds3-sdk/src/main/java/com/spectralogic/ds3client/metadata/MetadataRestoreFactory.java

@@ -13,20 +13,22 @@
  * ****************************************************************************
  */
 
-// This code is auto-generated, do not modify
 package com.spectralogic.ds3client.metadata;
 
 import com.google.common.collect.ImmutableMap;
-import com.spectralogic.ds3client.metadata.interfaces.MetaDataStore;
+import com.spectralogic.ds3client.metadata.interfaces.MetadataStore;
+import com.spectralogic.ds3client.metadata.interfaces.MetadataStoreListener;
 
 
-public class MetaDataStoreFactory
+public class MetadataStoreFactory
 {
-    public MetaDataStore getOsSpecificMetadataStore(final String osName, final ImmutableMap.Builder<String, String> metadataMap)
+    public MetadataStore getOsSpecificMetadataStore(final String osName, final ImmutableMap.Builder<String, String> metadataMap,final MetadataStoreListener metadataStoreListener)
     {
-        if(osName.contains("Windows"))
-            return new WindowsMetaDataStore(metadataMap);
-        else
-            return new PosixMetaDataStore(metadataMap);
+        if(osName.contains("Windows")) {
+            return new WindowsMetadataStore(metadataMap,metadataStoreListener);
+        }
+        else {
+            return new PosixMetadataStore(metadataMap,metadataStoreListener);
+        }
     }
 }