From 7d41c64ab5d02021057dfca04c7344ac33dcf14e Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 31 Aug 2009 22:00:50 +0000
Subject: [PATCH] refactor: get rid of baseIndeURL in the remote API other then
in the single method where we now set it in the session
SVN: 12338
---
.../experiment/ExperimentBrowserToolbar.java | 2 --
.../ui/grid/AbstractEntityBrowserGrid.java | 6 ----
.../ui/sample/SampleBrowserGrid.java | 4 +--
.../ui/sample/SampleBrowserToolbar.java | 1 -
.../client/dto/ListExperimentsCriteria.java | 12 --------
.../client/dto/ListSampleDisplayCriteria.java | 11 +++----
.../server/CommonBusinessObjectFactory.java | 2 +-
.../bo/samplelister/SampleLister.java | 11 ++++---
.../bo/samplelister/SampleListingWorker.java | 29 ++++++++++---------
.../shared/basic/dto/ListSampleCriteria.java | 20 ++-----------
.../web/client/IGenericClientService.java | 10 +++----
.../client/IGenericClientServiceAsync.java | 20 ++++++-------
...AbstractGenericEntityRegistrationForm.java | 6 ----
.../dataset/GenericDataSetEditForm.java | 5 ++--
.../dataset/GenericDataSetViewer.java | 2 +-
.../experiment/ExperimentPropertiesPanel.java | 4 +--
.../experiment/GenericExperimentEditForm.java | 4 +--
.../experiment/GenericExperimentViewer.java | 2 +-
.../sample/GenericSampleEditForm.java | 3 +-
.../sample/GenericSampleViewer.java | 2 +-
.../web/server/GenericClientService.java | 12 ++++----
.../web/server/CommonClientServiceTest.java | 1 -
.../ListSampleCriteriaPredicateTest.java | 15 +++++-----
.../GenericExperimentViewerTest.java | 4 +--
24 files changed, 70 insertions(+), 118 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserToolbar.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserToolbar.java
index 268fc0994cb..c79a47b0d28 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserToolbar.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserToolbar.java
@@ -33,7 +33,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericCon
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.AbstractEntityBrowserGrid.ICriteriaProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.IDataRefreshCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ListExperimentsCriteria;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType;
@@ -96,7 +95,6 @@ class ExperimentBrowserToolbar extends ToolBar implements
criteria.setExperimentType(selectedType);
criteria.setProjectCode(selectedProject.getCode());
criteria.setGroupCode(selectedProject.getGroup().getCode());
- criteria.setBaseIndexURL(GWTUtils.getBaseIndexURL());
return criteria;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractEntityBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractEntityBrowserGrid.java
index 108ddd1f19d..e03666b1630 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractEntityBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractEntityBrowserGrid.java
@@ -34,7 +34,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.Base
import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.ShowDetailsLinkCellRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.IColumnDefinitionKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.IDataRefreshCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.SetUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetConfig;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
@@ -300,9 +299,4 @@ public abstract class AbstractEntityBrowserGrid<T extends IEntityPropertiesHolde
.equals(entityType2.getAssignedPropertyTypes());
}
- protected static final String getBaseIndexURL()
- {
- return GWTUtils.getBaseIndexURL();
- }
-
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
index ff08d0d3986..62ea83259ac 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
@@ -132,7 +132,7 @@ public class SampleBrowserGrid extends
final TechId containerSampleId, final String gridId, final SampleType sampleType)
{
final ListSampleDisplayCriteria criteria =
- ListSampleDisplayCriteria.createForContainer(containerSampleId, getBaseIndexURL());
+ ListSampleDisplayCriteria.createForContainer(containerSampleId);
final String entityTypeCode = sampleType.getCode();
final SampleBrowserGrid browserGrid =
createGridAsComponent(viewContext, gridId, criteria, entityTypeCode);
@@ -147,7 +147,7 @@ public class SampleBrowserGrid extends
final String gridId, final ExperimentType experimentType)
{
final ListSampleDisplayCriteria criteria =
- ListSampleDisplayCriteria.createForExperiment(experimentId, getBaseIndexURL());
+ ListSampleDisplayCriteria.createForExperiment(experimentId);
final String entityTypeCode = experimentType.getCode();
final SampleBrowserGrid browserGrid =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserToolbar.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserToolbar.java
index 3095056ecd3..bf9646326ea 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserToolbar.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserToolbar.java
@@ -100,7 +100,6 @@ final class SampleBrowserToolbar extends ToolBar implements ISampleCriteriaProvi
criteria.setIncludeGroup(includeGroup);
criteria.setIncludeInstance(includeInstance);
criteria.setExcludeWithoutExperiment(excludeWithoutExperiment);
- criteria.setBaseIndexUrl(GWTUtils.getBaseIndexURL());
return new ListSampleDisplayCriteria(criteria);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListExperimentsCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListExperimentsCriteria.java
index 3728c131c77..79ac3ef338e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListExperimentsCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListExperimentsCriteria.java
@@ -35,18 +35,6 @@ public final class ListExperimentsCriteria extends DefaultResultSetConfig<String
private String projectCode;
- private String baseIndexURL;
-
- public String getBaseIndexURL()
- {
- return baseIndexURL;
- }
-
- public void setBaseIndexURL(String baseIndexURL)
- {
- this.baseIndexURL = baseIndexURL;
- }
-
public ExperimentType getExperimentType()
{
return experimentType;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria.java
index 81d0ab5199c..81096df9a78 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria.java
@@ -31,18 +31,15 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
public class ListSampleDisplayCriteria extends DefaultResultSetConfig<String, Sample> implements
IsSerializable
{
- public static ListSampleDisplayCriteria createForContainer(final TechId containerSampleId,
- String baseIndexUrl)
+ public static ListSampleDisplayCriteria createForContainer(final TechId containerSampleId)
{
return new ListSampleDisplayCriteria(ListSampleCriteria.createForContainer(
- containerSampleId, baseIndexUrl));
+ containerSampleId));
}
- public static ListSampleDisplayCriteria createForExperiment(final TechId experimentId,
- String baseIndexUrl)
+ public static ListSampleDisplayCriteria createForExperiment(final TechId experimentId)
{
- return new ListSampleDisplayCriteria(ListSampleCriteria.createForExperiment(experimentId,
- baseIndexUrl));
+ return new ListSampleDisplayCriteria(ListSampleCriteria.createForExperiment(experimentId));
}
private ListSampleCriteria criteria;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java
index 381208f1b9c..c7f48105cc9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java
@@ -107,7 +107,7 @@ public final class CommonBusinessObjectFactory extends AbstractBusinessObjectFac
public ISampleLister createSampleLister(Session session)
{
- return SampleLister.create(sampleListerDAO);
+ return SampleLister.create(session.getBaseIndexURL(), sampleListerDAO);
}
public IDatasetLister createDatasetLister(Session session)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleLister.java
index 8a07645225d..2ec35ecff5f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleLister.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleLister.java
@@ -31,20 +31,23 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
public class SampleLister implements ISampleLister
{
private final SampleListerDAO dao;
+
+ private final String baseIndexURL;
- public static SampleLister create(SampleListerDAO dao)
+ public static SampleLister create(String baseIndexURL, SampleListerDAO dao)
{
- return new SampleLister(dao);
+ return new SampleLister(baseIndexURL, dao);
}
- private SampleLister(SampleListerDAO dao)
+ private SampleLister(String baseIndexURL, SampleListerDAO dao)
{
+ this.baseIndexURL = baseIndexURL;
this.dao = dao;
}
public List<Sample> list(final ListSampleCriteria criteria)
{
- return SampleListingWorker.create(criteria, dao).load();
+ return SampleListingWorker.create(criteria, baseIndexURL, dao).load();
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
index f243790d784..7cd5bf643d2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
@@ -89,6 +89,8 @@ final class SampleListingWorker
private final DatabaseInstance databaseInstance;
private final ListSampleCriteria criteria;
+
+ private final String baseIndexURL;
//
// Output
@@ -149,13 +151,14 @@ final class SampleListingWorker
private final Long2ObjectMap<Sample> sampleMap = new Long2ObjectOpenHashMap<Sample>();
- public static SampleListingWorker create(ListSampleCriteria criteria, SampleListerDAO dao)
+ public static SampleListingWorker create(ListSampleCriteria criteria, String baseIndexURL,
+ SampleListerDAO dao)
{
ISampleListingQuery query = dao.getQuery();
ISampleSetListingQuery setQuery = dao.getIdSetQuery();
EntityPropertiesEnricher propertiesEnricher =
new EntityPropertiesEnricher(query, dao.getPropertySetQuery());
- return new SampleListingWorker(criteria, dao.getDatabaseInstanceId(), dao
+ return new SampleListingWorker(criteria, baseIndexURL, dao.getDatabaseInstanceId(), dao
.getDatabaseInstance(), query, setQuery, propertiesEnricher);
}
@@ -164,17 +167,19 @@ final class SampleListingWorker
//
// For unit tests
- SampleListingWorker(final ListSampleCriteria criteria, final long databaseInstanceId,
- final DatabaseInstance databaseInstance, final ISampleListingQuery query,
- final ISampleSetListingQuery setQuery,
+ SampleListingWorker(final ListSampleCriteria criteria, final String baseIndexURL,
+ final long databaseInstanceId, final DatabaseInstance databaseInstance,
+ final ISampleListingQuery query, final ISampleSetListingQuery setQuery,
IEntityPropertiesEnricher samplePropertiesEnricherOrNull)
{
assert criteria != null;
+ assert baseIndexURL != null;
assert databaseInstance != null;
assert query != null;
assert setQuery != null;
this.criteria = criteria;
+ this.baseIndexURL = baseIndexURL;
this.databaseInstanceId = databaseInstanceId;
this.databaseInstance = databaseInstance;
this.query = query;
@@ -198,14 +203,11 @@ final class SampleListingWorker
watch.start();
final Experiment expOrNull = tryLoadExperiment();
final Group groupOrNull = tryLoadGroup(expOrNull);
- final String baseIndexURL = criteria.getBaseIndexUrl();
loadSampleTypes();
- retrievePrimaryBasicSamples(tryGetIteratorForGroupSamples(), groupOrNull, baseIndexURL);
- retrievePrimaryBasicSamples(tryGetIteratorForSharedSamples(), groupOrNull, baseIndexURL);
- retrievePrimaryBasicSamples(tryGetIteratorForExperimentSamples(), groupOrNull,
- baseIndexURL);
- retrievePrimaryBasicSamples(tryGetIteratorForContainedSamples(), groupOrNull,
- baseIndexURL);
+ retrievePrimaryBasicSamples(tryGetIteratorForGroupSamples(), groupOrNull);
+ retrievePrimaryBasicSamples(tryGetIteratorForSharedSamples(), groupOrNull);
+ retrievePrimaryBasicSamples(tryGetIteratorForExperimentSamples(), groupOrNull);
+ retrievePrimaryBasicSamples(tryGetIteratorForContainedSamples(), groupOrNull);
if (operationLog.isDebugEnabled())
{
watch.stop();
@@ -392,9 +394,8 @@ final class SampleListingWorker
}
private void retrievePrimaryBasicSamples(final DataIterator<SampleRecord> sampleIteratorOrNull,
- final Group groupOrNull, final String baseIndexURL)
+ final Group groupOrNull)
{
- assert baseIndexURL != null;
assert sampleList != null;
retrieveBasicSamples(sampleIteratorOrNull, groupOrNull, baseIndexURL, sampleList);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java
index 16869e0ded9..7fa7c6a680f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java
@@ -44,18 +44,6 @@ public final class ListSampleCriteria implements IsSerializable
private boolean excludeWithoutExperiment;
- private String baseIndexUrl;
-
- public String getBaseIndexUrl()
- {
- return baseIndexUrl;
- }
-
- public void setBaseIndexUrl(String baseIndexUrl)
- {
- this.baseIndexUrl = baseIndexUrl;
- }
-
// --------- filter 2 fields
private TechId containerSampleId;
@@ -64,21 +52,17 @@ public final class ListSampleCriteria implements IsSerializable
// ----
- public static ListSampleCriteria createForContainer(final TechId containerSampleId,
- String baseIndexUrl)
+ public static ListSampleCriteria createForContainer(final TechId containerSampleId)
{
final ListSampleCriteria criteria = new ListSampleCriteria();
criteria.setContainerIdentifier(containerSampleId);
- criteria.setBaseIndexUrl(baseIndexUrl);
return criteria;
}
- public static ListSampleCriteria createForExperiment(final TechId experimentId,
- String baseIndexUrl)
+ public static ListSampleCriteria createForExperiment(final TechId experimentId)
{
final ListSampleCriteria criteria = new ListSampleCriteria();
criteria.setExperimentId(experimentId);
- criteria.setBaseIndexUrl(baseIndexUrl);
return criteria;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java
index ca582efd496..056189db906 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java
@@ -54,13 +54,13 @@ public interface IGenericClientService extends IClientService
/**
* For given {@link TechId} returns corresponding {@link SampleParentWithDerived}.
*/
- public SampleParentWithDerived getSampleGenerationInfo(final TechId sampleId, String baseIndexURL)
+ public SampleParentWithDerived getSampleGenerationInfo(final TechId sampleId)
throws UserFailureException;
/**
* For given {@link TechId} returns corresponding {@link Sample}.
*/
- public Sample getSampleInfo(final TechId sampleId, String baseIndexURL)
+ public Sample getSampleInfo(final TechId sampleId)
throws UserFailureException;
/**
@@ -81,13 +81,13 @@ public interface IGenericClientService extends IClientService
/**
* For given <var>experimentIdentifier</var> returns corresponding {@link Experiment}.
*/
- public Experiment getExperimentInfo(final String experimentIdentifier, String baseIndexURL)
+ public Experiment getExperimentInfo(final String experimentIdentifier)
throws UserFailureException;
/**
* For given {@link TechId} returns corresponding {@link Experiment}.
*/
- public Experiment getExperimentInfo(final TechId experimentId, String baseIndexURL)
+ public Experiment getExperimentInfo(final TechId experimentId)
throws UserFailureException;
/**
@@ -98,7 +98,7 @@ public interface IGenericClientService extends IClientService
/**
* For given {@link TechId} returns corresponding {@link ExternalData}.
*/
- public ExternalData getDataSetInfo(final TechId datasetId, final String baseIndexURL)
+ public ExternalData getDataSetInfo(final TechId datasetId)
throws UserFailureException;
/**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java
index ee3bb737118..df1552e39a7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java
@@ -48,15 +48,15 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
public interface IGenericClientServiceAsync extends IClientServiceAsync
{
/**
- * @see IGenericClientService#getSampleGenerationInfo(TechId, String)
+ * @see IGenericClientService#getSampleGenerationInfo(TechId)
*/
- public void getSampleGenerationInfo(final TechId sampleId, String baseIndexURL,
+ public void getSampleGenerationInfo(final TechId sampleId,
AsyncCallback<SampleParentWithDerived> asyncCallback);
/**
- * @see IGenericClientService#getSampleInfo(TechId, String)
+ * @see IGenericClientService#getSampleInfo(TechId)
*/
- public void getSampleInfo(final TechId sampleId, String baseIndexURL,
+ public void getSampleInfo(final TechId sampleId,
AsyncCallback<Sample> asyncCallback);
/**
@@ -74,15 +74,15 @@ public interface IGenericClientServiceAsync extends IClientServiceAsync
throws UserFailureException;
/**
- * @see IGenericClientService#getExperimentInfo(String, String)
+ * @see IGenericClientService#getExperimentInfo(String)
*/
- public void getExperimentInfo(String experimentIdentifier, String baseIndexURL,
+ public void getExperimentInfo(String experimentIdentifier,
final AsyncCallback<Experiment> experimentInfoCallback);
/**
- * @see IGenericClientService#getExperimentInfo(TechId, String)
+ * @see IGenericClientService#getExperimentInfo(TechId)
*/
- public void getExperimentInfo(TechId experimentId, String baseIndexURL,
+ public void getExperimentInfo(TechId experimentId,
final AsyncCallback<Experiment> experimentInfoCallback);
/**
@@ -92,9 +92,9 @@ public interface IGenericClientServiceAsync extends IClientServiceAsync
final AsyncCallback<Material> materialInfoCallback);
/**
- * @see IGenericClientService#getDataSetInfo(TechId, String)
+ * @see IGenericClientService#getDataSetInfo(TechId)
*/
- public void getDataSetInfo(TechId datasetTechId, String baseIndexURL,
+ public void getDataSetInfo(TechId datasetTechId,
final AsyncCallback<ExternalData> datasetInfoCallback);
/**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java
index acfa6aa700b..9f6453d7d45 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java
@@ -33,7 +33,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.IDatabaseModificationObserver;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.AbstractRegistrationForm;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.CodeFieldWithGenerator;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifiable;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
@@ -106,11 +105,6 @@ public abstract class AbstractGenericEntityRegistrationForm<T extends EntityType
loadForm();
}
- protected final String getBaseIndexURL()
- {
- return GWTUtils.getBaseIndexURL();
- }
-
// ---------------------------------------------------------------------------------------------
// ID generation
// ---------------------------------------------------------------------------------------------
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditForm.java
index 5ac5d568766..182f145c71d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditForm.java
@@ -160,7 +160,7 @@ public final class GenericDataSetEditForm extends
{
ArrayList<DatabaseModificationAwareField<?>> fields =
new ArrayList<DatabaseModificationAwareField<?>>();
- // TODO 2009-08-01, Piotr Buczek: add other fields specified in LMS-1003
+ // TODO 2009-08-01, Piotr Buczek: add other fields specified in LMS-1003
fields.add(wrapUnaware(parentField));
fields.add(wrapUnaware(sampleField.getField()));
fields.add(wrapUnaware(fileFormatTypeSelectionWidget));
@@ -224,8 +224,7 @@ public final class GenericDataSetEditForm extends
@Override
protected void loadForm()
{
- viewContext.getService().getDataSetInfo(techIdOrNull, getBaseIndexURL(),
- new DataSetInfoCallback(viewContext));
+ viewContext.getService().getDataSetInfo(techIdOrNull, new DataSetInfoCallback(viewContext));
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
index f3fb256d809..386ee639a59 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
@@ -121,7 +121,7 @@ public final class GenericDataSetViewer extends
*/
protected void reloadData()
{
- viewContext.getService().getDataSetInfo(datasetId, getBaseIndexURL(),
+ viewContext.getService().getDataSetInfo(datasetId,
new DataSetInfoCallback(viewContext, this));
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertiesPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertiesPanel.java
index 7be4c638b0c..591e60fd38d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertiesPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertiesPanel.java
@@ -35,7 +35,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.Propert
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.IPropertyValueRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.PropertyGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.EntityPropertyUtils;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.GWTUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
@@ -157,8 +156,7 @@ public class ExperimentPropertiesPanel extends ContentPanel
private void reloadData(AbstractAsyncCallback<Experiment> callback)
{
- viewContext.getService().getExperimentInfo(experimentId, GWTUtils.getBaseIndexURL(),
- callback);
+ viewContext.getService().getExperimentInfo(experimentId, callback);
}
public IDatabaseModificationObserverWithCallback getDatabaseModificationObserver()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
index b8d32199c0f..6ea70b872fc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
@@ -56,7 +56,7 @@ public final class GenericExperimentEditForm extends AbstractGenericExperimentRe
private void loadSamplesInBackground()
{
final ListSampleDisplayCriteria sampleCriteria =
- ListSampleDisplayCriteria.createForExperiment(techIdOrNull, getBaseIndexURL());
+ ListSampleDisplayCriteria.createForExperiment(techIdOrNull);
viewContext.getCommonService().listSamples(sampleCriteria,
new ListSamplesCallback(viewContext));
}
@@ -151,7 +151,7 @@ public final class GenericExperimentEditForm extends AbstractGenericExperimentRe
@Override
protected void loadForm()
{
- viewContext.getService().getExperimentInfo(techIdOrNull, getBaseIndexURL(),
+ viewContext.getService().getExperimentInfo(techIdOrNull,
new ExperimentInfoCallback(viewContext));
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
index a57ff51e596..a7f5cf28971 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
@@ -105,7 +105,7 @@ public final class GenericExperimentViewer extends
*/
protected void reloadData(AbstractAsyncCallback<Experiment> callback)
{
- viewContext.getService().getExperimentInfo(experimentId, getBaseIndexURL(), callback);
+ viewContext.getService().getExperimentInfo(experimentId, callback);
}
@Override
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
index 79b29fd3286..7bdeafa868a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
@@ -160,8 +160,7 @@ public final class GenericSampleEditForm extends AbstractGenericSampleRegisterEd
@Override
protected void loadForm()
{
- viewContext.getService().getSampleInfo(techIdOrNull, getBaseIndexURL(),
- new SampleInfoCallback(viewContext));
+ viewContext.getService().getSampleInfo(techIdOrNull, new SampleInfoCallback(viewContext));
}
public final class SampleInfoCallback extends AbstractAsyncCallback<Sample>
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
index a2dd434ae51..d8f5a8870b1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
@@ -310,7 +310,7 @@ public final class GenericSampleViewer extends AbstractViewer<IGenericClientServ
protected void reloadSampleGenerationData(
AbstractAsyncCallback<SampleParentWithDerived> callback)
{
- viewContext.getService().getSampleGenerationInfo(sampleId, getBaseIndexURL(), callback);
+ viewContext.getService().getSampleGenerationInfo(sampleId, callback);
}
//
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
index 4350f144be0..2a049e76f48 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
@@ -119,7 +119,7 @@ public final class GenericClientService extends AbstractClientService implements
// IGenericClientService
//
- public final SampleParentWithDerived getSampleGenerationInfo(final TechId sampleId, String baseIndexURL)
+ public final SampleParentWithDerived getSampleGenerationInfo(final TechId sampleId)
throws ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException
{
try
@@ -134,10 +134,10 @@ public final class GenericClientService extends AbstractClientService implements
}
}
- public final Sample getSampleInfo(final TechId sampleId, String baseIndexURL)
+ public final Sample getSampleInfo(final TechId sampleId)
throws ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException
{
- return getSampleGenerationInfo(sampleId, baseIndexURL).getParent();
+ return getSampleGenerationInfo(sampleId).getParent();
}
public final void registerSample(final String sessionKey, final NewSample newSample)
@@ -173,7 +173,7 @@ public final class GenericClientService extends AbstractClientService implements
}
- public final Experiment getExperimentInfo(final String experimentIdentifier, String baseIndexURL)
+ public final Experiment getExperimentInfo(final String experimentIdentifier)
throws ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException
{
try
@@ -189,7 +189,7 @@ public final class GenericClientService extends AbstractClientService implements
}
}
- public final Experiment getExperimentInfo(final TechId experimentId, String baseIndexURL)
+ public final Experiment getExperimentInfo(final TechId experimentId)
throws ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException
{
try
@@ -218,7 +218,7 @@ public final class GenericClientService extends AbstractClientService implements
}
}
- public final ExternalData getDataSetInfo(final TechId datasetId, final String baseIndexURL)
+ public final ExternalData getDataSetInfo(final TechId datasetId)
throws ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException
{
try
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
index b13988dbdb9..a2bee682880 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
@@ -88,7 +88,6 @@ public final class CommonClientServiceTest extends AbstractClientServiceTest
final ListSampleCriteria criteria = new ListSampleCriteria();
final SampleType sampleType = createSampleType("MASTER_PLATE", "DB1");
criteria.setSampleType(sampleType);
- criteria.setBaseIndexUrl("base-url.ch");
return new ListSampleDisplayCriteria(criteria);
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/ListSampleCriteriaPredicateTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/ListSampleCriteriaPredicateTest.java
index 2337ac215dc..23146bfde00 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/ListSampleCriteriaPredicateTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/ListSampleCriteriaPredicateTest.java
@@ -44,7 +44,7 @@ public class ListSampleCriteriaPredicateTest extends AuthorizationTestCase
try
{
predicate.doEvaluation(createPerson(), createRoles(false), ListSampleCriteria
- .createForExperiment(new TechId(1L), "irrelevant"));
+ .createForExperiment(new TechId(1L)));
} catch (final AssertionError e)
{
fail = false;
@@ -122,7 +122,7 @@ public class ListSampleCriteriaPredicateTest extends AuthorizationTestCase
});
predicate.init(provider);
final ListSampleCriteria criteria =
- ListSampleCriteria.createForExperiment(new TechId(17L), "doesntmatter");
+ ListSampleCriteria.createForExperiment(new TechId(17L));
final Status evaluation =
predicate.doEvaluation(createPerson(), createRoles(false), criteria);
assertEquals(Status.OK, evaluation);
@@ -143,7 +143,7 @@ public class ListSampleCriteriaPredicateTest extends AuthorizationTestCase
});
predicate.init(provider);
final ListSampleCriteria criteria =
- ListSampleCriteria.createForExperiment(new TechId(17L), "doesntmatter");
+ ListSampleCriteria.createForExperiment(new TechId(17L));
final Status evaluation =
predicate.doEvaluation(createPerson(), createRoles(false), criteria);
assertTrue(evaluation.isError());
@@ -160,14 +160,13 @@ public class ListSampleCriteriaPredicateTest extends AuthorizationTestCase
{
one(provider).getSample(new TechId(42L));
will(returnValue(createSample(createGroup())));
-
+
one(provider).tryFindDatabaseInstanceByCode(INSTANCE_CODE);
will(returnValue(createDatabaseInstance()));
}
});
predicate.init(provider);
- final ListSampleCriteria criteria =
- ListSampleCriteria.createForContainer(new TechId(42L), "doesntmatter");
+ final ListSampleCriteria criteria = ListSampleCriteria.createForContainer(new TechId(42L));
final Status evaluation =
predicate.doEvaluation(createPerson(), createRoles(false), criteria);
assertEquals(Status.OK, evaluation);
@@ -184,14 +183,14 @@ public class ListSampleCriteriaPredicateTest extends AuthorizationTestCase
{
one(provider).getSample(new TechId(42L));
will(returnValue(createSample(createAnotherGroup())));
-
+
one(provider).tryFindDatabaseInstanceByCode(ANOTHER_INSTANCE_CODE);
will(returnValue(createAnotherDatabaseInstance()));
}
});
predicate.init(provider);
final ListSampleCriteria criteria =
- ListSampleCriteria.createForContainer(new TechId(42L), "doesntmatter");
+ ListSampleCriteria.createForContainer(new TechId(42L));
final Status evaluation =
predicate.doEvaluation(createPerson(), createRoles(false), criteria);
assertTrue(evaluation.isError());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
index 702c2a432cb..02cc35c912a 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
@@ -83,7 +83,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
* Tests that authorization annotations of
* {@link IGenericServer#getExperimentInfo(String, ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier)}
* are obeyed. This is done by a direct invocation of
- * {@link IGenericClientServiceAsync#getExperimentInfo(String,String, com.google.gwt.user.client.rpc.AsyncCallback)}
+ * {@link IGenericClientServiceAsync#getExperimentInfo(String,com.google.gwt.user.client.rpc.AsyncCallback)}
* because the normal GUI only list experiments which are accessible by the user.
*/
public final void testDirectInvocationOfGetExperimentInfoByAnUnauthorizedUser()
@@ -97,7 +97,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
client.tryToGetViewContext();
IGenericClientServiceAsync service =
new GenericViewContext(viewContext).getService();
- service.getExperimentInfo(CISD_CISD_NEMO + "/" + EXP1, "base-url.ch",
+ service.getExperimentInfo(CISD_CISD_NEMO + "/" + EXP1,
new GetExperimentInfoCallback(viewContext));
}
});
--
GitLab