diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
index d99249387329181d39b9a10624acf8a062553ea1..1f5bc1e53abc238593a73f67a2296ff03d43f773 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
@@ -190,9 +190,9 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectUpdatesDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.DatabaseInstanceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifierFactory;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.parser.BisTabFileLoader;
/**
@@ -346,8 +346,8 @@ public final class CommonClientService extends AbstractClientService implements
final Grantee grantee)
{
final String sessionToken = getSessionToken();
- final GroupIdentifier groupIdentifier =
- new GroupIdentifier(DatabaseInstanceIdentifier.HOME, group);
+ final SpaceIdentifier groupIdentifier =
+ new SpaceIdentifier(DatabaseInstanceIdentifier.HOME, group);
commonServer.registerSpaceRole(sessionToken, role.getRoleCode(), groupIdentifier, grantee);
}
@@ -363,8 +363,8 @@ public final class CommonClientService extends AbstractClientService implements
final Grantee grantee)
{
final String sessionToken = getSessionToken();
- final GroupIdentifier groupIdentifier =
- new GroupIdentifier(DatabaseInstanceIdentifier.HOME, group);
+ final SpaceIdentifier groupIdentifier =
+ new SpaceIdentifier(DatabaseInstanceIdentifier.HOME, group);
commonServer.deleteSpaceRole(sessionToken, role.getRoleCode(), groupIdentifier, grantee);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
index 037b58e14471641296d3bebc95e403e4c52fc99c..a326af7d7da0c6f14df20040438b5593ba62730b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
@@ -170,7 +170,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.VocabularyPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.VocabularyTermPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
@@ -1289,8 +1288,8 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements
Session session = getSession(sessionToken);
ISpaceBO spaceBO = businessObjectFactory.createSpaceBO(session);
- GroupIdentifier identifier =
- new GroupIdentifier(spaceIdentifier.getDatabaseInstanceCode(),
+ SpaceIdentifier identifier =
+ new SpaceIdentifier(spaceIdentifier.getDatabaseInstanceCode(),
spaceIdentifier.getSpaceCode());
try
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java
index 8f6a4be6315fc3bca10f5eda615692e753200185..0668cbb0f178ae69f7e8e113557301e336e9bb56 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java
@@ -75,7 +75,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SampleUpdatesDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.dto.SimpleDataSetInformationDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
@@ -370,7 +369,7 @@ public class ETLServiceLogger extends AbstractServerLogger implements IETLLIMSSe
}
public SamplePE getSampleWithProperty(String sessionToken, String propertyTypeCode,
- GroupIdentifier groupIdentifier, String propertyValue)
+ SpaceIdentifier groupIdentifier, String propertyValue)
{
logAccess(sessionToken, "getSampleWithProperty",
"PROPERTY_TYPE(%s) SPACE(%s) PROPERTY_VALUE(%s)", propertyTypeCode,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBO.java
index 555cf8a9e37d3f08a824a83cb95518043bf77a2c..0f25467840c249f43989d633d6dd87c2473b2d11 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBO.java
@@ -34,7 +34,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
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.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.IdentifierHelper;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
@@ -97,8 +96,8 @@ public final class SpaceBO extends AbstractBusinessObject implements ISpaceBO
{
assert groupCode != null : "Unspecified space code.";
space = new SpacePE();
- final GroupIdentifier groupIdentifier =
- new GroupIdentifier(DatabaseInstanceIdentifier.HOME, groupCode);
+ final SpaceIdentifier groupIdentifier =
+ new SpaceIdentifier(DatabaseInstanceIdentifier.HOME, groupCode);
final DatabaseInstancePE databaseInstance =
SpaceIdentifierHelper.getDatabaseInstance(groupIdentifier, this);
space.setDatabaseInstance(databaseInstance);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/ProjectUpdatesPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/ProjectUpdatesPredicate.java
index 0f8241f5aaec50c4219be7792df0b14f0b027016..b43402d3b215a8af8c73aba0966d0222a8035a51 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/ProjectUpdatesPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/ProjectUpdatesPredicate.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.AbstractT
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectUpdatesDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.DatabaseInstanceIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* An <code>IPredicate</code> implementation based on {@link ProjectUpdatesDTO}. Checks that: 1) the
@@ -60,8 +60,8 @@ public class ProjectUpdatesPredicate extends AbstractPredicate<ProjectUpdatesDTO
}
@Override
- protected
- Status doEvaluation(final PersonPE person, final List<RoleWithIdentifier> allowedRoles,
+ protected Status doEvaluation(final PersonPE person,
+ final List<RoleWithIdentifier> allowedRoles,
final ProjectUpdatesDTO updates)
{
assert spacePredicate.initialized : "Predicate has not been initialized";
@@ -75,8 +75,8 @@ public class ProjectUpdatesPredicate extends AbstractPredicate<ProjectUpdatesDTO
String newGroupCode = updates.getGroupCode();
if (newGroupCode != null)
{
- GroupIdentifier newGroupIdentifier =
- new GroupIdentifier(DatabaseInstanceIdentifier.HOME, newGroupCode);
+ SpaceIdentifier newGroupIdentifier =
+ new SpaceIdentifier(DatabaseInstanceIdentifier.HOME, newGroupCode);
status = spacePredicate.doEvaluation(person, allowedRoles, newGroupIdentifier);
}
return status;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/GroupIdentifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/GroupIdentifier.java
deleted file mode 100644
index 062834036db76d6f6a3fd5b3cf0db498c94b8c80..0000000000000000000000000000000000000000
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/GroupIdentifier.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2008 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.generic.shared.dto.identifier;
-
-import ch.systemsx.cisd.openbis.generic.shared.IServer;
-
-/**
- * Deprecated naming, use {@link SpaceIdentifier} instead. Created to avoid extensive code changes
- * and naming clashes.
- *
- * @author Tomasz Pylak
- */
-public class GroupIdentifier extends SpaceIdentifier
-{
- private static final long serialVersionUID = IServer.VERSION;
-
- public GroupIdentifier(DatabaseInstanceIdentifier databaseInstanceIdentifier, String spaceCode)
- {
- super(databaseInstanceIdentifier, spaceCode);
- }
-
- public GroupIdentifier(final String databaseInstanceCode, final String spaceCode)
- {
- super(databaseInstanceCode, spaceCode);
- }
-
- public static GroupIdentifier createHome()
- {
- return new GroupIdentifier(getHomeSpaceCode(), DatabaseInstanceIdentifier.HOME);
- }
-}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java
index d784c816979fa07b04252e967dd2939f0d82b331..a95d90aa52b2eceb658f741af20407975be35da0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java
@@ -49,14 +49,14 @@ public final class IdentifierHelper
}
/**
- * Creates a {@link GroupIdentifier} from given <var>groupPE</var>.
+ * Creates a {@link SpaceIdentifier} from given <var>groupPE</var>.
*/
- public final static GroupIdentifier createGroupIdentifier(final SpacePE groupPE)
+ public final static SpaceIdentifier createGroupIdentifier(final SpacePE groupPE)
{
assert groupPE != null : "Unspecified space";
assert groupPE.getDatabaseInstance() != null : "Any space must "
+ "be attached to a database instance";
- return new GroupIdentifier(createDatabaseInstanceIdentifier(groupPE.getDatabaseInstance()),
+ return new SpaceIdentifier(createDatabaseInstanceIdentifier(groupPE.getDatabaseInstance()),
groupPE.getCode());
}
@@ -179,8 +179,8 @@ public final class IdentifierHelper
DatabaseInstanceIdentifier instanceIdentifier =
space.getInstance().isHomeDatabase() ? DatabaseInstanceIdentifier.HOME_INSTANCE
: new DatabaseInstanceIdentifier(space.getInstance().getCode());
- GroupIdentifier groupIdentifier =
- new GroupIdentifier(instanceIdentifier, space.getCode());
+ SpaceIdentifier groupIdentifier =
+ new SpaceIdentifier(instanceIdentifier, space.getCode());
return new SampleIdentifier(groupIdentifier, sample.getCode());
} else
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java
index 60ffc9aae962c7cddf6b6d84252841f2a3895525..4005a1461854dbda6c5d56b796e0e3b47402d784 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java
@@ -83,7 +83,7 @@ public class SampleIdentifier extends SampleOwnerIdentifier
/** Home group level {@link SampleIdentifier} with type. */
public static SampleIdentifier createHomeGroup(final String sampleCode)
{
- return new SampleIdentifier(GroupIdentifier.createHome(), sampleCode);
+ return new SampleIdentifier(SpaceIdentifier.createHome(), sampleCode);
}
public String getSampleCode()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierPattern.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierPattern.java
index 4dc9542425e243245909e61ec94ce4df5f9bfd6b..50bb1faaf6829bc3974c185f4872781c0db8704f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierPattern.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierPattern.java
@@ -40,7 +40,7 @@ public class SampleIdentifierPattern extends AbstractHashable implements Seriali
* Matches samples from the specified group and the database instance to which this group
* belongs. Only samples with the code matching sampleCodePattern will be selected.
*/
- public static SampleIdentifierPattern[] createGroupVisible(GroupIdentifier groupIdentifier,
+ public static SampleIdentifierPattern[] createGroupVisible(SpaceIdentifier groupIdentifier,
String sampleCodePattern)
{
SampleOwnerIdentifier groupOwner = new SampleOwnerIdentifier(groupIdentifier);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
index c6f5c7cc1e993e6efeaa7a06d80ec8ea5b389d72..4e3ca1190ac9c0bf74f8a468ea5808e27e847c70 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
@@ -68,11 +68,11 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentUpdatesDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.SampleUpdatesDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifierFactory;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.parser.NamedInputStream;
import ch.systemsx.cisd.openbis.generic.shared.parser.SampleUploadSectionsParser;
import ch.systemsx.cisd.openbis.generic.shared.parser.SampleUploadSectionsParser.BatchSamplesOperation;
@@ -281,7 +281,7 @@ public class GenericClientService extends AbstractClientService implements IGene
parseSamples(
experiment.getSampleType(),
samplesSessionKey,
- new GroupIdentifier(identifier.getDatabaseInstanceCode(), identifier
+ new SpaceIdentifier(identifier.getDatabaseInstanceCode(), identifier
.getSpaceCode()).toString(), experiment.isGenerateCodes(),
false, null, BatchOperationKind.REGISTRATION);
experiment.setNewSamples(result.getSamples());
@@ -543,7 +543,7 @@ public class GenericClientService extends AbstractClientService implements IGene
parseSamples(
updates.getSampleType(),
updates.getSamplesSessionKey(),
- new GroupIdentifier(newProject.getDatabaseInstanceCode(), newProject
+ new SpaceIdentifier(newProject.getDatabaseInstanceCode(), newProject
.getSpaceCode()).toString(), updates.isGenerateCodes(), false,
null, BatchOperationKind.REGISTRATION);
updates.setNewSamples(info.getSamples());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IdentifersExtractor.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IdentifersExtractor.java
index 0cd7ce31473e2b08a0631c7265810c063f3acdc1..0fa428b7018bbec2a602b9050526b124c9940326 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IdentifersExtractor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IdentifersExtractor.java
@@ -19,9 +19,9 @@ package ch.systemsx.cisd.openbis.plugin.generic.server;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifierFactory;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* Helper class which extract identifiers from a {@link NewSample} instance.
@@ -49,7 +49,7 @@ class IdentifersExtractor
.createIdentifier(updatedSample.getDefaultSpaceIdentifier());
// TODO 2011-08-31, Tomasz Pylak: container is ignored, what does it break?
newSampleIdentifier =
- new SampleIdentifier(new GroupIdentifier(
+ new SampleIdentifier(new SpaceIdentifier(
experimentIdentifierOrNull.getDatabaseInstanceCode(),
experimentIdentifierOrNull.getSpaceCode()),
oldSampleIdentifier.getSampleCode());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java
index 857ae5be7376c6f4f489d4730268d058e79bf279..51b9c216f9602d60984e4adebf4a068593082ade 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java
@@ -35,7 +35,7 @@ import ch.systemsx.cisd.openbis.generic.shared.authorization.RoleWithIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.IPredicate;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* Test cases for corresponding {@link PredicateExecutor} class.
@@ -60,7 +60,7 @@ public final class PredicateExecutorTest extends AuthorizationTestCase
private List<RoleWithIdentifier> createAllowedRoles()
{
- return Collections.singletonList(createGroupRole(RoleCode.USER, new GroupIdentifier("DB1",
+ return Collections.singletonList(createGroupRole(RoleCode.USER, new SpaceIdentifier("DB1",
"3V")));
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
index bff5f815a15d8416dcb31d55a4c2959274161ef0..09ccda20b6ebcd0a407f25b67aaba7d112fcd2b1 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
@@ -69,9 +69,9 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.VocabularyPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.VocabularyTermPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.DatabaseInstanceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.types.DataSetTypeCode;
/**
@@ -89,14 +89,14 @@ public class DataBOTest extends AbstractBOTest
private static final DatabaseInstanceIdentifier DATABASE_INSTANCE_IDENTIFIER =
new DatabaseInstanceIdentifier(ManagerTestTool.EXAMPLE_DATABASE_INSTANCE.getCode());
- private static final GroupIdentifier GROUP_IDENTIFIER = new GroupIdentifier(
+ private static final SpaceIdentifier SPACE_IDENTIFIER = new SpaceIdentifier(
DATABASE_INSTANCE_IDENTIFIER, ManagerTestTool.EXAMPLE_GROUP.getCode());
private static final SampleIdentifier SAMPLE_IDENTIFIER = new SampleIdentifier(
- GROUP_IDENTIFIER, "EXAMPLE_SAMPLE");
+ SPACE_IDENTIFIER, "EXAMPLE_SAMPLE");
private static final ExperimentIdentifier EXPERIMENT_IDENTIFIER = new ExperimentIdentifier(
- new ProjectIdentifier(GROUP_IDENTIFIER, ManagerTestTool.EXAMPLE_PROJECT.getCode()),
+ new ProjectIdentifier(SPACE_IDENTIFIER, ManagerTestTool.EXAMPLE_PROJECT.getCode()),
"EXPERIMENT_CODE");
private static final String DATA_STORE_CODE = "dss1";
@@ -807,7 +807,7 @@ public class DataBOTest extends AbstractBOTest
will(returnValue(ManagerTestTool.EXAMPLE_DATABASE_INSTANCE));
one(spaceDAO).tryFindSpaceByCodeAndDatabaseInstance(
- GROUP_IDENTIFIER.getSpaceCode(),
+ SPACE_IDENTIFIER.getSpaceCode(),
ManagerTestTool.EXAMPLE_DATABASE_INSTANCE);
will(returnValue(ManagerTestTool.EXAMPLE_GROUP));
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTableTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTableTest.java
index 136c71b311325f3fd72d79d2ffc82a54ede1a30a..f8f345919ce917ba8550ba1c3226ad26d0a3dc34 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTableTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTableTest.java
@@ -25,10 +25,10 @@ import ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Grantee;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
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.NewRoleAssignment;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* Test cases for corresponding {@link RoleAssignmentTable} class.
@@ -49,8 +49,8 @@ public final class RoleAssignmentTableTest extends AbstractBOTest
final NewRoleAssignment newRoleAssignment = new NewRoleAssignment();
final String databaseInstanceCode = "DB2";
final String groupCode = "cisd";
- final GroupIdentifier groupIdentifier =
- new GroupIdentifier(databaseInstanceCode, groupCode);
+ final SpaceIdentifier groupIdentifier =
+ new SpaceIdentifier(databaseInstanceCode, groupCode);
newRoleAssignment.setSpaceIdentifier(groupIdentifier);
newRoleAssignment.setRole(RoleCode.OBSERVER);
final String userId = "test";
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationTestCase.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationTestCase.java
index 3e65f0a59d7f977655daebfe6cdfee39f2733684..a84cf1f5743e3685a7e76ea17a4a8ef1ed951310 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationTestCase.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationTestCase.java
@@ -44,7 +44,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.SampleTypePE;
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.GroupIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* @author Franz-Josef Elmer
@@ -76,7 +76,7 @@ public class AuthorizationTestCase extends AssertJUnit
* Creates a role with level {@link RoleLevel#SPACE} with specified role code for specified
* space.
*/
- protected RoleWithIdentifier createGroupRole(RoleCode roleCode, GroupIdentifier spaceIdentifier)
+ protected RoleWithIdentifier createGroupRole(RoleCode roleCode, SpaceIdentifier spaceIdentifier)
{
SpacePE groupPE = new SpacePE();
groupPE.setCode(spaceIdentifier.getSpaceCode());
@@ -186,7 +186,7 @@ public class AuthorizationTestCase extends AssertJUnit
/**
* Creates a group based on the specified identifier.
*/
- protected SpacePE createGroup(GroupIdentifier identifier)
+ protected SpacePE createGroup(SpaceIdentifier identifier)
{
final String databaseInstanceCode = identifier.getDatabaseInstanceCode();
final DatabaseInstancePE instance = createDatabaseInstance(databaseInstanceCode);
@@ -331,7 +331,7 @@ public class AuthorizationTestCase extends AssertJUnit
{
final List<RoleWithIdentifier> list = new ArrayList<RoleWithIdentifier>();
final RoleWithIdentifier groupRole =
- createGroupRole(RoleCode.USER, new GroupIdentifier(INSTANCE_CODE, SPACE_CODE));
+ createGroupRole(RoleCode.USER, new SpaceIdentifier(INSTANCE_CODE, SPACE_CODE));
list.add(groupRole);
if (withInstanceRole)
{
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/RoleWithIdentifierTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/RoleWithIdentifierTest.java
index ee1ada722d3f15a8dc8c5c9c0d3e450ecaf406f2..1a9eaea401a6b69378bab8d467f2246e006e74a4 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/RoleWithIdentifierTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/RoleWithIdentifierTest.java
@@ -29,9 +29,9 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleLevel;
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.RoleAssignmentPE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* Test cases for corresponding {@link RoleWithIdentifier} class.
@@ -46,10 +46,10 @@ public final class RoleWithIdentifierTest extends AuthorizationTestCase
{
final RoleWithHierarchy role = RoleWithHierarchy.valueOf(RoleLevel.SPACE, RoleCode.ADMIN);
RoleWithIdentifier roleWithCode =
- createGroupRole(RoleCode.ADMIN, new GroupIdentifier(INSTANCE_IDENTIFIER, "CISD"));
+ createGroupRole(RoleCode.ADMIN, new SpaceIdentifier(INSTANCE_IDENTIFIER, "CISD"));
assertEquals(role, roleWithCode.getRole());
roleWithCode =
- createGroupRole(RoleCode.ADMIN, new GroupIdentifier(INSTANCE_IDENTIFIER, ""));
+ createGroupRole(RoleCode.ADMIN, new SpaceIdentifier(INSTANCE_IDENTIFIER, ""));
assertEquals(role, roleWithCode.getRole());
}
@@ -59,9 +59,9 @@ public final class RoleWithIdentifierTest extends AuthorizationTestCase
final Set<RoleWithHierarchy> singleton =
Collections.singleton(RoleWithHierarchy.valueOf(RoleLevel.SPACE, RoleCode.ADMIN));
final List<RoleWithIdentifier> list = new ArrayList<RoleWithIdentifier>();
- list.add(createGroupRole(RoleCode.ADMIN, new GroupIdentifier(INSTANCE_IDENTIFIER, "CISD")));
- list.add(createGroupRole(RoleCode.USER, new GroupIdentifier(INSTANCE_IDENTIFIER, "3V")));
- list.add(createGroupRole(RoleCode.ADMIN, new GroupIdentifier(INSTANCE_IDENTIFIER, "IMSB")));
+ list.add(createGroupRole(RoleCode.ADMIN, new SpaceIdentifier(INSTANCE_IDENTIFIER, "CISD")));
+ list.add(createGroupRole(RoleCode.USER, new SpaceIdentifier(INSTANCE_IDENTIFIER, "3V")));
+ list.add(createGroupRole(RoleCode.ADMIN, new SpaceIdentifier(INSTANCE_IDENTIFIER, "IMSB")));
list.add(createInstanceRole(RoleCode.ETL_SERVER, INSTANCE_IDENTIFIER));
DefaultAccessController.retainMatchingRoleWithIdentifiers(list, singleton);
assertEquals(2, list.size());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/DatabaseInstanceIdentifierPredicateTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/DatabaseInstanceIdentifierPredicateTest.java
index 438339ef012cbf23994cbb222af234f6c7f289f8..fa284ad30e53af7605234c1078fb3967ccdb896b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/DatabaseInstanceIdentifierPredicateTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/DatabaseInstanceIdentifierPredicateTest.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.authorization.AuthorizationTestCa
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.DatabaseInstanceIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* Test cases for corresponding {@link DatabaseInstanceIdentifierPredicate} class.
@@ -126,7 +126,7 @@ public final class DatabaseInstanceIdentifierPredicateTest extends Authorization
predicate.init(provider);
final PersonPE person = createPerson();
final Status evaluation =
- predicate.doEvaluation(person, createRoles(false), new GroupIdentifier(
+ predicate.doEvaluation(person, createRoles(false), new SpaceIdentifier(
new DatabaseInstanceIdentifier(databaseInstance.getCode()),
SPACE_CODE));
assertEquals(Status.OK, evaluation);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/NewSamplePredicateTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/NewSamplePredicateTest.java
index 0864bc65cd9ff0fa36579e6ce3cd9fdee81350b4..50e5114c4de833cc51b5bbd3afc53120b1072e1a 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/NewSamplePredicateTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/NewSamplePredicateTest.java
@@ -27,8 +27,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
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.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* @author Franz-Josef Elmer
@@ -81,7 +81,7 @@ public class NewSamplePredicateTest extends AuthorizationTestCase
NewSamplePredicate predicate = new NewSamplePredicate();
SampleType sampleType = new SampleType();
SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new GroupIdentifier(INSTANCE_CODE, SPACE_CODE), "s1");
+ new SampleIdentifier(new SpaceIdentifier(INSTANCE_CODE, SPACE_CODE), "s1");
NewSample sample =
NewSample.createWithParent(sampleIdentifier.toString(), sampleType, "container",
"parent");
@@ -99,7 +99,7 @@ public class NewSamplePredicateTest extends AuthorizationTestCase
{
NewSamplePredicate predicate = new NewSamplePredicate();
SampleType sampleType = new SampleType();
- GroupIdentifier groupIdentifier = new GroupIdentifier(INSTANCE_CODE, ANOTHER_GROUP_CODE);
+ SpaceIdentifier groupIdentifier = new SpaceIdentifier(INSTANCE_CODE, ANOTHER_GROUP_CODE);
SampleIdentifier sampleIdentifier = new SampleIdentifier(groupIdentifier, "s1");
NewSample sample =
NewSample.createWithParent(sampleIdentifier.toString(), sampleType, "container",
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SampleOwnerIdentifierPredicateTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SampleOwnerIdentifierPredicateTest.java
index 17caa5333b349e37e63415dbbd0ca7c6d5f8d8b6..8dc8ab231adfb832db1635742f3480bd1bbc21a8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SampleOwnerIdentifierPredicateTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SampleOwnerIdentifierPredicateTest.java
@@ -24,8 +24,8 @@ import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.openbis.generic.shared.authorization.AuthorizationTestCase;
import ch.systemsx.cisd.openbis.generic.shared.authorization.RoleWithIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleOwnerIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* @author Franz-Josef Elmer
@@ -107,7 +107,7 @@ public class SampleOwnerIdentifierPredicateTest extends AuthorizationTestCase
PersonPE person = createPerson();
List<RoleWithIdentifier> roles = createRoles(false);
SampleOwnerIdentifier identifier =
- new SampleOwnerIdentifier(new GroupIdentifier(INSTANCE_IDENTIFIER, SPACE_CODE));
+ new SampleOwnerIdentifier(new SpaceIdentifier(INSTANCE_IDENTIFIER, SPACE_CODE));
prepareProvider(INSTANCE_CODE, createDatabaseInstance(), createGroups());
predicate.init(provider);
@@ -124,7 +124,7 @@ public class SampleOwnerIdentifierPredicateTest extends AuthorizationTestCase
PersonPE person = createPerson();
List<RoleWithIdentifier> roles = createRoles(false);
SampleOwnerIdentifier identifier =
- new SampleOwnerIdentifier(new GroupIdentifier(ANOTHER_INSTANCE_CODE,
+ new SampleOwnerIdentifier(new SpaceIdentifier(ANOTHER_INSTANCE_CODE,
ANOTHER_GROUP_CODE));
prepareProvider(ANOTHER_INSTANCE_CODE, createAnotherDatabaseInstance(), createGroups());
predicate.init(provider);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SpaceIdentifierPredicateTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SpaceIdentifierPredicateTest.java
index 2d65379dbf41462640e1c9547429dad8b74e27cf..97f77581d320183707953d0894f076f5166a2fa2 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SpaceIdentifierPredicateTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/SpaceIdentifierPredicateTest.java
@@ -26,9 +26,9 @@ import ch.systemsx.cisd.common.exceptions.StatusFlag;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.shared.authorization.AuthorizationTestCase;
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.identifier.GroupIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* Test cases for corresponding {@link SpaceIdentifierPredicate} class.
@@ -45,7 +45,7 @@ public final class SpaceIdentifierPredicateTest extends AuthorizationTestCase
try
{
predicate
- .doEvaluation(createPerson(), createRoles(false), GroupIdentifier.createHome());
+ .doEvaluation(createPerson(), createRoles(false), SpaceIdentifier.createHome());
} catch (final AssertionError e)
{
fail = false;
@@ -60,7 +60,7 @@ public final class SpaceIdentifierPredicateTest extends AuthorizationTestCase
final SpaceIdentifierPredicate predicate = new SpaceIdentifierPredicate();
prepareProvider(INSTANCE_CODE, null, Collections.<SpacePE> emptyList());
predicate.init(provider);
- predicate.doEvaluation(createPerson(), createRoles(false), new GroupIdentifier(
+ predicate.doEvaluation(createPerson(), createRoles(false), new SpaceIdentifier(
INSTANCE_CODE, SPACE_CODE)).isError();
context.assertIsSatisfied();
}
@@ -71,7 +71,7 @@ public final class SpaceIdentifierPredicateTest extends AuthorizationTestCase
final SpaceIdentifierPredicate predicate = new SpaceIdentifierPredicate();
prepareProvider(INSTANCE_CODE, createDatabaseInstance(), Collections.<SpacePE> emptyList());
predicate.init(provider);
- assertTrue(predicate.doEvaluation(createPerson(), createRoles(false), new GroupIdentifier(
+ assertTrue(predicate.doEvaluation(createPerson(), createRoles(false), new SpaceIdentifier(
INSTANCE_CODE, SPACE_CODE)).isError());
context.assertIsSatisfied();
}
@@ -83,7 +83,7 @@ public final class SpaceIdentifierPredicateTest extends AuthorizationTestCase
prepareProvider(INSTANCE_CODE, createDatabaseInstance(), createGroups());
predicate.init(provider);
final Status evaluation =
- predicate.doEvaluation(createPerson(), createRoles(false), new GroupIdentifier(
+ predicate.doEvaluation(createPerson(), createRoles(false), new SpaceIdentifier(
INSTANCE_CODE, SPACE_CODE));
assertEquals(Status.OK, evaluation);
context.assertIsSatisfied();
@@ -98,7 +98,7 @@ public final class SpaceIdentifierPredicateTest extends AuthorizationTestCase
final PersonPE person = createPerson();
final SpacePE homeGroup = createGroup();
person.setHomeSpace(homeGroup);
- final GroupIdentifier groupIdentifier = new GroupIdentifier(INSTANCE_CODE, null);
+ final SpaceIdentifier groupIdentifier = new SpaceIdentifier(INSTANCE_CODE, null);
final Status evaluation =
predicate.doEvaluation(person, createRoles(false), groupIdentifier);
assertEquals(Status.OK, evaluation);
@@ -112,7 +112,7 @@ public final class SpaceIdentifierPredicateTest extends AuthorizationTestCase
prepareProvider(ANOTHER_INSTANCE_CODE, createAnotherDatabaseInstance(), createGroups());
predicate.init(provider);
final Status evaluation =
- predicate.doEvaluation(createPerson(), createRoles(false), new GroupIdentifier(
+ predicate.doEvaluation(createPerson(), createRoles(false), new SpaceIdentifier(
ANOTHER_INSTANCE_CODE, ANOTHER_GROUP_CODE));
assertEquals(StatusFlag.ERROR, evaluation.getFlag());
assertEquals("User 'megapixel' does not have enough privileges.", evaluation
@@ -130,7 +130,7 @@ public final class SpaceIdentifierPredicateTest extends AuthorizationTestCase
prepareProvider(INSTANCE_CODE, createDatabaseInstance(), groups);
predicate.init(provider);
final Status evaluation =
- predicate.doEvaluation(createPerson(), createRoles(false), new GroupIdentifier(
+ predicate.doEvaluation(createPerson(), createRoles(false), new SpaceIdentifier(
INSTANCE_CODE, ANOTHER_GROUP_CODE));
assertEquals(StatusFlag.ERROR, evaluation.getFlag());
assertEquals("User 'megapixel' does not have enough privileges.", evaluation
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierTest.java
index 8780fb3266a8abd8dd8b36abe76912f34300002d..2636aa08b68d6c6281e59b4119b5762b8e1de865 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierTest.java
@@ -43,7 +43,7 @@ public final class SampleIdentifierTest
public final void testToStringGroupLevelHomeBd()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new GroupIdentifier(DatabaseInstanceIdentifier.HOME, "GR"),
+ new SampleIdentifier(new SpaceIdentifier(DatabaseInstanceIdentifier.HOME, "GR"),
"SAMP");
assertEquals(sampleIdentifier.toString(), "/GR/SAMP");
}
@@ -52,7 +52,7 @@ public final class SampleIdentifierTest
public final void testToStringGroupLevel()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new GroupIdentifier("DB", "GR"), "SAMP");
+ new SampleIdentifier(new SpaceIdentifier("DB", "GR"), "SAMP");
assertEquals(sampleIdentifier.toString(), "DB:/GR/SAMP");
}
@@ -76,13 +76,13 @@ public final class SampleIdentifierTest
SampleIdentifier[] expectedOrder =
new SampleIdentifier[]
{ SampleIdentifier.createHomeGroup(c1), SampleIdentifier.createHomeGroup(c2),
- new SampleIdentifier(new GroupIdentifier(homeDb, g1), c1),
- new SampleIdentifier(new GroupIdentifier(homeDb, g2), c1),
- new SampleIdentifier(new GroupIdentifier(homeDb, g2), c2),
- new SampleIdentifier(new GroupIdentifier(otherDb, g1), c1),
- new SampleIdentifier(new GroupIdentifier(otherDb, g1), c2),
- new SampleIdentifier(new GroupIdentifier(otherDb, g2), c1),
- new SampleIdentifier(new GroupIdentifier(otherDb, g2), c2) };
+ new SampleIdentifier(new SpaceIdentifier(homeDb, g1), c1),
+ new SampleIdentifier(new SpaceIdentifier(homeDb, g2), c1),
+ new SampleIdentifier(new SpaceIdentifier(homeDb, g2), c2),
+ new SampleIdentifier(new SpaceIdentifier(otherDb, g1), c1),
+ new SampleIdentifier(new SpaceIdentifier(otherDb, g1), c2),
+ new SampleIdentifier(new SpaceIdentifier(otherDb, g2), c1),
+ new SampleIdentifier(new SpaceIdentifier(otherDb, g2), c2) };
SampleIdentifier[] idents = revert(expectedOrder);
Arrays.sort(idents);
@@ -96,7 +96,7 @@ public final class SampleIdentifierTest
SampleIdentifier id2 = new SampleIdentifierFactory("DB:/SPACE/SAMP").createIdentifier();
assertEquals(id1, id2);
}
-
+
@Test
public void testEquals2()
{
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/GroupIdentifierTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierTest.java
similarity index 71%
rename from openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/GroupIdentifierTest.java
rename to openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierTest.java
index c4812d2ead326a2aad3220c332175966cad90057..00c66609e3533602c4f3dc102f7672d81317b16b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/GroupIdentifierTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierTest.java
@@ -23,12 +23,12 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.test.EqualsHashCodeTestCase;
/**
- * Test cases for corresponding {@link GroupIdentifier} class.
+ * Test cases for corresponding {@link SpaceIdentifier} class.
*
* @author Christian Ribeaud
*/
@Test
-public class GroupIdentifierTest extends EqualsHashCodeTestCase<GroupIdentifier>
+public class SpaceIdentifierTest extends EqualsHashCodeTestCase<SpaceIdentifier>
{
//
@@ -36,20 +36,20 @@ public class GroupIdentifierTest extends EqualsHashCodeTestCase<GroupIdentifier>
//
@Override
- protected final GroupIdentifier createInstance() throws Exception
+ protected final SpaceIdentifier createInstance() throws Exception
{
- return new GroupIdentifier("DB1", "G");
+ return new SpaceIdentifier("DB1", "G");
}
@Override
- protected final GroupIdentifier createNotEqualInstance() throws Exception
+ protected final SpaceIdentifier createNotEqualInstance() throws Exception
{
- return new GroupIdentifier((String) null, "G");
+ return new SpaceIdentifier((String) null, "G");
}
@Test
public final void testEqualsIgnoreCase()
{
- assertEquals(new GroupIdentifier("DB2", "G"), new GroupIdentifier("DB2", "g"));
+ assertEquals(new SpaceIdentifier("DB2", "G"), new SpaceIdentifier("DB2", "g"));
}
}
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/etlserver/proteomics/AbundanceHandlerTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/etlserver/proteomics/AbundanceHandlerTest.java
index 9f9d057a1b1bffd57b53157e49734e1a35b80f11..609dfce3818f11c7ab957e625ed03a45945a8619 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/etlserver/proteomics/AbundanceHandlerTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/etlserver/proteomics/AbundanceHandlerTest.java
@@ -37,7 +37,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.dto.ListSamplesByPropertyCriteria;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
@@ -56,7 +55,7 @@ public class AbundanceHandlerTest extends AssertJUnit
private static final String EXPERIMENT_CODE = "E1";
- private static final GroupIdentifier GROUP_IDENTIFIER = new GroupIdentifier((String) null,
+ private static final SpaceIdentifier SPACE_IDENTIFIER_MS = new SpaceIdentifier((String) null,
CommonConstants.MS_DATA_SPACE);
private static final String PARAMETER_VALUE = "1234.5";
@@ -65,7 +64,7 @@ public class AbundanceHandlerTest extends AssertJUnit
private static final String PARAMETER_NAME = "ABC12";
- private static final SampleIdentifier SAMPLE_IDENTIFER = new SampleIdentifier(GROUP_IDENTIFIER,
+ private static final SampleIdentifier SAMPLE_IDENTIFER = new SampleIdentifier(SPACE_IDENTIFIER_MS,
PARAMETER_NAME);
private static final ExperimentIdentifier EXPERIMENT_IDENTIFIER = new ExperimentIdentifier(
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/etlserver/proteomics/ResultDataSetUploaderTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/etlserver/proteomics/ResultDataSetUploaderTest.java
index 529777c451b7dc5c2d84ca60e1f5a6a42962937c..0df43a774568186e4411bff883580d7682147f49 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/etlserver/proteomics/ResultDataSetUploaderTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/etlserver/proteomics/ResultDataSetUploaderTest.java
@@ -64,7 +64,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space;
import ch.systemsx.cisd.openbis.generic.shared.dto.ListSamplesByPropertyCriteria;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
import ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.CommonConstants;
@@ -309,7 +309,7 @@ public class ResultDataSetUploaderTest extends AssertJUnit
p1.setName(PROTEIN_NAME1);
p1.getParameters().add(createAbundance(CELL_LYSATE1, 2.5));
p1.getParameters().add(new Parameter());
- final GroupIdentifier groupIdentifier = new GroupIdentifier((String) null, CommonConstants.MS_DATA_SPACE);
+ final SpaceIdentifier groupIdentifier = new SpaceIdentifier((String) null, CommonConstants.MS_DATA_SPACE);
final SampleIdentifier sampleIdentifier =
new SampleIdentifier(groupIdentifier, CELL_LYSATE1);
final ListSamplesByPropertyCriteria criteria =
diff --git a/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/DatasetMappingResolver.java b/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/DatasetMappingResolver.java
index 86b682c3b18498e5cfa5dafa8b2dc3fbd172de7e..89a35694cb4ebe2c51c928b9f899de4f15c0c965 100644
--- a/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/DatasetMappingResolver.java
+++ b/rtd_yeastx/source/java/ch/systemsx/cisd/yeastx/etl/DatasetMappingResolver.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.dto.ListSamplesByPropertyCriteria;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.LocalExperimentIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
@@ -376,7 +376,7 @@ class DatasetMappingResolver
private SampleIdentifier createSampleIdentifier(String sampleCode,
DataSetMappingInformation mapping)
{
- return new SampleIdentifier(new GroupIdentifier((String) null, mapping
+ return new SampleIdentifier(new SpaceIdentifier((String) null, mapping
.getSpaceOrGroupCode()), sampleCode);
}