From fa4ee979c5ad4cf97374ecb898f0c38f75f5eb0e Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Fri, 12 Oct 2012 08:16:35 +0000
Subject: [PATCH] removing metaprojects-related methods from interfaces
SVN: 27152
---
.../v1/GeneralInformationChangingService.java | 7 --
...neralInformationChangingServiceLogger.java | 7 --
.../api/v1/GeneralInformationService.java | 2 -
.../v1/GeneralInformationServiceLogger.java | 2 -
.../api/v1/GeneralInformationServiceTest.java | 86 ++++++++-------
.../IGeneralInformationChangingService.java | 102 ------------------
.../api/v1/IGeneralInformationService.java | 12 ---
7 files changed, 42 insertions(+), 176 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
index 3577e8e2aa4..f44e54e44dd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
@@ -154,7 +154,6 @@ public class GeneralInformationChangingService extends
}
}
- @Override
@Transactional(readOnly = false)
@RolesAllowed(RoleWithHierarchy.SPACE_USER)
public Metaproject createMetaproject(String sessionToken, String name, String description)
@@ -165,7 +164,6 @@ public class GeneralInformationChangingService extends
return server.registerMetaproject(sessionToken, metaproject);
}
- @Override
@Transactional(readOnly = false)
@RolesAllowed(RoleWithHierarchy.SPACE_USER)
public Metaproject updateMetaproject(String sessionToken,
@@ -175,7 +173,6 @@ public class GeneralInformationChangingService extends
return server.updateMetaproject(sessionToken, metaproject);
}
- @Override
@Transactional(readOnly = false)
@RolesAllowed(RoleWithHierarchy.SPACE_USER)
public void deleteMetaproject(String sessionToken,
@@ -185,7 +182,6 @@ public class GeneralInformationChangingService extends
server.deleteMetaproject(sessionToken, new TechId(metaprojectId));
}
- @Override
@Transactional(readOnly = false)
@RolesAllowed(RoleWithHierarchy.SPACE_USER)
public void addToMetaproject(String sessionToken,
@@ -198,7 +194,6 @@ public class GeneralInformationChangingService extends
extractTechIds(materials));
}
- @Override
@Transactional(readOnly = false)
@RolesAllowed(RoleWithHierarchy.SPACE_USER)
public void addToMetaprojectByEntityIds(String sessionToken,
@@ -211,7 +206,6 @@ public class GeneralInformationChangingService extends
TechId.createList(dataSets), TechId.createList(materials));
}
- @Override
@Transactional(readOnly = false)
@RolesAllowed(RoleWithHierarchy.SPACE_USER)
public void removeFromMetaproject(String sessionToken,
@@ -224,7 +218,6 @@ public class GeneralInformationChangingService extends
extractTechIds(materials));
}
- @Override
@Transactional(readOnly = false)
@RolesAllowed(RoleWithHierarchy.SPACE_USER)
public void removeFromMetaprojectByEntityIds(String sessionToken,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java
index 36984fb2c2b..c84ad6c74d6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java
@@ -86,14 +86,12 @@ class GeneralInformationChangingServiceLogger extends AbstractServerLogger imple
webAppSettings.getWebAppId());
}
- @Override
public Metaproject createMetaproject(String sessionToken, String name, String description)
{
logAccess(sessionToken, "createMetaproject NAME(%s) DESCRIPTION(%s)", name, description);
return null;
}
- @Override
public Metaproject updateMetaproject(String sessionToken, Metaproject metaproject)
{
String name = metaproject == null ? "null" : metaproject.getName();
@@ -101,13 +99,11 @@ class GeneralInformationChangingServiceLogger extends AbstractServerLogger imple
return null;
}
- @Override
public void deleteMetaproject(String sessionToken, Long metaprojectId)
{
logAccess(sessionToken, "deleteMetaproject METAPROJECT_ID(%s)", metaprojectId.toString());
}
- @Override
public void addToMetaproject(String sessionToken, Long metaprojectId,
Collection<Experiment> experiments, Collection<Sample> samples,
Collection<DataSet> dataSets, Collection<Material> materials)
@@ -119,7 +115,6 @@ class GeneralInformationChangingServiceLogger extends AbstractServerLogger imple
abbreviate(dataSets), abbreviate(materials));
}
- @Override
public void addToMetaprojectByEntityIds(String sessionToken, Long metaprojectId,
List<Long> experiments, List<Long> samples, List<Long> dataSets, List<Long> materials)
{
@@ -130,7 +125,6 @@ class GeneralInformationChangingServiceLogger extends AbstractServerLogger imple
abbreviate(dataSets), abbreviate(materials));
}
- @Override
public void removeFromMetaproject(String sessionToken, Long metaprojectId,
Collection<Experiment> experiments, Collection<Sample> samples,
Collection<DataSet> dataSets, Collection<Material> materials)
@@ -142,7 +136,6 @@ class GeneralInformationChangingServiceLogger extends AbstractServerLogger imple
abbreviate(dataSets), abbreviate(materials));
}
- @Override
public void removeFromMetaprojectByEntityIds(String sessionToken, Long metaprojectId,
List<Long> experiments, List<Long> samples, List<Long> dataSets, List<Long> materials)
{
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 f9cd2dff8f6..e5ea5c59b4e 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
@@ -989,7 +989,6 @@ public class GeneralInformationService extends AbstractServer<IGeneralInformatio
return Translator.translateMaterials(materials);
}
- @Override
@Transactional(readOnly = true)
@RolesAllowed(RoleWithHierarchy.SPACE_USER)
public List<Metaproject> listMetaprojects(String sessionToken)
@@ -997,7 +996,6 @@ public class GeneralInformationService extends AbstractServer<IGeneralInformatio
return commonServer.listMetaprojects(sessionToken);
}
- @Override
@Transactional(readOnly = true)
@RolesAllowed(RoleWithHierarchy.SPACE_USER)
public MetaprojectAssignments getMetaproject(String sessionToken,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java
index ad517432705..4038b7cfb55 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java
@@ -363,14 +363,12 @@ class GeneralInformationServiceLogger extends AbstractServerLogger implements
return null;
}
- @Override
public List<Metaproject> listMetaprojects(String sessionToken)
{
logAccess(sessionToken, "listMetaprojects");
return null;
}
- @Override
public MetaprojectAssignments getMetaproject(String sessionToken, Metaproject metaproject)
{
String name = metaproject == null ? "null" : metaproject.getName();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
index 4bbd160b603..0fe08da64a0 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
@@ -48,7 +48,6 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Experiment.ExperimentI
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Material;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.MaterialIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.MaterialTypeIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.MetaprojectAssignments;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Project;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.PropertyType;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.PropertyTypeGroup;
@@ -64,7 +63,6 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SpaceWithProjectsAndRo
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Metaproject;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetUpdatesDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifierFactory;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
@@ -1017,46 +1015,46 @@ public class GeneralInformationServiceTest extends SystemTestCase
assertEquals(2, materials.size());
}
- @Test
- public void testListMetaprojects()
- {
- List<Metaproject> metaprojects = generalInformationService.listMetaprojects(sessionToken);
-
- assertEquals(2, metaprojects.size());
- }
-
- @Test
- public void testGetMetaprojects()
- {
- List<Metaproject> metaprojects = generalInformationService.listMetaprojects(sessionToken);
-
- MetaprojectAssignments metaprojectAssignments =
- generalInformationService.getMetaproject(sessionToken, metaprojects.iterator()
- .next());
-
- assertEquals(1, metaprojectAssignments.getDataSets().size());
- assertEquals(1, metaprojectAssignments.getMaterials().size());
- assertEquals(1, metaprojectAssignments.getSamples().size());
- assertEquals(2, metaprojectAssignments.getExperiments().size());
-
- generalInformationService.logout(sessionToken);
- sessionToken = generalInformationService.tryToAuthenticateForAllServices("test_role", "a");
-
- metaprojects = generalInformationService.listMetaprojects(sessionToken);
-
- metaprojectAssignments =
- generalInformationService.getMetaproject(sessionToken, metaprojects.iterator()
- .next());
-
- assertEquals(1, metaprojectAssignments.getMaterials().size());
- assertEquals(1, metaprojectAssignments.getDataSets().size());
- assertTrue(metaprojectAssignments.getDataSets().get(0).isStub());
- assertTrue(metaprojectAssignments.getDataSets().get(0).toString().contains("STUB"));
- assertEquals(1, metaprojectAssignments.getSamples().size());
- assertTrue(metaprojectAssignments.getSamples().get(0).isStub());
- assertTrue(metaprojectAssignments.getSamples().get(0).toString().contains("STUB"));
- assertEquals(1, metaprojectAssignments.getExperiments().size());
- assertTrue(metaprojectAssignments.getExperiments().get(0).isStub());
- assertTrue(metaprojectAssignments.getExperiments().get(0).toString().contains("STUB"));
- }
+ // @Test
+ // public void testListMetaprojects()
+ // {
+ // List<Metaproject> metaprojects = generalInformationService.listMetaprojects(sessionToken);
+ //
+ // assertEquals(2, metaprojects.size());
+ // }
+ //
+ // @Test
+ // public void testGetMetaprojects()
+ // {
+ // List<Metaproject> metaprojects = generalInformationService.listMetaprojects(sessionToken);
+ //
+ // MetaprojectAssignments metaprojectAssignments =
+ // generalInformationService.getMetaproject(sessionToken, metaprojects.iterator()
+ // .next());
+ //
+ // assertEquals(1, metaprojectAssignments.getDataSets().size());
+ // assertEquals(1, metaprojectAssignments.getMaterials().size());
+ // assertEquals(1, metaprojectAssignments.getSamples().size());
+ // assertEquals(2, metaprojectAssignments.getExperiments().size());
+ //
+ // generalInformationService.logout(sessionToken);
+ // sessionToken = generalInformationService.tryToAuthenticateForAllServices("test_role", "a");
+ //
+ // metaprojects = generalInformationService.listMetaprojects(sessionToken);
+ //
+ // metaprojectAssignments =
+ // generalInformationService.getMetaproject(sessionToken, metaprojects.iterator()
+ // .next());
+ //
+ // assertEquals(1, metaprojectAssignments.getMaterials().size());
+ // assertEquals(1, metaprojectAssignments.getDataSets().size());
+ // assertTrue(metaprojectAssignments.getDataSets().get(0).isStub());
+ // assertTrue(metaprojectAssignments.getDataSets().get(0).toString().contains("STUB"));
+ // assertEquals(1, metaprojectAssignments.getSamples().size());
+ // assertTrue(metaprojectAssignments.getSamples().get(0).isStub());
+ // assertTrue(metaprojectAssignments.getSamples().get(0).toString().contains("STUB"));
+ // assertEquals(1, metaprojectAssignments.getExperiments().size());
+ // assertTrue(metaprojectAssignments.getExperiments().get(0).isStub());
+ // assertTrue(metaprojectAssignments.getExperiments().get(0).toString().contains("STUB"));
+ // }
}
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationChangingService.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationChangingService.java
index d122d839aff..bdf38f29ce1 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationChangingService.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationChangingService.java
@@ -16,19 +16,12 @@
package ch.systemsx.cisd.openbis.generic.shared.api.v1;
-import java.util.Collection;
-import java.util.List;
import java.util.Map;
import ch.systemsx.cisd.common.api.IRpcService;
-import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet;
-import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Experiment;
-import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Material;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.NewVocabularyTerm;
-import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.WebAppSettings;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Metaproject;
/**
* Service for changing general informations.
@@ -87,99 +80,4 @@ public interface IGeneralInformationChangingService extends IRpcService
*/
public void setWebAppSettings(String sessionToken, WebAppSettings webAppSettings);
- /**
- * Creates a new metaproject.
- *
- * @param name Name of the metaproject
- * @param description Description of the metaproject
- * @return Newly created metaproject
- * @since 1.3
- */
- public Metaproject createMetaproject(String sessionToken, String name, String description);
-
- /**
- * Updates existing metaproject.
- *
- * @param metaproject Metaproject that should be updated
- * @return Updated metaproject
- * @since 1.3
- */
- public Metaproject updateMetaproject(String sessionToken, Metaproject metaproject);
-
- /**
- * Deletes existing metaproject.
- *
- * @param metaprojectId Tech Id of metaproject to delete
- * @since 1.3
- */
- public void deleteMetaproject(String sessionToken, Long metaprojectId);
-
- /**
- * Adds given entities to existing metaproject.
- *
- * @param metaprojectId Tech Id of metaproject
- * @param experiments List of experiments that should be added to the metaproject or
- * <code>null</code>
- * @param samples List of samples that should be added to the metaproject or <code>null</code>
- * @param dataSets List of data sets that should be added to the metaproject or
- * <code>null</code>
- * @param materials List of materials that should be added to the metaproject or
- * <code>null</code>
- * @since 1.3
- */
- public void addToMetaproject(String sessionToken, Long metaprojectId,
- Collection<Experiment> experiments, Collection<Sample> samples,
- Collection<DataSet> dataSets, Collection<Material> materials);
-
- /**
- * Adds given entities (specified by their Tech Ids) to existing metaproject.
- *
- * @param metaprojectId Tech Id of metaproject
- * @param experiments List of experiment ids that should be added to the metaproject or
- * <code>null</code>
- * @param samples List of sample ids that should be added to the metaproject or
- * <code>null</code>
- * @param dataSets List of data set ids that should be added to the metaproject or
- * <code>null</code>
- * @param materials List of material ids that should be added to the metaproject or
- * <code>null</code>
- * @since 1.3
- */
- public void addToMetaprojectByEntityIds(String sessionToken, Long metaprojectId,
- List<Long> experiments, List<Long> samples, List<Long> dataSets, List<Long> materials);
-
- /**
- * Removes given entities to existing metaproject.
- *
- * @param metaprojectId Tech Id of metaproject
- * @param experiments List of experiments that should be removed from the metaproject or
- * <code>null</code>
- * @param samples List of samples that should be removed from the metaproject or
- * <code>null</code>
- * @param dataSets List of data sets that should be removed from the metaproject or
- * <code>null</code>
- * @param materials List of materials that should be removed from the metaproject or
- * <code>null</code>
- * @since 1.3
- */
- public void removeFromMetaproject(String sessionToken, Long metaprojectId,
- Collection<Experiment> experiments, Collection<Sample> samples,
- Collection<DataSet> dataSets, Collection<Material> materials);
-
- /**
- * Removes given entities to existing metaproject.
- *
- * @param metaprojectId Tech Id of metaproject
- * @param experiments List of experiment ids that should be removed from the metaproject or
- * <code>null</code>
- * @param samples List of sample ids that should be removed from the metaproject or
- * <code>null</code>
- * @param dataSets List of data set ids that should be removed from the metaproject or
- * <code>null</code>
- * @param materials List of material ids that should be removed from the metaproject or
- * <code>null</code>
- * @since 1.3
- */
- public void removeFromMetaprojectByEntityIds(String sessionToken, Long metaprojectId,
- List<Long> experiments, List<Long> samples, List<Long> dataSets, List<Long> materials);
}
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 721500012e0..77a66e6d7ce 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
@@ -32,14 +32,12 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataStoreURLForDataSet
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Experiment;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Material;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.MaterialIdentifier;
-import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.MetaprojectAssignments;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Project;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Role;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SampleFetchOption;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria;
import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SpaceWithProjectsAndRoleAssignments;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Metaproject;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Vocabulary;
/**
@@ -463,14 +461,4 @@ public interface IGeneralInformationService extends IRpcService
* Returns all material fulfilling specified search criteria.
*/
public List<Material> searchForMaterials(String sessionToken, SearchCriteria searchCriteria);
-
- /**
- * Lists all metaprojects belonging to current user.
- */
- public List<Metaproject> listMetaprojects(String sessionToken);
-
- /**
- * Returns all entities tagged with given metaproject.
- */
- public MetaprojectAssignments getMetaproject(String sessionToken, Metaproject metaproject);
}
--
GitLab