From 9626c6f6b3e33b7dbb62b2dd8de58738bab352e6 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 22 Feb 2013 15:25:53 +0000
Subject: [PATCH] [BIS-278/SP-417] Add an entity id resolver to the business
object factory.
SVN: 28413
---
.../bo/AbstractBusinessObjectFactory.java | 15 +++
.../db/EntityResolverQueryFactory.java | 36 +++++++
.../dataaccess/db/IEntityResolverQuery.java | 84 +++++++++++++++
.../db/EntityResolverQueryTest.java | 101 ++++++++++++++++++
4 files changed, 236 insertions(+)
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryFactory.java
create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IEntityResolverQuery.java
create mode 100644 openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryTest.java
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java
index 3b97550f3b6..d80d319cb59 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java
@@ -24,6 +24,8 @@ import ch.systemsx.cisd.openbis.generic.server.business.IEntityOperationChecker;
import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService;
import ch.systemsx.cisd.openbis.generic.server.business.IServiceConversationClientManagerLocal;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.EntityResolverQueryFactory;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.IEntityResolverQuery;
import ch.systemsx.cisd.openbis.generic.shared.managed_property.IManagedPropertyEvaluatorFactory;
/**
@@ -48,8 +50,11 @@ public abstract class AbstractBusinessObjectFactory
@Resource(name = ComponentNames.MANAGED_PROPERTY_EVALUATOR_FACTORY)
private IManagedPropertyEvaluatorFactory managedPropertyEvaluatorFactory;
+ private final IEntityResolverQuery entityResolver;
+
protected AbstractBusinessObjectFactory()
{
+ this.entityResolver = EntityResolverQueryFactory.create();
}
protected AbstractBusinessObjectFactory(final IDAOFactory daoFactory,
@@ -58,6 +63,7 @@ public abstract class AbstractBusinessObjectFactory
IServiceConversationClientManagerLocal conversationClient,
IManagedPropertyEvaluatorFactory managedPropertyEvaluatorFactory)
{
+ this();
this.daoFactory = daoFactory;
this.dssFactory = dssFactory;
this.relationshipService = relationshipService;
@@ -95,4 +101,13 @@ public abstract class AbstractBusinessObjectFactory
{
return managedPropertyEvaluatorFactory;
}
+
+ /**
+ * Returns the entity resolver query.
+ */
+ public IEntityResolverQuery getEntityResolver()
+ {
+ return entityResolver;
+ }
+
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryFactory.java
new file mode 100644
index 00000000000..38143b83e3d
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryFactory.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db;
+
+import net.lemnik.eodsql.QueryTool;
+
+/**
+ * A Factory for {@link IEntityResolverQuery}.
+ *
+ * @author Bernd Rinn
+ */
+public class EntityResolverQueryFactory
+{
+ /**
+ * Creates a new instance based on {@link IEntityResolverQuery}.
+ */
+ public static IEntityResolverQuery create()
+ {
+ return QueryTool.getManagedQuery(IEntityResolverQuery.class);
+ }
+
+}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IEntityResolverQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IEntityResolverQuery.java
new file mode 100644
index 00000000000..b3c7058378f
--- /dev/null
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IEntityResolverQuery.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2013 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db;
+
+import net.lemnik.eodsql.BaseQuery;
+import net.lemnik.eodsql.Select;
+
+/**
+ * A simple id resolver for entities.
+ *
+ * @author Bernd Rinn
+ */
+public interface IEntityResolverQuery extends BaseQuery
+{
+ /**
+ * Returns the tech id of a dataset by its code / perm id.
+ */
+ @Select(sql = "select d.id from data d where d.code = ?{1}")
+ public long resolveDatasetIdByCode(String datasetCode);
+
+ /**
+ * Returns the tech id of a sample by its perm id.
+ */
+ @Select(sql = "select s.id from samples s where s.perm_id = ?{1}")
+ public long resolveSampleIdByPermId(String permId);
+
+ /**
+ * Returns the tech id of a sample by its space and sample code.
+ */
+ @Select(sql = "select s.id from samples s left join spaces sp on s.space_id = sp.id where sp.code = ?{1} and s.code = ?{2}")
+ public long resolveSampleIdByCode(String spaceCodeOrNull, String sampleCode);
+
+ /**
+ * Returns the tech id of a material by its code / perm id.
+ */
+ @Select(sql = "select m.id from materials m left join material_types mt on m.maty_id = mt.id where mt.code = ?{1} and m.code = ?{2}")
+ public long resolveMaterialIdByCode(String materialTypeCode, String materialCode);
+
+ /**
+ * Returns the tech id of an experiment by its perm id.
+ */
+ @Select(sql = "select e.id from experiments e where e.perm_id = ?{1}")
+ public long resolveExperimentIdByPermId(String permId);
+
+ /**
+ * Returns the tech id of an experiment by its space, project and experiment code.
+ */
+ @Select(sql = "select e.id from experiments e left join projects p on e.proj_id = p.id left join spaces sp on p.space_id = sp.id where sp.code = ?{1} and p.code = ?{2} and e.code = ?{3}")
+ public long resolveExperimentIdByCode(String spaceCode, String projectCode,
+ String experimentCode);
+
+ /**
+ * Returns the tech id of a project by its perm id.
+ */
+ @Select(sql = "select p.id from projects p where p.perm_id = ?{1}")
+ public long resolveProjectIdByPermId(String permId);
+
+ /**
+ * Returns the tech id of a project by its space and project code.
+ */
+ @Select(sql = "select p.id from projects p left join spaces sp on p.space_id = sp.id where sp.code = ?{1} and p.code = ?{2}")
+ public long resolveProjectIdByCode(String spaceCode, String projectCode);
+
+ /**
+ * Returns the tech id of a space by its code.
+ */
+ @Select(sql = "select sp.id from spaces sp where sp.code = ?{1}")
+ public long resolveSpaceIdByCode(String spaceCode);
+
+}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryTest.java
new file mode 100644
index 00000000000..da3bc96423f
--- /dev/null
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2013 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+import java.sql.SQLException;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ * Tests for the simple entity resolver.
+ *
+ * @author Bernd Rinn
+ */
+@Test(groups =
+ { "db" })
+public class EntityResolverQueryTest extends AbstractDAOTest
+{
+ private IEntityResolverQuery query;
+
+ @BeforeClass(alwaysRun = true)
+ public void init() throws SQLException
+ {
+ query = EntityResolverQueryFactory.create();
+ }
+
+ @Test
+ public void testResolveSpace()
+ {
+ assertEquals(1, query.resolveSpaceIdByCode("CISD"));
+ }
+
+ @Test
+ public void testResolveProjectByCode()
+ {
+ assertEquals(5, query.resolveProjectIdByCode("TEST-SPACE", "TEST-PROJECT"));
+ }
+
+ @Test
+ public void testResolveProjectByPermId()
+ {
+ assertEquals(4, query.resolveProjectIdByPermId("20120814110011738-104"));
+ }
+
+ @Test
+ public void testResolveExperimentByCode()
+ {
+ assertEquals(23,
+ query.resolveExperimentIdByCode("TEST-SPACE", "TEST-PROJECT", "EXP-SPACE-TEST"));
+ }
+
+ @Test
+ public void testResolveExperimentByPermId()
+ {
+ assertEquals(8, query.resolveExperimentIdByPermId("200811050940555-1032"));
+ }
+
+ @Test
+ public void testResolveSampleByCode()
+ {
+ assertEquals(1054,
+ query.resolveSampleIdByCode("TEST-SPACE", "FV-TEST"));
+ }
+
+ @Test
+ public void testResolveSampleByPermId()
+ {
+ assertEquals(1019, query.resolveSampleIdByPermId("200811050929035-1014"));
+ }
+
+ @Test
+ public void testResolveMaterialByCode()
+ {
+ assertEquals(36,
+ query.resolveMaterialIdByCode("GENE", "MYGENE1"));
+ }
+
+ @Test
+ public void testResolveDatasetByCode()
+ {
+ assertEquals(13,
+ query.resolveDatasetIdByCode("20110509092359990-10"));
+ }
+
+}
--
GitLab