diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
index 080dc15456ce1d9c3b7248f18c7439920ba9f68a..4ec94869c027cf775a46c2732b3c7792d3338b92 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
@@ -96,7 +96,7 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IRoleAssignmentDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.HibernateSearchDataProvider;
import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl.EncapsulatedCommonServer;
import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl.MasterDataRegistrationScriptRunner;
-import ch.systemsx.cisd.openbis.generic.server.util.GroupIdentifierHelper;
+import ch.systemsx.cisd.openbis.generic.server.util.SpaceIdentifierHelper;
import ch.systemsx.cisd.openbis.generic.shared.basic.BasicEntityInformationHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolder;
@@ -345,7 +345,7 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
{
final Session session = getSession(sessionToken);
final DatabaseInstancePE databaseInstance =
- GroupIdentifierHelper.getDatabaseInstance(identifier, getDAOFactory());
+ SpaceIdentifierHelper.getDatabaseInstance(identifier, getDAOFactory());
final List<SpacePE> spaces = getDAOFactory().getSpaceDAO().listSpaces(databaseInstance);
final SpacePE homeSpaceOrNull = session.tryGetHomeGroup();
for (final SpacePE space : spaces)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
index 398a3e9e0a3bff0743ec6687cbeca35c45347cad..5c6a69d75bf8a00144bdfa87cf9fdd18cf270302 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
@@ -63,7 +63,7 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IVocabularyTermDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.PersistencyResources;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.ICodeSequenceDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.IPermIdDAO;
-import ch.systemsx.cisd.openbis.generic.server.util.GroupIdentifierHelper;
+import ch.systemsx.cisd.openbis.generic.server.util.SpaceIdentifierHelper;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Identifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
@@ -129,7 +129,7 @@ abstract class AbstractBusinessObject implements IDAOFactory
if (org.apache.commons.lang.StringUtils.isBlank(spaceIdentifier.getSpaceCode()))
{
final SpacePE space =
- GroupIdentifierHelper.tryGetSpace(spaceIdentifier, findPerson(), this);
+ SpaceIdentifierHelper.tryGetSpace(spaceIdentifier, findPerson(), this);
checkNotNull(spaceIdentifier, space);
spaceIdentifier.setDatabaseInstanceCode(space.getDatabaseInstance().getCode());
spaceIdentifier.setSpaceCode(space.getCode());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GroupBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GroupBO.java
index 0275d684378e8649378c051bb1a3de2c5c83cfd4..0e43a317effbdb00e5ec503e5ad13ee48095d071 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GroupBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GroupBO.java
@@ -23,7 +23,7 @@ import org.springframework.dao.DataRetrievalFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
-import ch.systemsx.cisd.openbis.generic.server.util.GroupIdentifierHelper;
+import ch.systemsx.cisd.openbis.generic.server.util.SpaceIdentifierHelper;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ISpaceUpdates;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
@@ -99,7 +99,7 @@ public final class GroupBO extends AbstractBusinessObject implements IGroupBO
final GroupIdentifier groupIdentifier =
new GroupIdentifier(DatabaseInstanceIdentifier.HOME, groupCode);
final DatabaseInstancePE databaseInstance =
- GroupIdentifierHelper.getDatabaseInstance(groupIdentifier, this);
+ SpaceIdentifierHelper.getDatabaseInstance(groupIdentifier, this);
group.setDatabaseInstance(databaseInstance);
group.setCode(groupIdentifier.getSpaceCode());
group.setDescription(descriptionOrNull);
@@ -115,7 +115,7 @@ public final class GroupBO extends AbstractBusinessObject implements IGroupBO
@Override
public void load(final GroupIdentifier groupIdentifier) throws UserFailureException
{
- group = GroupIdentifierHelper.tryGetSpace(groupIdentifier, session.tryGetPerson(), this);
+ group = SpaceIdentifierHelper.tryGetSpace(groupIdentifier, session.tryGetPerson(), this);
if (group == null)
{
throw new UserFailureException(String.format("Space '%s' does not exist.",
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java
index ebe32a6eba888ba07b6647105fd23c4823ac362e..5a0fe77db993abb651eb90a733468136c6806e52 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAttachmentDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDeletionDAO;
-import ch.systemsx.cisd.openbis.generic.server.util.GroupIdentifierHelper;
+import ch.systemsx.cisd.openbis.generic.server.util.SpaceIdentifierHelper;
import ch.systemsx.cisd.openbis.generic.shared.IRelationshipService;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAttachment;
@@ -86,7 +86,7 @@ public final class ProjectBO extends AbstractBusinessObject implements IProjectB
{
final ProjectPE result = new ProjectPE();
final SpacePE group =
- GroupIdentifierHelper.tryGetSpace(projectIdentifier, session.tryGetPerson(), this);
+ SpaceIdentifierHelper.tryGetSpace(projectIdentifier, session.tryGetPerson(), this);
result.setSpace(group);
result.setRegistrator(findPerson());
result.setCode(projectIdentifier.getProjectCode());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTable.java
index 2585bafc5a210b5a85dc8d21a357d845280495bf..5fdc347621b09b7ced42c4ae40840fa56f37aa6c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTable.java
@@ -24,7 +24,7 @@ import org.springframework.dao.DataIntegrityViolationException;
import ch.systemsx.cisd.common.collections.TableMap;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
-import ch.systemsx.cisd.openbis.generic.server.util.GroupIdentifierHelper;
+import ch.systemsx.cisd.openbis.generic.server.util.SpaceIdentifierHelper;
import ch.systemsx.cisd.openbis.generic.server.util.KeyExtractorFactory;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Grantee;
import ch.systemsx.cisd.openbis.generic.shared.dto.AuthorizationGroupPE;
@@ -108,13 +108,13 @@ public final class RoleAssignmentTable extends AbstractBusinessObject implements
if (databaseInstanceIdentifier != null)
{
final DatabaseInstancePE databaseInstance =
- GroupIdentifierHelper.getDatabaseInstance(databaseInstanceIdentifier, this);
+ SpaceIdentifierHelper.getDatabaseInstance(databaseInstanceIdentifier, this);
roleAssignment.setDatabaseInstance(databaseInstance);
} else
{
final SpaceIdentifier groupIdentifier = newRoleAssignment.getSpaceIdentifier();
final SpacePE group =
- GroupIdentifierHelper
+ SpaceIdentifierHelper
.tryGetSpace(groupIdentifier, session.tryGetPerson(), this);
if (group == null)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwnerFinder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwnerFinder.java
index 4cff34226be371dd6be57a6ae7e1e865744e5967..3e001925ee0d7045400310b96a661b555ac17e79 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwnerFinder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwnerFinder.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.server.business.bo.util;
import ch.systemsx.cisd.common.exceptions.InternalErr;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAuthorizationDAOFactory;
-import ch.systemsx.cisd.openbis.generic.server.util.GroupIdentifierHelper;
+import ch.systemsx.cisd.openbis.generic.server.util.SpaceIdentifierHelper;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
@@ -89,7 +89,7 @@ public class SampleOwnerFinder
final DatabaseInstanceIdentifier databaseInstanceIdentifier)
{
final DatabaseInstancePE databaseInstance =
- GroupIdentifierHelper
+ SpaceIdentifierHelper
.tryGetDatabaseInstance(databaseInstanceIdentifier, daoFactory);
if (databaseInstance == null)
{
@@ -101,7 +101,7 @@ public class SampleOwnerFinder
private SampleOwner tryFindAbsoluteGroupOwner(final SpaceIdentifier spaceIdentifier)
{
final SpacePE group =
- GroupIdentifierHelper.tryGetSpace(spaceIdentifier, personPE, daoFactory);
+ SpaceIdentifierHelper.tryGetSpace(spaceIdentifier, personPE, daoFactory);
if (group == null)
{
return null;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/GroupIdentifierHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/SpaceIdentifierHelper.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/GroupIdentifierHelper.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/SpaceIdentifierHelper.java
index 0ff914a9519b74e9b4c3495024d7b714c99229f4..a438a01fb0504f6b6ade0740f7476fd171a0d95c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/GroupIdentifierHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/SpaceIdentifierHelper.java
@@ -25,8 +25,8 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAuthorizationDAOFacto
import ch.systemsx.cisd.openbis.generic.server.dataaccess.ISpaceDAO;
import ch.systemsx.cisd.openbis.generic.shared.IDatabaseInstanceFinder;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.DatabaseInstanceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
@@ -42,10 +42,10 @@ import ch.systemsx.cisd.openbis.generic.shared.util.SpaceCodeHelper;
*
* @author Franz-Josef Elmer
*/
-public final class GroupIdentifierHelper
+public final class SpaceIdentifierHelper
{
- private GroupIdentifierHelper()
+ private SpaceIdentifierHelper()
{
// Can not be instantiated.
}
@@ -61,7 +61,7 @@ public final class GroupIdentifierHelper
final String homeSpaceCodeOrNull)
{
final IDatabaseInstanceFinder instanceFinder =
- GroupIdentifierHelper.createCachedInstanceFinder(daoFactory);
+ SpaceIdentifierHelper.createCachedInstanceFinder(daoFactory);
return new SpaceIdentifierNormalizer(instanceFinder, homeSpaceCodeOrNull);
}
@@ -78,13 +78,13 @@ public final class GroupIdentifierHelper
public final SpaceIdentifier normalize(final SpaceIdentifier identifier)
{
- return GroupIdentifierHelper.normalize(identifier, homeSpaceCodeOrNull,
+ return SpaceIdentifierHelper.normalize(identifier, homeSpaceCodeOrNull,
databaseInstanceFinder);
}
public final SampleIdentifier normalize(final SampleIdentifier identifier)
{
- return GroupIdentifierHelper.normalize(identifier, homeSpaceCodeOrNull,
+ return SpaceIdentifierHelper.normalize(identifier, homeSpaceCodeOrNull,
databaseInstanceFinder);
}
}
@@ -133,7 +133,7 @@ public final class GroupIdentifierHelper
}
/**
- * Creates database instance finder which caches all existing database instance at the begining.
+ * Creates database instance finder which caches all existing database instance at the start.
*/
public final static IDatabaseInstanceFinder createCachedInstanceFinder(
final IAuthorizationDAOFactory daoFactory)