From d12bd4015f46fb774e04479f1dfad87674e8b1d6 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Tue, 18 Jun 2013 09:26:49 +0000
Subject: [PATCH] BIS-440 SP-695 : Use space identifiers instead of space code
SVN: 29405
---
.../registrator/api/v2/impl/AbstractTransactionState.java | 5 ++---
.../etlserver/registrator/api/v2/impl/SpaceImmutable.java | 6 ++++++
.../dss/generic/shared/api/internal/v2/ISpaceImmutable.java | 5 +++++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractTransactionState.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractTransactionState.java
index e822b0766d3..eaf5d40bd01 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractTransactionState.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractTransactionState.java
@@ -26,7 +26,6 @@ import java.util.Map;
import java.util.Queue;
import net.lemnik.eodsql.DynamicTransactionQuery;
-
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
@@ -93,7 +92,7 @@ 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.dto.identifier.SpaceIdentifierFactory;
/**
* Abstract superclass for the states a DataSetRegistrationTransaction can be in.
@@ -974,7 +973,7 @@ public abstract class AbstractTransactionState<T extends DataSetInformation>
{
SpaceRoleAssignment assignment = new SpaceRoleAssignment();
assignment.setRoleCode(role);
- assignment.setSpaceIdentifier(new SpaceIdentifier(space.getSpaceCode()));
+ assignment.setSpaceIdentifier(new SpaceIdentifierFactory(space.getSpaceCode()).createIdentifier());
ArrayList<Grantee> grantees = new ArrayList<Grantee>();
if (null != userIds)
{
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SpaceImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SpaceImmutable.java
index 4ac5d2b78dd..afcaecb59db 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SpaceImmutable.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SpaceImmutable.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.ISpaceImmutable;
+import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
/**
* @author Kaloyan Enimanev
@@ -75,4 +76,9 @@ public class SpaceImmutable implements ISpaceImmutable
return space;
}
+ @Override
+ public String getIdentifier()
+ {
+ return space.getIdentifier();
+ }
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISpaceImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISpaceImmutable.java
index 32eb6f79d00..fcd28212415 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISpaceImmutable.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISpaceImmutable.java
@@ -16,6 +16,7 @@
package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
+
/**
* An interface for spaces from the database that should not be altered.
*
@@ -39,5 +40,9 @@ public interface ISpaceImmutable
*/
boolean isExistingSpace();
+ /**
+ * Return the identifier for this space.
+ */
+ String getIdentifier();
}
--
GitLab