minor: got rid of warnings

SVN: 20289

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGet.java

@@ -30,6 +30,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.FileInfoDssDTO;
  * 
  * @author Chandrasekhar Ramakrishnan
  */
+@SuppressWarnings("deprecation")
 class CommandGet extends AbstractDssCommand<CommandGet.CommandGetArguments>
 {
     static class CommandGetArguments extends DataSetArguments

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java

@@ -21,13 +21,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.log4j.Logger;
-
 import ch.systemsx.cisd.common.collections.CollectionUtils;
 import ch.systemsx.cisd.common.exceptions.Status;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.common.logging.LogCategory;
-import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ArchiverTaskContext;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IArchiverTask;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ProcessingStatus;
@@ -45,9 +41,6 @@ public abstract class AbstractArchiverProcessingPlugin extends AbstractDatastore
         IArchiverTask
 {
 
-    protected static final Logger operationLog =
-            LogFactory.getLogger(LogCategory.OPERATION, AbstractArchiverProcessingPlugin.class);
-
     private static final long serialVersionUID = 1L;
 
     private final IStatusChecker archivePrerequisiteOrNull;
@@ -213,7 +206,6 @@ public abstract class AbstractArchiverProcessingPlugin extends AbstractDatastore
     {
         asyncUpdateStatuses(statuses.getSuccessfulDatasetCodes(), success);
         asyncUpdateStatuses(statuses.getFailedDatasetCodes(), failure);
-
     }
 
     private static void asyncUpdateStatuses(List<String> dataSetCodes,

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java

@@ -22,13 +22,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.log4j.Logger;
-
 import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.common.exceptions.Status;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.logging.LogCategory;
-import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.mail.EMailAddress;
 import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.utilities.ITimeProvider;
@@ -56,10 +52,8 @@ abstract public class AbstractDropboxProcessingPlugin extends AbstractDatastoreP
 
     private static final long serialVersionUID = 1L;
 
-    final static Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
-            AbstractDropboxProcessingPlugin.class);
-
-    @Private static final String SEND_DETAILED_EMAIL_KEY = "send-detailed-email";
+    @Private
+    static final String SEND_DETAILED_EMAIL_KEY = "send-detailed-email";
 
     private final static String MISSING_DIRECTORY_MSG = "with missing directory";
 
@@ -70,7 +64,7 @@ abstract public class AbstractDropboxProcessingPlugin extends AbstractDatastoreP
     private final IPostRegistrationDatasetHandler dropboxHandler;
 
     private final ITimeProvider timeProvider;
-    
+
     private final boolean sendingDetailedEMail;
 
     /**
@@ -91,7 +85,7 @@ abstract public class AbstractDropboxProcessingPlugin extends AbstractDatastoreP
         this.timeProvider = timeProvider;
         sendingDetailedEMail = PropertyUtils.getBoolean(properties, SEND_DETAILED_EMAIL_KEY, false);
     }
-    
+
     public ProcessingStatus process(List<DatasetDescription> datasets,
             DataSetProcessingContext context)
     {
@@ -160,12 +154,12 @@ abstract public class AbstractDropboxProcessingPlugin extends AbstractDatastoreP
                         + (withSample ? "Sample: ${sample}\n" : "")
                         + "Started: ${start-time}.\n" + "Finished: ${end-time}.");
     }
-    
+
     /**
      * Returns a description to be used in e-mails.
      */
     protected abstract String getProcessingDescription();
-    
+
     private String render(String entity, String entityType)
     {
         return entity == null ? null : entity + " [" + entityType + "]";
@@ -185,12 +179,13 @@ abstract public class AbstractDropboxProcessingPlugin extends AbstractDatastoreP
         if (datasetFiles.length == 1)
         {
             DataSetInformation datasetInfo = createDatasetInfo(dataset);
-            return dropboxHandler.handle(datasetFiles[0], datasetInfo, context.getParameterBindings());
+            return dropboxHandler.handle(datasetFiles[0], datasetInfo,
+                    context.getParameterBindings());
         } else
         {
             operationLog.error(String.format("Exactly one item was expected in the '%s' directory,"
-                    + " but %d have been found. Nothing will be processed.", originalDir
-                    .getParent(), datasetFiles));
+                    + " but %d have been found. Nothing will be processed.",
+                    originalDir.getParent(), datasetFiles));
             final String errorMsg =
                     datasetFiles.length > 1 ? MORE_THAN_ONE_ITEM_MSG : EMPTY_DIRECTORY_MSG;
             return Status.createError(errorMsg);

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java

@@ -48,6 +48,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SimpleDataSetInformationDTO;
  * @author Franz-Josef Elmer
  */
 @Test(groups = "slow")
+@SuppressWarnings("deprecation")
 public class DssComponentTest extends SystemTestCase
 {
     private static final Comparator<FileInfoDssDTO> FILE_INFO_COMPARATOR =

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGetTest.java

@@ -32,6 +32,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.FileInfoDssDTO;
 /**
  * @author Franz-Josef Elmer
  */
+@SuppressWarnings("deprecation")
 public class CommandGetTest extends AssertJUnit
 {
     private final class MockCommandGet extends CommandGet

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java

@@ -74,6 +74,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
  * 
  * @author Chandrasekhar Ramakrishnan
  */
+@SuppressWarnings("deprecation")
 public class DssComponentTest extends AbstractFileSystemTestCase
 {
     private static final String DUMMY_DATA_SET_CODE = "DummyDataSetCode";