From 7b7ed32e5d9bab6bc3bbbed7a698ce4fc597756b Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 4 Mar 2013 10:18:53 +0000
Subject: [PATCH] SP-417, BIS-278: Better error messages in perm id predictes.
GenerlaInformationService minor version increased. API Javadoc typo fixed.
SVN: 28502
---
.../generic/server/api/v1/GeneralInformationService.java | 2 +-
.../authorization/predicate/ExperimentPermIdPredicate.java | 4 ++--
.../authorization/predicate/ProjectPermIdPredicate.java | 4 ++--
.../authorization/predicate/SamplePermIdPredicate.java | 4 ++--
.../generic/shared/api/v1/IGeneralInformationService.java | 6 +++---
.../shared/api/v1/dto/id/project/ProjectIdentifierId.java | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
index 82390d12162..08861cea123 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
@@ -136,7 +136,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
public class GeneralInformationService extends AbstractServer<IGeneralInformationService> implements
IGeneralInformationService
{
- public static final int MINOR_VERSION = 22;
+ public static final int MINOR_VERSION = 23;
@Resource(name = ch.systemsx.cisd.openbis.generic.shared.ResourceNames.COMMON_SERVER)
private ICommonServer commonServer;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java
index 9fe72115949..a384ef9d4ce 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java
@@ -69,8 +69,8 @@ public class ExperimentPermIdPredicate extends AbstractDatabaseInstancePredicate
ExperimentPE experiment = authorizationDataProvider.tryGetExperimentByPermId(id.getId());
if (experiment == null)
{
- return Status.createError(String.format("User '%s' does not have enough privileges.",
- person.getUserId()));
+ return Status.createError(String.format("There is no experiment with perm id '%s'.",
+ id.getId()));
}
return experimentPEPredicate.evaluate(person, allowedRoles, experiment);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java
index d3b7fafd9f6..7ac98b5b63c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java
@@ -46,8 +46,8 @@ public class ProjectPermIdPredicate extends AbstractSpacePredicate<String>
authorizationDataProvider.tryGetProjectByPermId(new PermId(permId));
if (project == null)
{
- return Status.createError(String.format("User '%s' does not have enough privileges.",
- person.getUserId()));
+ return Status.createError(String.format("There is no project with perm id '%s'."
+ + permId));
}
return evaluateSpace(person, allowedRoles, project.getSpace());
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java
index 0f6934f4175..e126c5ee206 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java
@@ -69,8 +69,8 @@ public class SamplePermIdPredicate extends AbstractDatabaseInstancePredicate<Per
SamplePE sample = authorizationDataProvider.tryGetSampleByPermId(id.getId());
if (sample == null)
{
- return Status.createError(String.format("User '%s' does not have enough privileges.",
- person.getUserId()));
+ return Status.createError(String.format("There is no sample with perm id '%s'.",
+ id.getId()));
}
return samplePEPredicate.evaluate(person, allowedRoles, sample);
}
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java
index 67c06293cf6..cb80fa2589c 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java
@@ -495,7 +495,7 @@ public interface IGeneralInformationService extends IRpcService
*
* @param allVersions If <code>true</code>, return all versions of the attachments, otherwise
* return only the latest version.
- * @since 1.22
+ * @since 1.23
*/
public List<Attachment> listAttachmentsForProject(String sessionToken,
IProjectId projectId, boolean allVersions);
@@ -505,7 +505,7 @@ public interface IGeneralInformationService extends IRpcService
*
* @param allVersions If <code>true</code>, return all versions of the attachments, otherwise
* return only the latest version.
- * @since 1.22
+ * @since 1.23
*/
public List<Attachment> listAttachmentsForExperiment(String sessionToken,
IExperimentId experimentId, boolean allVersions);
@@ -515,7 +515,7 @@ public interface IGeneralInformationService extends IRpcService
*
* @param allVersions If <code>true</code>, return all versions of the attachments, otherwise
* return only the latest version.
- * @since 1.22
+ * @since 1.23
*/
public List<Attachment> listAttachmentsForSample(String sessionToken,
ISampleId sampleId, boolean allVersions);
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java
index 40d26b03015..5822c81561e 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.ObjectIdentifierId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
- * Identifies a projec by identifier.
+ * Identifies a project by identifier.
*
* @author Franz-Josef Elmer
*/
--
GitLab