From 421fe805ef330f03826691aad2b7c7fa080ca6c0 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Thu, 10 Mar 2011 13:19:30 +0000
Subject: [PATCH] minor: got rid of warnings
SVN: 20289
---
.../dss/client/api/cli/CommandGet.java | 1 +
.../AbstractArchiverProcessingPlugin.java | 8 ------
.../AbstractDropboxProcessingPlugin.java | 25 ++++++++-----------
.../systemtests/DssComponentTest.java | 1 +
.../dss/client/api/cli/CommandGetTest.java | 1 +
.../client/api/v1/impl/DssComponentTest.java | 1 +
6 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGet.java
index 6077f8b15d4..34280f24582 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGet.java
+++ b/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
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
index 5dd3cd0f763..d64ac31783b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
+++ b/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,
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java
index 3f3d8eaba7b..e3f0a8abe2c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java
+++ b/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);
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
index fba43929280..c6ad8d9a659 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
+++ b/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 =
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGetTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGetTest.java
index ed24ed1f030..fe8f9f13684 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGetTest.java
+++ b/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
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
index fd22576cf3a..eb1bf5a6d8b 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
+++ b/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";
--
GitLab