diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/PersistentEntityPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/PersistentEntityPredicate.java
index ac1e82e8f8143ab23faf8082dc6ed85bd4352a57..74a141c17566e08d4451c7ed59d7843e81a9855f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/PersistentEntityPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/PersistentEntityPredicate.java
@@ -36,43 +36,34 @@ public abstract class PersistentEntityPredicate<T> implements IPredicate<T>
{
@Override
- public Status evaluate(PersonPE person, List<RoleWithIdentifier> allowedRoles, T valueOrNull)
+ public Status evaluate(PersonPE person, List<RoleWithIdentifier> allowedRoles, T value)
throws UserFailureException
{
- if (valueOrNull == null)
+ if (value == null)
{
return Status.createError("null value cannot be authorized");
}
+ SpacePE space = getSpace(value);
+ DatabaseInstancePE instance =
+ space != null ? space.getDatabaseInstance() : getInstance(value);
+
for (RoleWithIdentifier allowed : allowedRoles)
{
- if (allowed.getRoleLevel().equals(RoleLevel.INSTANCE))
- {
- if (allowed.getAssignedDatabaseInstance().equals(getInstance(valueOrNull)))
- {
- return Status.OK;
- }
-
- SpacePE space = getSpace(valueOrNull);
-
- if (space != null)
- {
- if (space.getDatabaseInstance().equals(allowed.getAssignedDatabaseInstance()))
- {
- return Status.OK;
- }
- }
+ RoleLevel level = allowed.getRoleLevel();
- } else
+ if (level.equals(RoleLevel.INSTANCE)
+ && allowed.getAssignedDatabaseInstance().equals(instance))
{
- if (allowed.getAssignedSpace().equals(getSpace(valueOrNull)))
- {
- return Status.OK;
- }
+ return Status.OK;
+ }
+ else if (level.equals(RoleLevel.SPACE) && allowed.getAssignedSpace().equals(space))
+ {
+ return Status.OK;
}
}
- return Status.createError();
+ return Status.createError(person.getUserId() + " does not have enough privileges.");
}
public abstract SpacePE getSpace(T value);
@@ -82,7 +73,5 @@ public abstract class PersistentEntityPredicate<T> implements IPredicate<T>
@Override
public void init(IAuthorizationDataProvider provider)
{
-
}
-
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentTest.java
index fa8dfd62d7840b14021a5a9c3230e08794612aea..c8515ceba783b48fbe0bbf16a2dbe21b9318068e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentTest.java
@@ -253,9 +253,9 @@ public class AssignDataSetToExperimentTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- source = new SpaceDomain("space1", instance);
- destination = new SpaceDomain("space2", instance);
+ instance = new InstanceDomain();
+ source = new SpaceDomain(instance);
+ destination = new SpaceDomain(instance);
assignDataSetToExperimentRule =
and(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToSampleTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToSampleTest.java
index 12751d8f5a13763131e834e09b9bcbf27eefaa7b..1c31a63c05d80069b46d5056e0e4e406f6fff37c 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToSampleTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToSampleTest.java
@@ -272,9 +272,9 @@ public class AssignDataSetToSampleTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- source = new SpaceDomain("space1", instance);
- destination = new SpaceDomain("space2", instance);
+ instance = new InstanceDomain();
+ source = new SpaceDomain(instance);
+ destination = new SpaceDomain(instance);
assignDataSetToSampleRule =
and(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java
index be015459933ba4b27e526df3352011f7632fe82b..03e308e04ef8b5bbee79a43f8362946efbacf464 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java
@@ -143,9 +143,9 @@ public class AssignExperimentToProjectTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- source = new SpaceDomain("space1", instance);
- destination = new SpaceDomain("space2", instance);
+ instance = new InstanceDomain();
+ source = new SpaceDomain(instance);
+ destination = new SpaceDomain(instance);
assignExperimentToProjectRule =
or(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignProjectToSpaceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignProjectToSpaceTest.java
index 17e4a63d787a3ff188460319a7b099f97b8c968e..6eb299f754aaa1a7aa5ab961395412fae3e55749 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignProjectToSpaceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignProjectToSpaceTest.java
@@ -136,9 +136,9 @@ public class AssignProjectToSpaceTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- source = new SpaceDomain("space1", instance);
- destination = new SpaceDomain("space2", instance);
+ instance = new InstanceDomain();
+ source = new SpaceDomain(instance);
+ destination = new SpaceDomain(instance);
assignProjectToSpaceRule =
and(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentTest.java
index c752700b8125561bc4cf236857d60735dd64f329..d04332e8c9b549b6afc8a829e632dd0f620a6717 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentTest.java
@@ -418,9 +418,9 @@ public class AssignSampleToExperimentTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- source = new SpaceDomain("space1", instance);
- destination = new SpaceDomain("space2", instance);
+ instance = new InstanceDomain();
+ source = new SpaceDomain(instance);
+ destination = new SpaceDomain(instance);
assignSampleToExperimentRule =
or(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToSpaceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToSpaceTest.java
index 4d862c5d76299b81d32908af21f34ffae69ed8c5..7842bb08089fa7d5ca78c25c34c0819031bbd948 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToSpaceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToSpaceTest.java
@@ -301,9 +301,9 @@ public class AssignSampleToSpaceTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- source = new SpaceDomain("space1", instance);
- destination = new SpaceDomain("space2", instance);
+ instance = new InstanceDomain();
+ source = new SpaceDomain(instance);
+ destination = new SpaceDomain(instance);
assignSampleToSpaceRule =
or(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RelationshipServiceAuthorizationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RelationshipServiceAuthorizationTest.java
index 8fbafadf1825342b72af2815ee93b1286781be62..3cf6bdb9c5c2bc1785ed22f62a9d4dc11d4443ae 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RelationshipServiceAuthorizationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RelationshipServiceAuthorizationTest.java
@@ -654,11 +654,11 @@ public class RelationshipServiceAuthorizationTest extends BaseTest
pe(this.sourceDataSet));
}
- GuardedDomain instance = new InstanceDomain("instance");
+ GuardedDomain instance = new InstanceDomain();
- GuardedDomain source = new SpaceDomain("source", instance);
+ GuardedDomain source = new SpaceDomain(instance);
- GuardedDomain destination = new SpaceDomain("destination", instance);
+ GuardedDomain destination = new SpaceDomain(instance);
AuthorizationRule spaceAdminOrSpaceEtlServer =
and(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromExperimentTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromExperimentTest.java
index fb5fce4ced06cb110e86ca8f09e24909bf86c2bd..20ef842b26d483df9aeaec3282de660ee711cd76 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromExperimentTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromExperimentTest.java
@@ -246,8 +246,8 @@ public class UnassignSampleFromExperimentTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- spaceDomain = new SpaceDomain("space", instance);
+ instance = new InstanceDomain();
+ spaceDomain = new SpaceDomain(instance);
unassignSampleFromExperimentRule =
or(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
index b94ef05982730b65d87811e439f616c1bae702e5..0802515024cbe3bea87c562ec7dc218e9dc1bda2 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
@@ -243,8 +243,8 @@ public class UnassignSampleFromSpaceTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- spaceDomain = new SpaceDomain("space", instance);
+ instance = new InstanceDomain();
+ spaceDomain = new SpaceDomain(instance);
unassignSampleFromSpaceRule =
and(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetContainmentTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetContainmentTest.java
index 873aee7e16df437e0219fa0c7cfb19c6729d0070..f064974f714cd6b1c43acec091914e99ad6f175e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetContainmentTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetContainmentTest.java
@@ -239,8 +239,8 @@ public class UpdateDataSetContainmentTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- spaceDomain = new SpaceDomain("space", instance);
+ instance = new InstanceDomain();
+ spaceDomain = new SpaceDomain(instance);
addParentToSampleRule = rule(spaceDomain, RoleWithHierarchy.SPACE_POWER_USER);
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetParentsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetParentsTest.java
index 93d6a3ecebe7e189bdc46d05614a2a8aaa5605df..11927ddf83b1e7a5d619df786e257668c65c3bf3 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetParentsTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetParentsTest.java
@@ -278,9 +278,9 @@ public class UpdateDataSetParentsTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- childSpaceDomain = new SpaceDomain("child", instance);
- parentSpaceDomain = new SpaceDomain("parent", instance);
+ instance = new InstanceDomain();
+ childSpaceDomain = new SpaceDomain(instance);
+ parentSpaceDomain = new SpaceDomain(instance);
updateParentsOfDataSetRule =
and(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleContainmentTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleContainmentTest.java
index 11d7a2559ba671757524275773a8a54e893f5f68..aba579bf8686bebdd20c4d93660ac84118628e95 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleContainmentTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleContainmentTest.java
@@ -249,9 +249,9 @@ public class UpdateSampleContainmentTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- containerDomain = new SpaceDomain("container", instance);
- componentDomain = new SpaceDomain("component", instance);
+ instance = new InstanceDomain();
+ containerDomain = new SpaceDomain(instance);
+ componentDomain = new SpaceDomain(instance);
setContainerToSampleRule =
or(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleParentsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleParentsTest.java
index 602bd0332ab5a92808c487646b1023c8bad63bd9..3c70994ea95dbc4e11f026f4815d5e1d210a1b85 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleParentsTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleParentsTest.java
@@ -246,8 +246,8 @@ public class UpdateSampleParentsTest extends BaseTest
@BeforeClass
void createAuthorizationRules()
{
- instance = new InstanceDomain("instance");
- spaceDomain = new SpaceDomain("space", instance);
+ instance = new InstanceDomain();
+ spaceDomain = new SpaceDomain(instance);
addParentToSampleRule =
or(
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/GuardedDomain.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/GuardedDomain.java
index c39957dbf9bb1fe6d7bdf610098f2215eddcd097..be1db8c0206a4c4ae273eacbaac9d4d55e7470f1 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/GuardedDomain.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/GuardedDomain.java
@@ -16,6 +16,8 @@
package ch.systemsx.cisd.openbis.systemtest.base.auth;
+import java.util.UUID;
+
import org.apache.commons.lang.builder.HashCodeBuilder;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleLevel;
@@ -25,19 +27,19 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleL
*/
public abstract class GuardedDomain
{
- private final String name;
+ private final String id;
private final RoleLevel type;
- public GuardedDomain(String name, RoleLevel type)
+ public GuardedDomain(RoleLevel type)
{
- this.name = name;
+ this.id = UUID.randomUUID().toString();
this.type = type;
}
- public String getName()
+ public String getId()
{
- return name;
+ return this.id;
}
public RoleLevel getType()
@@ -56,14 +58,14 @@ public abstract class GuardedDomain
}
GuardedDomain domain = (GuardedDomain) o;
- return domain.getName().equals(this.name) && domain.getType().equals(this.type);
+ return domain.getId().equals(this.id) && domain.getType().equals(this.type);
}
@Override
public int hashCode()
{
HashCodeBuilder builder = new HashCodeBuilder();
- builder.append(this.name);
+ builder.append(this.id);
builder.append(this.type);
return builder.toHashCode();
}
@@ -71,6 +73,6 @@ public abstract class GuardedDomain
@Override
public String toString()
{
- return this.name + " (" + this.type + ")";
+ return "GuardedDomain of type " + this.type;
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/InstanceDomain.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/InstanceDomain.java
index 1ec97987449f614eadf10e8b60cf07c825f86cdc..bd64d944b63d9401b272a4a3adc4852cdc9b8788 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/InstanceDomain.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/InstanceDomain.java
@@ -24,9 +24,9 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleL
public class InstanceDomain extends GuardedDomain
{
- public InstanceDomain(String name)
+ public InstanceDomain()
{
- super(name, RoleLevel.INSTANCE);
+ super(RoleLevel.INSTANCE);
}
@Override
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/SpaceDomain.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/SpaceDomain.java
index 6078017db05b9b8a05f52e1171110553dcbfb822..2bc8d9d7b6a4ec4cc8f82bb90db03029af7ced5e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/SpaceDomain.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/SpaceDomain.java
@@ -26,9 +26,9 @@ public class SpaceDomain extends GuardedDomain
private GuardedDomain superDomain;
- public SpaceDomain(String name, GuardedDomain instance)
+ public SpaceDomain(GuardedDomain instance)
{
- super(name, RoleLevel.SPACE);
+ super(RoleLevel.SPACE);
this.superDomain = instance;
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/Builder.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/Builder.java
index ed56bd754881ce38797dd860737c44d242d387bc..92212aac283da0ddd9e6b1280a0fc5a440c4b1f5 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/Builder.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/Builder.java
@@ -32,8 +32,6 @@ public abstract class Builder<T>
protected final String systemSession;
- protected String knownAs = "PEKKA";
-
public Builder(ICommonServerForInternalUse commonServer, IGenericServer genericServer)
{
this.commonServer = commonServer;
@@ -47,10 +45,4 @@ public abstract class Builder<T>
{
return BaseTest.refresh(sample, this.commonServer, this.systemSession);
}
-
- public final Builder<T> knownAs(String name)
- {
- this.knownAs = name;
- return this;
- }
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentBuilder.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentBuilder.java
index 0f140ccedac14f0cd2c37c4a1781696c96fef948..98f341bb8e30ae2d0f60054bbdf71c0e7bfbf6b4 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentBuilder.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentBuilder.java
@@ -61,24 +61,18 @@ public class ExperimentBuilder extends Builder<Experiment>
return this;
}
- public ExperimentBuilder withCode(String code)
+ public ExperimentBuilder withCode(String experimentCode)
{
- this.code = code;
+ this.code = experimentCode;
return this;
}
- public ExperimentBuilder asUser(String session)
+ public ExperimentBuilder withSamples(Sample... sampleList)
{
- this.session = session;
- return this;
- }
-
- public ExperimentBuilder withSamples(Sample... samples)
- {
- String[] sampleIds = new String[samples.length];
- for (int i = 0; i < samples.length; i++)
+ String[] sampleIds = new String[sampleList.length];
+ for (int i = 0; i < sampleList.length; i++)
{
- sampleIds[i] = samples[i].getIdentifier();
+ sampleIds[i] = sampleList[i].getIdentifier();
}
this.samples = sampleIds;
return this;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleUpdateBuilder.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleUpdateBuilder.java
index aeeb361ef479e78a8172235b3e9754feae023ebe..9b1c9bb651a57283fb84e321361d8721835c2595 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleUpdateBuilder.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleUpdateBuilder.java
@@ -53,10 +53,11 @@ public class SampleUpdateBuilder extends UpdateBuilder<SampleUpdatesDTO>
private Sample container;
public SampleUpdateBuilder(ICommonServerForInternalUse commonServer,
- IGenericServer genericServer, Sample sample)
+ IGenericServer genericServer, Sample sampleToBeUpdated)
{
super(commonServer, genericServer);
- sample = refresh(sample);
+ Sample sample = refresh(sampleToBeUpdated);
+
this.sampleId = new TechId(sample.getId());
this.sampleCode = sample.getCode();
if (sample.getExperiment() != null)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SpaceBuilder.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SpaceBuilder.java
index 6f7d7b220225202388aa9bc0988f3f26c4972c5e..f060e997603cf806d23a4dea755c9a2d33bf98e8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SpaceBuilder.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SpaceBuilder.java
@@ -34,9 +34,9 @@ public class SpaceBuilder extends Builder<Space>
this.code = UUID.randomUUID().toString();
}
- public SpaceBuilder withCode(String code)
+ public SpaceBuilder withCode(String spaceCode)
{
- this.code = code;
+ this.code = spaceCode;
return this;
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/UpdateBuilder.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/UpdateBuilder.java
index f58d3e405f6b29edca8570bae98943b2cdadbe54..e5e2e9eee1fc2ed95624d5d67faca4ce2fcf2111 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/UpdateBuilder.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/UpdateBuilder.java
@@ -35,9 +35,9 @@ public abstract class UpdateBuilder<T> extends Builder<T>
public abstract void perform();
- public final UpdateBuilder<T> as(String sessionToken)
+ public final UpdateBuilder<T> as(String token)
{
- this.sessionToken = sessionToken;
+ this.sessionToken = token;
return this;
}
}