From b5d6d3aa03b55b7c8a06c0004ed0bccc24bf19bd Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Tue, 26 Jun 2012 14:29:55 +0000
Subject: [PATCH] SP-164 / BIS-107: Closing EODSQL DataSet objects retrieved by
Jython scripts automatically - rename Resource to IResource
SVN: 25869
---
.../cisd/common/interpreter/PythonInterpreter.java | 10 +++++-----
.../resource/{Resource.java => IResource.java} | 2 +-
.../ch/systemsx/cisd/common/resource/Resources.java | 6 +++---
.../systemsx/cisd/common/resource/ResourcesTest.java | 12 ++++++------
.../TopLevelDataSetRegistratorGlobalState.java | 8 ++++----
.../dss/generic/shared/DataSourceQueryService.java | 6 +++---
6 files changed, 22 insertions(+), 22 deletions(-)
rename common/source/java/ch/systemsx/cisd/common/resource/{Resource.java => IResource.java} (96%)
diff --git a/common/source/java/ch/systemsx/cisd/common/interpreter/PythonInterpreter.java b/common/source/java/ch/systemsx/cisd/common/interpreter/PythonInterpreter.java
index ec5198cfc6b..705c773566e 100644
--- a/common/source/java/ch/systemsx/cisd/common/interpreter/PythonInterpreter.java
+++ b/common/source/java/ch/systemsx/cisd/common/interpreter/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.Resource;
+import ch.systemsx.cisd.common.resource.IResource;
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 Resource)
+ if (value instanceof IResource)
{
- resources.add((Resource) value);
+ resources.add((IResource) 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 Resource)
+ if (value instanceof IResource)
{
- resources.add((Resource) value);
+ resources.add((IResource) value);
}
}
diff --git a/common/source/java/ch/systemsx/cisd/common/resource/Resource.java b/common/source/java/ch/systemsx/cisd/common/resource/IResource.java
similarity index 96%
rename from common/source/java/ch/systemsx/cisd/common/resource/Resource.java
rename to common/source/java/ch/systemsx/cisd/common/resource/IResource.java
index 0225fb0f277..1342844b398 100644
--- a/common/source/java/ch/systemsx/cisd/common/resource/Resource.java
+++ b/common/source/java/ch/systemsx/cisd/common/resource/IResource.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.common.resource;
/**
* @author pkupczyk
*/
-public interface Resource
+public interface IResource
{
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 376e9c8f25b..c1c61a11f03 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<Resource> resources = new LinkedHashSet<Resource>();
+ public Set<IResource> resources = new LinkedHashSet<IResource>();
public Resources(Logger logger)
{
this.logger = logger;
}
- public void add(Resource resource)
+ public void add(IResource resource)
{
resources.add(resource);
}
@@ -45,7 +45,7 @@ public class Resources
{
if (resources.size() > 0)
{
- for (Resource resource : resources)
+ for (IResource 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 19a39b7228a..f5fbd3ad635 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 Resource failingResource1 = context.mock(Resource.class, "failingResource1");
- final Resource failingResource2 = context.mock(Resource.class, "failingResource2");
- final Resource notFailingResource1 = context.mock(Resource.class, "notFailingResource1");
- final Resource notFailingResource2 = context.mock(Resource.class, "notFailingResource2");
+ 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");
Resources resources = new Resources(null);
resources.add(notFailingResource1);
@@ -67,7 +67,7 @@ public class ResourcesTest
{
Mockery context = new Mockery();
- final Resource resource = context.mock(Resource.class);
+ final IResource resource = context.mock(IResource.class);
Resources resources = new Resources(null);
resources.add(resource);
@@ -90,7 +90,7 @@ public class ResourcesTest
{
Mockery context = new Mockery();
- final Resource resource = context.mock(Resource.class);
+ final IResource resource = context.mock(IResource.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 36db21883d6..fbb890c2cf9 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
@@ -26,7 +26,7 @@ import org.apache.log4j.Logger;
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.resource.Resource;
+import ch.systemsx.cisd.common.resource.IResource;
import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
import ch.systemsx.cisd.etlserver.registrator.recovery.IDataSetStorageRecoveryManager;
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
*
* @author Chandrasekhar Ramakrishnan
*/
-public class TopLevelDataSetRegistratorGlobalState implements Resource
+public class TopLevelDataSetRegistratorGlobalState implements IResource
{
// can be used from dropboxes
public static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
@@ -417,9 +417,9 @@ public class TopLevelDataSetRegistratorGlobalState implements Resource
@Override
public void release()
{
- if (getDataSourceQueryService() instanceof Resource)
+ if (getDataSourceQueryService() instanceof IResource)
{
- ((Resource) getDataSourceQueryService()).release();
+ ((IResource) getDataSourceQueryService()).release();
}
}
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 7f780a87741..3626cc695cc 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.Resource;
+import ch.systemsx.cisd.common.resource.IResource;
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, Resource
+public class DataSourceQueryService implements IDataSourceQueryService, IResource
{
private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
DataSourceQueryService.class);
@@ -82,7 +82,7 @@ public class DataSourceQueryService implements IDataSourceQueryService, Resource
resources.clear();
}
- private static class DataSetResource implements Resource
+ private static class DataSetResource implements IResource
{
private DataSet<?> dataSet;
--
GitLab