From 0602406c5319b297fe3a69da9af17a1575ce2a10 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Sun, 11 Jan 2015 18:30:28 -0500 Subject: [PATCH] VIVO-870 Create IndividualDao.getAllIndividualUris() This replaces IndividualDao.getAllOfThisTypeIterator(). It returns the list that was created instead of the iterator. This would require a change to ObjectSourceIFace, but we get rid of it instead. Nobody was using it. --- .../mannlib/vitro/webapp/dao/IndividualDao.java | 7 +++---- .../dao/filtering/IndividualDaoFiltering.java | 4 ++-- .../vitro/webapp/dao/jena/IndividualDaoJena.java | 2 +- .../vitro/webapp/dao/jena/IndividualDaoSDB.java | 9 ++++----- .../webapp/search/beans/ObjectSourceIface.java | 13 ------------- .../mannlib/vitro/webapp/dao/IndividualDaoStub.java | 4 ++-- 6 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java index 3d364c7e4..a2769f971 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java @@ -10,9 +10,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral; -import edu.cornell.mannlib.vitro.webapp.search.beans.ObjectSourceIface; -public interface IndividualDao extends ObjectSourceIface { +public interface IndividualDao { /** * Returns a collection of DataPropertyStatements involving all the external ID literals for a given Individual. @@ -85,9 +84,9 @@ public interface IndividualDao extends ObjectSourceIface { public abstract Individual getIndividualByURI(String individualURI); /** - * Returns an Iterator over all Individuals in the model that are user-viewable. + * Returns a collection of all Individuals in the model that are user-viewable. */ - public abstract Iterator getAllOfThisTypeIterator(); + public abstract Collection getAllIndividualUris(); /** * Returns an Iterator over all Individuals in the model that are user-viewable and have been updated since the specified time. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java index 00e620c61..a5639e631 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java @@ -120,8 +120,8 @@ class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{ /* ******************* unfiltered methods ****************** */ - public Iterator getAllOfThisTypeIterator() { - return innerIndividualDao.getAllOfThisTypeIterator(); + public Collection getAllIndividualUris() { + return innerIndividualDao.getAllIndividualUris(); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java index ec2a79761..ef6357e82 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java @@ -603,7 +603,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { return inds; } - public Iterator getAllOfThisTypeIterator() { + public Collection getAllIndividualUris() { //this is implemented in IndivdiualSDB throw new NotImplementedException(); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java index 1e1cb8366..cb54c15fb 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java @@ -4,6 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.io.InputStream; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -437,9 +438,8 @@ public class IndividualDaoSDB extends IndividualDaoJena { } @Override - public Iterator getAllOfThisTypeIterator() { - final List list = - new LinkedList(); + public Collection getAllIndividualUris() { + final List list = new LinkedList(); // get all labeled resources from any non-tbox and non-metadata graphs, // as well as the unnamed graph (first pattern below) @@ -472,8 +472,7 @@ public class IndividualDaoSDB extends IndividualDaoJena { w.close(); } - return list.iterator(); - + return list; } private Iterator getIndividualIterator( diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java deleted file mode 100644 index a0061975c..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java +++ /dev/null @@ -1,13 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.search.beans; - -import java.util.Iterator; - -public interface ObjectSourceIface { - - Iterator getAllOfThisTypeIterator(); - - Iterator getUpdatedSinceIterator(long msSinceEpoc); - -} diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java index f2681c078..bbf272dc5 100644 --- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java +++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java @@ -130,9 +130,9 @@ public class IndividualDaoStub implements IndividualDao { } @Override - public Iterator getAllOfThisTypeIterator() { + public Collection getAllIndividualUris() { throw new RuntimeException( - "IndividualDaoStub.getAllOfThisTypeIterator() not implemented."); + "IndividualDaoStub.getAllIndividualUris() not implemented."); } @Override