Removing unused imports

Fixing another place where what should have been an exception is eaten and not recorded

Author: GraciesPadre

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

@@ -28,17 +28,12 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_ACCESS_TIME;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_CREATION_TIME;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_LAST_MODIFIED_TIME;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_OS;
 
 abstract class AbstractMetadataRestore implements MetadataRestore {
-    private static final Logger LOG = LoggerFactory.getLogger(AbstractMetadataRestore.class);
-
     protected String storedOS;
     protected Metadata metadata;
     protected String objectName;

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

@@ -20,8 +20,6 @@
 import com.spectralogic.ds3client.helpers.Ds3ClientHelpers;
 import com.spectralogic.ds3client.metadata.interfaces.MetadataStore;
 import com.spectralogic.ds3client.utils.Platform;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -35,7 +33,6 @@
  * 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;
 
     public MetadataAccessImpl(final Map<String, Path> fileMapper) {

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

@@ -19,14 +19,9 @@
 import com.spectralogic.ds3client.metadata.interfaces.MetadataRestore;
 import com.spectralogic.ds3client.networking.Metadata;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 
 public class MetadataReceivedListenerImpl implements MetadataReceivedListener {
-    private static final Logger LOG = LoggerFactory.getLogger(MetadataReceivedListenerImpl.class);
-
     private String localFilePath = null;
 
     public MetadataReceivedListenerImpl(final String localFilePath) {

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

@@ -26,16 +26,11 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_GID;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_PERMISSION;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_UID;
 
 class PosixMetadataRestore extends AbstractMetadataRestore {
-    private static final Logger LOG =LoggerFactory.getLogger(PosixMetadataRestore.class);
-
     public PosixMetadataRestore(final Metadata metadata, final String filePath, final String localOS) {
         this.metadata = metadata;
         this.objectName = filePath;

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

@@ -32,12 +32,7 @@
 
 import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 class PosixMetadataStore extends AbstractMetadataStore {
-    private static final Logger LOG = LoggerFactory.getLogger(PosixMetadataStore.class);
-
     public PosixMetadataStore(final ImmutableMap.Builder<String, String> metadataMap) {
         this.metadataMap = metadataMap;
     }

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

@@ -31,24 +31,19 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_FLAGS;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_GROUP;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_OWNER;
 
 class WindowsMetadataRestore extends AbstractMetadataRestore {
-    private static final Logger LOG = LoggerFactory.getLogger(WindowsMetadataRestore.class);
-
     WindowsMetadataRestore(final Metadata metadata, final String filePath, final String localOS) {
         this.metadata = metadata;
         this.objectName = filePath;
         this.localOS = localOS;
     }
 
     @Override
-    public void restoreUserAndOwner() {
+    public void restoreUserAndOwner() throws IOException {
         if (storedOS.equals(localOS)) {
             String ownerSid = null;
             if (metadata.get(KEY_OWNER).size() > 0) {
@@ -153,16 +148,16 @@ private void restorePermissionByUser(final String permission,
      * @param ownerSidId sid of the owner
      * @param groupSidId sid of the group
      */
-    private void setOwnerIdandGroupId(final String ownerSidId, final String groupSidId) {
+    private void setOwnerIdandGroupId(final String ownerSidId, final String groupSidId) throws IOException {
         final int infoType = WinNT.OWNER_SECURITY_INFORMATION | WinNT.GROUP_SECURITY_INFORMATION;
         final WinNT.PSIDByReference referenceOwner = new WinNT.PSIDByReference();
         Advapi32.INSTANCE.ConvertStringSidToSid(ownerSidId, referenceOwner);
         final WinNT.PSIDByReference referenceGroup = new WinNT.PSIDByReference();
         Advapi32.INSTANCE.ConvertStringSidToSid(groupSidId, referenceGroup);
         final File file = new File(objectName);
-        final int i = Advapi32.INSTANCE.SetNamedSecurityInfo(file.getAbsolutePath(), 1, infoType, referenceOwner.getValue().getPointer(), referenceGroup.getValue().getPointer(), null, null);
-        if (i != 0) {
-            LOG.error("not able to set owner and group on the file", i);
+        final int winApiResult = Advapi32.INSTANCE.SetNamedSecurityInfo(file.getAbsolutePath(), 1, infoType, referenceOwner.getValue().getPointer(), referenceGroup.getValue().getPointer(), null, null);
+        if (winApiResult != 0) {
+            throw new IOException("Failure setting owner and group on file: " + objectName + ".  Windows error code: " + winApiResult);
         }
     }
 

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

@@ -32,18 +32,13 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_DACL;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_FLAGS;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_GROUP;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.KEY_OWNER;
 import static com.spectralogic.ds3client.metadata.MetadataKeyConstants.METADATA_PREFIX;
 
 class WindowsMetadataStore extends AbstractMetadataStore {
-    private static final Logger LOG = LoggerFactory.getLogger(WindowsMetadataStore.class);
-
     public WindowsMetadataStore(final ImmutableMap.Builder<String, String> metadataMap) {
         this.metadataMap = metadataMap;
     }

ds3-sdk/src/test/java/com/spectralogic/ds3client/metadata/MACMetadataRestore_Test.java

@@ -26,7 +26,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.mockito.Mockito;
 
 import java.io.File;
 import java.nio.file.Files;

ds3-sdk/src/test/java/com/spectralogic/ds3client/metadata/MetadataAccessImpl_Test.java

@@ -19,7 +19,6 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.Assume;
 import org.junit.Test;
-import static org.junit.Assert.fail;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 
@@ -32,7 +31,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class MetadataAccessImpl_Test {
     @Test

ds3-sdk/src/test/java/com/spectralogic/ds3client/metadata/MetadataReceivedListenerImpl_Test.java

@@ -33,10 +33,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 public class MetadataReceivedListenerImpl_Test {
     @Test