From d8fe98a210f745349ebff7545fd29d7df63a4ddb Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Thu, 12 Jul 2012 12:37:30 +0000
Subject: [PATCH] BIS-51 / SP-174: Add authorization to Dataset->Dataset
relationships
SVN: 26090
---
.../predicate/PersistentEntityPredicate.java | 41 +++++++------------
.../AssignDataSetToExperimentTest.java | 6 +--
.../systemtest/AssignDataSetToSampleTest.java | 6 +--
.../AssignExperimentToProjectTest.java | 6 +--
.../systemtest/AssignProjectToSpaceTest.java | 6 +--
.../AssignSampleToExperimentTest.java | 6 +--
.../systemtest/AssignSampleToSpaceTest.java | 6 +--
.../RelationshipServiceAuthorizationTest.java | 6 +--
.../UnassignSampleFromExperimentTest.java | 4 +-
.../UnassignSampleFromSpaceTest.java | 4 +-
.../UpdateDataSetContainmentTest.java | 4 +-
.../systemtest/UpdateDataSetParentsTest.java | 6 +--
.../UpdateSampleContainmentTest.java | 6 +--
.../systemtest/UpdateSampleParentsTest.java | 4 +-
.../systemtest/base/auth/GuardedDomain.java | 18 ++++----
.../systemtest/base/auth/InstanceDomain.java | 4 +-
.../systemtest/base/auth/SpaceDomain.java | 4 +-
.../systemtest/base/builder/Builder.java | 8 ----
.../base/builder/ExperimentBuilder.java | 18 +++-----
.../base/builder/SampleUpdateBuilder.java | 5 ++-
.../systemtest/base/builder/SpaceBuilder.java | 4 +-
.../base/builder/UpdateBuilder.java | 4 +-
22 files changed, 77 insertions(+), 99 deletions(-)
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 ac1e82e8f81..74a141c1756 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 fa8dfd62d78..c8515ceba78 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 12751d8f5a1..1c31a63c05d 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 be015459933..03e308e04ef 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 17e4a63d787..6eb299f754a 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 c752700b812..d04332e8c9b 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 4d862c5d762..7842bb08089 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 8fbafadf182..3cf6bdb9c5c 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 fb5fce4ced0..20ef842b26d 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 b94ef059827..0802515024c 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 873aee7e16d..f064974f714 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 93d6a3ecebe..11927ddf83b 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 11d7a2559ba..aba579bf868 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 602bd0332ab..3c70994ea95 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 c39957dbf9b..be1db8c0206 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 1ec97987449..bd64d944b63 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 6078017db05..2bc8d9d7b6a 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 ed56bd75488..92212aac283 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 0f140ccedac..98f341bb8e3 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 aeeb361ef47..9b1c9bb651a 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 6f7d7b22022..f060e997603 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 f58d3e405f6..e5e2e9eee1f 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;
}
}
--
GitLab