Author: mfortun Date: 2011-05-16 18:03:53 +0200 (Mon, 16 May 2011) New Revision: 895 Url: http://nuiton.org/repositories/revision/wikitty/895 Log: * beginning of the implementation of multicontext support for pagedresult's methods Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-16 15:00:51 UTC (rev 894) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-16 16:03:53 UTC (rev 895) @@ -493,12 +493,41 @@ public <E extends BusinessEntity> PagedResult<E> findAllByCriteria( Class<E> clazz, Criteria criteria) { - return mainProxy.findAllByCriteria(clazz, criteria); + PagedResult<E> result = mainProxy.findAllByCriteria(clazz, criteria); + + + if (isFallbackService()) { + /* + * TODO mfortun-2011-05-16 algo + * + * search id on the main, + * search id on the fallback + * fallbackid-mainid + * + * restore id from fallback + * complete pagedresult + * + * + * + */ + + } + + + + return result; } public <E extends BusinessEntity> PagedResult<E>[] findAllByCriteria( Class<E> clazz, Criteria c1, Criteria c2, Criteria... otherCriteria) { - return mainProxy.findAllByCriteria(clazz, c1, c2, otherCriteria); + + List<Criteria> criterias = new ArrayList<Criteria>(); + criterias.add(c1); + criterias.add(c2); + CollectionUtil.addAll(criterias, otherCriteria); + + // deleguate to easily handle multicontext + return (PagedResult<E>[]) this.findAllByCriteria(clazz, criterias).toArray(); } public List<PagedResult<Wikitty>> findAllByCriteria(List<Criteria> criteria) { @@ -511,7 +540,14 @@ public PagedResult<Wikitty>[] findAllByCriteria(Criteria c1, Criteria c2, Criteria... otherCriteria) { - return mainProxy.findAllByCriteria(c1, c2, otherCriteria); + + List<Criteria> criterias = new ArrayList<Criteria>(); + criterias.add(c1); + criterias.add(c2); + CollectionUtil.addAll(criterias, otherCriteria); + + // deleguate to easily handle multicontext + return (PagedResult<Wikitty>[]) this.findAllByCriteria(criterias).toArray(); } public List<PagedResult<String>> findAllIdByCriteria(List<Criteria> criteria) { @@ -524,7 +560,15 @@ public PagedResult<String>[] findAllIdByCriteria(Criteria c1, Criteria c2, Criteria... otherCriteria) { - return mainProxy.findAllIdByCriteria(c1, c2, otherCriteria); + + + List<Criteria> criterias = new ArrayList<Criteria>(); + criterias.add(c1); + criterias.add(c2); + CollectionUtil.addAll(criterias, otherCriteria); + + // deleguate to easily handle multicontext + return (PagedResult<String>[]) this.findAllIdByCriteria( criterias).toArray(); } public List<String> findIdByCriteria(List<Criteria> criteria) {