From c45ca96e396221d179d666c204058c8c07a7e09e Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 4 Oct 2012 21:22:26 +0000
Subject: [PATCH] Move IIntializable to resource package and rename IResource
to IReleasable.
SVN: 27018
---
.../cisd/common/jython/PythonInterpreter.java | 10 +++++-----
.../{utilities => resource}/IInitializable.java | 2 +-
.../resource/{IResource.java => IReleasable.java} | 2 +-
.../ch/systemsx/cisd/common/resource/Resources.java | 6 +++---
.../systemsx/cisd/common/resource/ResourcesTest.java | 12 ++++++------
.../TopLevelDataSetRegistratorGlobalState.java | 8 ++++----
.../openbis/dss/generic/server/DataStoreServer.java | 2 +-
.../dss/generic/server/DataStoreServiceLogger.java | 2 +-
.../dss/generic/shared/DataSourceQueryService.java | 6 +++---
.../generic/shared/IDataStoreServiceInternal.java | 2 +-
10 files changed, 26 insertions(+), 26 deletions(-)
rename common/source/java/ch/systemsx/cisd/common/{utilities => resource}/IInitializable.java (94%)
rename common/source/java/ch/systemsx/cisd/common/resource/{IResource.java => IReleasable.java} (96%)
diff --git a/common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java b/common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java
index 43438c5b1ac..ce7b2864cc6 100644
--- a/common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java
+++ b/common/source/java/ch/systemsx/cisd/common/jython/PythonInterpreter.java
@@ -22,7 +22,7 @@ import org.python.core.PySystemState;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.resource.IResource;
+import ch.systemsx.cisd.common.resource.IReleasable;
import ch.systemsx.cisd.common.resource.Resources;
/**
@@ -49,9 +49,9 @@ public class PythonInterpreter extends org.python.util.PythonInterpreter
public void set(String name, Object value)
{
super.set(name, value);
- if (value instanceof IResource)
+ if (value instanceof IReleasable)
{
- resources.add((IResource) value);
+ resources.add((IReleasable) value);
}
}
@@ -59,9 +59,9 @@ public class PythonInterpreter extends org.python.util.PythonInterpreter
public void set(String name, PyObject value)
{
super.set(name, value);
- if (value instanceof IResource)
+ if (value instanceof IReleasable)
{
- resources.add((IResource) value);
+ resources.add((IReleasable) value);
}
}
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/IInitializable.java b/common/source/java/ch/systemsx/cisd/common/resource/IInitializable.java
similarity index 94%
rename from common/source/java/ch/systemsx/cisd/common/utilities/IInitializable.java
rename to common/source/java/ch/systemsx/cisd/common/resource/IInitializable.java
index af6d743e259..cb4f2bdfcab 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/IInitializable.java
+++ b/common/source/java/ch/systemsx/cisd/common/resource/IInitializable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.resource;
/**
* Interface for initializable classes.
diff --git a/common/source/java/ch/systemsx/cisd/common/resource/IResource.java b/common/source/java/ch/systemsx/cisd/common/resource/IReleasable.java
similarity index 96%
rename from common/source/java/ch/systemsx/cisd/common/resource/IResource.java
rename to common/source/java/ch/systemsx/cisd/common/resource/IReleasable.java
index 1342844b398..54d8c3168f2 100644
--- a/common/source/java/ch/systemsx/cisd/common/resource/IResource.java
+++ b/common/source/java/ch/systemsx/cisd/common/resource/IReleasable.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.common.resource;
/**
* @author pkupczyk
*/
-public interface IResource
+public interface IReleasable
{
public void release();
diff --git a/common/source/java/ch/systemsx/cisd/common/resource/Resources.java b/common/source/java/ch/systemsx/cisd/common/resource/Resources.java
index c1c61a11f03..8bdf9064895 100644
--- a/common/source/java/ch/systemsx/cisd/common/resource/Resources.java
+++ b/common/source/java/ch/systemsx/cisd/common/resource/Resources.java
@@ -29,14 +29,14 @@ public class Resources
private Logger logger;
- public Set<IResource> resources = new LinkedHashSet<IResource>();
+ public Set<IReleasable> resources = new LinkedHashSet<IReleasable>();
public Resources(Logger logger)
{
this.logger = logger;
}
- public void add(IResource resource)
+ public void add(IReleasable resource)
{
resources.add(resource);
}
@@ -45,7 +45,7 @@ public class Resources
{
if (resources.size() > 0)
{
- for (IResource resource : resources)
+ for (IReleasable resource : resources)
{
try
{
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/resource/ResourcesTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/resource/ResourcesTest.java
index f5fbd3ad635..22a79a9f973 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/resource/ResourcesTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/resource/ResourcesTest.java
@@ -31,10 +31,10 @@ public class ResourcesTest
{
Mockery context = new Mockery();
- final IResource failingResource1 = context.mock(IResource.class, "failingResource1");
- final IResource failingResource2 = context.mock(IResource.class, "failingResource2");
- final IResource notFailingResource1 = context.mock(IResource.class, "notFailingResource1");
- final IResource notFailingResource2 = context.mock(IResource.class, "notFailingResource2");
+ final IReleasable failingResource1 = context.mock(IReleasable.class, "failingResource1");
+ final IReleasable failingResource2 = context.mock(IReleasable.class, "failingResource2");
+ final IReleasable notFailingResource1 = context.mock(IReleasable.class, "notFailingResource1");
+ final IReleasable notFailingResource2 = context.mock(IReleasable.class, "notFailingResource2");
Resources resources = new Resources(null);
resources.add(notFailingResource1);
@@ -67,7 +67,7 @@ public class ResourcesTest
{
Mockery context = new Mockery();
- final IResource resource = context.mock(IResource.class);
+ final IReleasable resource = context.mock(IReleasable.class);
Resources resources = new Resources(null);
resources.add(resource);
@@ -90,7 +90,7 @@ public class ResourcesTest
{
Mockery context = new Mockery();
- final IResource resource = context.mock(IResource.class);
+ final IReleasable resource = context.mock(IReleasable.class);
Resources resources = new Resources(null);
resources.add(resource);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
index b085bfe455a..c38fdea2d52 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.mail.IMailClient;
import ch.systemsx.cisd.common.properties.PropertyUtils;
-import ch.systemsx.cisd.common.resource.IResource;
+import ch.systemsx.cisd.common.resource.IReleasable;
import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.etlserver.registrator.recovery.IDataSetStorageRecoveryManager;
import ch.systemsx.cisd.etlserver.validation.IDataSetValidator;
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
*
* @author Chandrasekhar Ramakrishnan
*/
-public class TopLevelDataSetRegistratorGlobalState implements IResource
+public class TopLevelDataSetRegistratorGlobalState implements IReleasable
{
// can be used from dropboxes
public static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
@@ -407,9 +407,9 @@ public class TopLevelDataSetRegistratorGlobalState implements IResource
@Override
public void release()
{
- if (getDataSourceQueryService() instanceof IResource)
+ if (getDataSourceQueryService() instanceof IReleasable)
{
- ((IResource) getDataSourceQueryService()).release();
+ ((IReleasable) getDataSourceQueryService()).release();
}
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
index fcd435221e2..eaf308c401c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
@@ -65,8 +65,8 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.logging.LogInitializer;
+import ch.systemsx.cisd.common.resource.IInitializable;
import ch.systemsx.cisd.common.utilities.ExtendedProperties;
-import ch.systemsx.cisd.common.utilities.IInitializable;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization.DssSessionAuthorizationHolder;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceLogger.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceLogger.java
index ed6cf976294..b012ce41815 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceLogger.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceLogger.java
@@ -22,9 +22,9 @@ import java.util.Map;
import org.apache.log4j.Logger;
import ch.systemsx.cisd.common.exceptions.InvalidAuthenticationException;
+import ch.systemsx.cisd.common.resource.IInitializable;
import ch.systemsx.cisd.common.serviceconversation.ServiceMessage;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
-import ch.systemsx.cisd.common.utilities.IInitializable;
import ch.systemsx.cisd.openbis.generic.shared.IDataStoreService;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CustomImportFile;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceQueryService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceQueryService.java
index 3626cc695cc..8acf740aec6 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceQueryService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceQueryService.java
@@ -28,14 +28,14 @@ import org.apache.log4j.Logger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.resource.IResource;
+import ch.systemsx.cisd.common.resource.IReleasable;
import ch.systemsx.cisd.common.resource.Resources;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSourceQueryService;
/**
* @author Chandrasekhar Ramakrishnan
*/
-public class DataSourceQueryService implements IDataSourceQueryService, IResource
+public class DataSourceQueryService implements IDataSourceQueryService, IReleasable
{
private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
DataSourceQueryService.class);
@@ -82,7 +82,7 @@ public class DataSourceQueryService implements IDataSourceQueryService, IResourc
resources.clear();
}
- private static class DataSetResource implements IResource
+ private static class DataSetResource implements IReleasable
{
private DataSet<?> dataSet;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataStoreServiceInternal.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataStoreServiceInternal.java
index 7773a7f60a2..db0910b2901 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataStoreServiceInternal.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataStoreServiceInternal.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.dss.generic.shared;
-import ch.systemsx.cisd.common.utilities.IInitializable;
+import ch.systemsx.cisd.common.resource.IInitializable;
import ch.systemsx.cisd.openbis.generic.shared.IDataStoreService;
/**
--
GitLab