May 2011 - Wikitty-commits - mailman.cloud.codelutin.com

r901 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 17 May '11

17 May '11

Author: mfortun Date: 2011-05-17 17:34:30 +0200 (Tue, 17 May 2011) New Revision: 901 Url: http://nuiton.org/repositories/revision/wikitty/901 Log: * correct copy/past mistake in initialization for fallback service Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.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-17 14:20:57 UTC (rev 900) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-17 15:34:30 UTC (rev 901) @@ -32,11 +32,6 @@ public static String WIKITTY_SERVICE_FALLBACK_COMPONNENT_KEY; public static String WIKITTY_SERVICE_FALLBACK_URL_KEY; - /* - * TODO mfortun-2011-05-13 multicontext the begginning, need to think about - * how invoke method in the different proxy properly. - */ - /** * */ @@ -69,7 +64,7 @@ WikittyService ws = getWikittyService(config); ApplicationConfig configFallBack = WikittyPublicationConfig - .getInstance(); + .getFallBackConfig(); WikittyService fallservice = getWikittyServiceFallBack(configFallBack); WikittyPublicationProxy result = new WikittyPublicationProxy(config, @@ -1060,12 +1055,8 @@ List<String> result = mainProxy.findIdByCriteria(criteria); - // TODO mfortun-2011-05-17 reform criteria + if (isFallbackService()) { - if (isFallbackService()) { - - - if (result == null) { result = fallbackProxy.findIdByCriteria(criteria); } else { @@ -1463,6 +1454,15 @@ return result; } + /** + * Create a criteria to exclude a list of if from a criteria + * + * @param origin + * the criteria from whom exclude id + * @param toExclude + * list of id to exlude + * @return the criteria excluding ids + */ protected Criteria idNotInCriteriaConstructor(Criteria origin, List<String> toExclude) { Criteria result = null; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-17 14:20:57 UTC (rev 900) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-17 15:34:30 UTC (rev 901) @@ -25,7 +25,7 @@ protected WikittyUser user; public WikittyPublicationSession() { - proxy = WikittyPublicationProxy.getInstance(null); + proxy = WikittyPublicationProxy.getInstanceWithFallback(null); } /**

1 0

r900 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr
by sletellier＠users.nuiton.org 17 May '11

17 May '11

Author: sletellier Date: 2011-05-17 16:20:57 +0200 (Tue, 17 May 2011) New Revision: 900 Url: http://nuiton.org/repositories/revision/wikitty/900 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> <modules> @@ -379,10 +379,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.2 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.1.2</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-api/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-dto/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-generators/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-hessian-client/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-hessian-server/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-jdbc/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-perf-test/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-05-17 14:20:55 UTC (rev 899) +++ trunk/wikitty-solr/pom.xml 2011-05-17 14:20:57 UTC (rev 900) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2</version> + <version>3.1.3-SNAPSHOT</version> </parent>

1 0

r899 - in tags: . wikitty-3.1.2
by sletellier＠users.nuiton.org 17 May '11

17 May '11

Author: sletellier Date: 2011-05-17 16:20:55 +0200 (Tue, 17 May 2011) New Revision: 899 Url: http://nuiton.org/repositories/revision/wikitty/899 Log: [maven-release-plugin] copy for tag wikitty-3.1.2 Added: tags/wikitty-3.1.2/ Property changes on: tags/wikitty-3.1.2 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r898 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr
by sletellier＠users.nuiton.org 17 May '11

17 May '11

Author: sletellier Date: 2011-05-17 16:20:52 +0200 (Tue, 17 May 2011) New Revision: 898 Url: http://nuiton.org/repositories/revision/wikitty/898 Log: [maven-release-plugin] prepare release wikitty-3.1.2 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> <modules> @@ -379,10 +379,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.1.2</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-api/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-dto/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-generators/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-hessian-client/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-hessian-server/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-jdbc/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-perf-test/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-05-17 14:18:12 UTC (rev 897) +++ trunk/wikitty-solr/pom.xml 2011-05-17 14:20:52 UTC (rev 898) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2</version> </parent>

1 0

r897 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication java/org/nuiton/wikitty/publication/action resources webapp
by sletellier＠users.nuiton.org 17 May '11

17 May '11

Author: sletellier Date: 2011-05-17 16:18:12 +0200 (Tue, 17 May 2011) New Revision: 897 Url: http://nuiton.org/repositories/revision/wikitty/897 Log: Fix svn:keywords Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LogoutInterceptor.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRegister.java trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties trunk/wikitty-publication/src/main/webapp/login.jsp trunk/wikitty-publication/src/main/webapp/register.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-17 14:01:38 UTC (rev 896) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-17 14:18:12 UTC (rev 897) @@ -2,8 +2,8 @@ * #%L * bow * - * $Id: LoginInterceptor.java 276 2011-04-29 21:02:55Z bpoussin $ - * $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/java/org/chorem/bow/int… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LogoutInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java 2011-05-17 14:01:38 UTC (rev 896) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java 2011-05-17 14:18:12 UTC (rev 897) @@ -2,8 +2,8 @@ * #%L * bow * - * $Id: LoginAction.java 228 2011-03-03 10:59:29Z vbriand $ - * $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/java/org/chorem/bow/act… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2010 CodeLutin * %% Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java 2011-05-17 14:01:38 UTC (rev 896) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java 2011-05-17 14:18:12 UTC (rev 897) @@ -2,8 +2,8 @@ * #%L * bow * - * $Id: LogoutAction.java 192 2011-02-14 14:53:06Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/java/org/chorem/bow/act… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2010 - 2011 CodeLutin * %% Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRegister.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties 2011-05-17 14:01:38 UTC (rev 896) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties 2011-05-17 14:18:12 UTC (rev 897) @@ -2,8 +2,8 @@ # #%L # Wikitty :: publication # -# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ -# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin # %% Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/login.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/register.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r896 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 17 May '11

17 May '11

Author: mfortun Date: 2011-05-17 16:01:38 +0200 (Tue, 17 May 2011) New Revision: 896 Url: http://nuiton.org/repositories/revision/wikitty/896 Log: * add multicontext 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 16:03:53 UTC (rev 895) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-17 14:01:38 UTC (rev 896) @@ -301,7 +301,7 @@ } public List<Wikitty> storeWikitty(List<Wikitty> wikitties) { - + List<Wikitty> result = new ArrayList<Wikitty>(); List<Wikitty> tempObject = new ArrayList<Wikitty>(); @@ -472,7 +472,54 @@ public <E extends BusinessEntityImpl> PagedResult<E> findAllByExample(E e, int firstIndex, int endIndex, String... fieldFacet) { - return mainProxy.findAllByExample(e, firstIndex, endIndex, fieldFacet); + + PagedResult<E> result = mainProxy.findAllByExample(e, firstIndex, + endIndex, fieldFacet); + + int resultSizeExpected = endIndex - firstIndex; + if (isFallbackService() && result.size() < resultSizeExpected) { + + if (result.size() == 0) { + String oldRequest = result.getQueryString(); + + /* + * change the param because we search on the beginning of the + * content of the otherLike they were the same collection + */ + result = fallbackProxy.findAllByExample(e, 0, + resultSizeExpected, fieldFacet); + + // reform the result + PagedResult<E> reformResult = new PagedResult<E>(firstIndex, + result.getNumFound(), oldRequest, result.getFacets(), + result.getAll()); + result = reformResult; + } else { + + /* + * Calculate the number of missing element and search then on + * the fallback wikitty service, and then add this result to the + * final result; + */ + int missingNumber = resultSizeExpected - result.size(); + + PagedResult<E> resultTempFromFall = fallbackProxy + .findAllByExample(e, 0, missingNumber, fieldFacet); + + List<E> completedResultList = result.getAll(); + completedResultList.addAll(resultTempFromFall.getAll()); + + int totalNumberofFound = result.getNumFound() + + resultTempFromFall.getNumFound(); + + PagedResult<E> reformResult = new PagedResult<E>(firstIndex, + totalNumberofFound, result.getQueryString(), + result.getFacets(), completedResultList); + result = reformResult; + } + } + + return result; } public <E extends BusinessEntityImpl> E findByExample(E e) { @@ -487,95 +534,538 @@ public <E extends BusinessEntity> List<PagedResult<E>> findAllByCriteria( Class<E> clazz, List<Criteria> criterias) { - return mainProxy.findAllByCriteria(clazz, criterias); + + List<PagedResult<E>> result = mainProxy.findAllByCriteria(clazz, + criterias); + + if (isFallbackService()) { + + for (int i = 0; i < result.size(); i++) { + + /* + * get the curent criteria and corresponding result to check if + * the expected number of result is match + */ + Criteria currentCrit = criterias.get(i); + PagedResult<E> currentResult = result.get(i); + + int resultSizeExpected = currentCrit.getEndIndex() + - currentCrit.getFirstIndex(); + if (currentResult.size() < resultSizeExpected) { + /* + * if result empty, just put the result of the fallback's + * requestresult + */ + + /* + * rebuild the criteria to search properly on the second + * service we search for wikitty not in the same position, + * but in the beginning + */ + Criteria critFallback = Search.query(currentCrit) + .criteria(); + critFallback.setFirstIndex(0); + critFallback.setEndIndex(currentCrit.getEndIndex() + - currentCrit.getFirstIndex()); + + if (result.size() == 0) { + + PagedResult<E> tempPagedResult = fallbackProxy + .findAllByCriteria(clazz, critFallback); + + // rebuild the result to match the expected criteria + tempPagedResult = new PagedResult<E>( + currentCrit.getFirstIndex(), + tempPagedResult.getNumFound(), + currentCrit.toString(), + tempPagedResult.getFacets(), + tempPagedResult.getAll()); + + result.set(i, tempPagedResult); + } else { + + /* + * we will search to complete the result with id from + * the fallback service so we reduce the number of + * element requested on the fallback service and we add + * a restriction on wikitty id to exclude id already in + * the first part of the result + * + * it not assume that wikitty id found does not exist on + * the first part of a criteria, for example if first + * index where 12, nothing assure that we found wikitty + * in the fall back that aren't in the 11 first wikitty + * of the main service + */ + PagedResult<String> idFromMain = mainProxy + .findAllIdByCriteria(currentCrit); + + Criteria excluding = idNotInCriteriaConstructor( + critFallback, idFromMain.getAll()); + + excluding.setEndIndex(resultSizeExpected + - result.size()); + + PagedResult<E> resultFallback = fallbackProxy + .findAllByCriteria(clazz, excluding); + + List<E> allresult = currentResult.getAll(); + allresult.addAll(resultFallback.getAll()); + int number = currentResult.getNumFound() + + resultFallback.getNumFound(); + + // rebuilt the result + PagedResult<E> tempPagedResult = new PagedResult<E>( + currentCrit.getFirstIndex(), number, + currentCrit.toString(), + currentResult.getFacets(), allresult); + // re set the result in the list + result.set(i, tempPagedResult); + } + } + + } + } + + return result; } public <E extends BusinessEntity> PagedResult<E> findAllByCriteria( Class<E> clazz, Criteria criteria) { - PagedResult<E> result = mainProxy.findAllByCriteria(clazz, criteria); - - - if (isFallbackService()) { + PagedResult<E> result = mainProxy.findAllByCriteria(clazz, criteria); + + // PagedResult<String> result = mainProxy.findAllIdByCriteria(criteria); + + int resultSizeExpected = criteria.getEndIndex() + - criteria.getFirstIndex(); + if (isFallbackService() && result.size() < resultSizeExpected) { + // if result empty, just put the result of the fallback's request + // result + /* - * TODO mfortun-2011-05-16 algo - * - * search id on the main, - * search id on the fallback - * fallbackid-mainid - * - * restore id from fallback - * complete pagedresult - * - * - * + * rebuild the criteria to search properly on the second service we + * search for wikitty not in the same position, but in the beginning */ - + Criteria critFallback = Search.query(criteria).criteria(); + critFallback.setFirstIndex(0); + critFallback.setEndIndex(criteria.getEndIndex() + - criteria.getFirstIndex()); + + if (result.size() == 0) { + + result = fallbackProxy.findAllByCriteria(clazz, critFallback); + // rebuild the result to match the expected criteria + result = new PagedResult<E>(criteria.getFirstIndex(), + result.getNumFound(), criteria.toString(), + result.getFacets(), result.getAll()); + } else { + + PagedResult<String> idFromMain = mainProxy + .findAllIdByCriteria(criteria); + + /* + * we will search to complete the result with id from the + * fallback service so we reduce the number of element requested + * on the fallback service and we add a restriction on wikitty + * id to exclude id already in the first part of the result + * + * it not assume that wikitty id found does not exist on the + * first part of a criteria, for example if first index where + * 12, nothing assure that we found wikitty in the fall back + * that aren't in the 11 first wikitty of the main service + */ + Criteria excluding = idNotInCriteriaConstructor(critFallback, + idFromMain.getAll()); + + excluding.setEndIndex(resultSizeExpected - result.size()); + + PagedResult<E> resultFallback = fallbackProxy + .findAllByCriteria(clazz, excluding); + + List<E> allresult = result.getAll(); + allresult.addAll(resultFallback.getAll()); + int number = result.getNumFound() + + resultFallback.getNumFound(); + + result = new PagedResult<E>(criteria.getFirstIndex(), number, + criteria.toString(), result.getFacets(), allresult); + } } - - - + return result; } public <E extends BusinessEntity> PagedResult<E>[] findAllByCriteria( Class<E> clazz, Criteria c1, Criteria c2, Criteria... 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(); + return (PagedResult<E>[]) this.findAllByCriteria(clazz, criterias) + .toArray(); } public List<PagedResult<Wikitty>> findAllByCriteria(List<Criteria> criteria) { - return mainProxy.findAllByCriteria(criteria); + + List<PagedResult<Wikitty>> result = mainProxy + .findAllByCriteria(criteria); + + if (isFallbackService()) { + + for (int i = 0; i < result.size(); i++) { + + /* + * get the curent criteria and corresponding result to check if + * the expected number of result is match + */ + Criteria currentCrit = criteria.get(i); + PagedResult<Wikitty> currentResult = result.get(i); + + int resultSizeExpected = currentCrit.getEndIndex() + - currentCrit.getFirstIndex(); + if (currentResult.size() < resultSizeExpected) { + /* + * if result empty, just put the result of the fallback's + * requestresult + */ + + /* + * rebuild the criteria to search properly on the second + * service we search for wikitty not in the same position, + * but in the beginning + */ + Criteria critFallback = Search.query(currentCrit) + .criteria(); + critFallback.setFirstIndex(0); + critFallback.setEndIndex(currentCrit.getEndIndex() + - currentCrit.getFirstIndex()); + + if (result.size() == 0) { + + PagedResult<Wikitty> tempPagedResult = fallbackProxy + .findAllByCriteria(critFallback); + + // rebuild the result to match the expected criteria + tempPagedResult = new PagedResult<Wikitty>( + currentCrit.getFirstIndex(), + tempPagedResult.getNumFound(), + currentCrit.toString(), + tempPagedResult.getFacets(), + tempPagedResult.getAll()); + + result.set(i, tempPagedResult); + } else { + + /* + * we will search to complete the result with id from + * the fallback service so we reduce the number of + * element requested on the fallback service and we add + * a restriction on wikitty id to exclude id already in + * the first part of the result + * + * it not assume that wikitty id found does not exist on + * the first part of a criteria, for example if first + * index where 12, nothing assure that we found wikitty + * in the fall back that aren't in the 11 first wikitty + * of the main service + */ + PagedResult<String> idFromMain = mainProxy + .findAllIdByCriteria(currentCrit); + + Criteria excluding = idNotInCriteriaConstructor( + critFallback, idFromMain.getAll()); + + excluding.setEndIndex(resultSizeExpected + - result.size()); + + PagedResult<Wikitty> resultFallback = fallbackProxy + .findAllByCriteria(excluding); + + List<Wikitty> allresult = currentResult.getAll(); + allresult.addAll(resultFallback.getAll()); + int number = currentResult.getNumFound() + + resultFallback.getNumFound(); + + // rebuilt the result + PagedResult<Wikitty> tempPagedResult = new PagedResult<Wikitty>( + currentCrit.getFirstIndex(), number, + currentCrit.toString(), + currentResult.getFacets(), allresult); + // re set the result in the list + result.set(i, tempPagedResult); + } + } + + } + } + + return result; + } public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { - return mainProxy.findAllByCriteria(criteria); + + PagedResult<Wikitty> result = mainProxy.findAllByCriteria(criteria); + + // PagedResult<String> result = mainProxy.findAllIdByCriteria(criteria); + + int resultSizeExpected = criteria.getEndIndex() + - criteria.getFirstIndex(); + if (isFallbackService() && result.size() < resultSizeExpected) { + // if result empty, just put the result of the fallback's request + // result + + /* + * rebuild the criteria to search properly on the second service we + * search for wikitty not in the same position, but in the beginning + */ + Criteria critFallback = Search.query(criteria).criteria(); + critFallback.setFirstIndex(0); + critFallback.setEndIndex(criteria.getEndIndex() + - criteria.getFirstIndex()); + + if (result.size() == 0) { + + result = fallbackProxy.findAllByCriteria(critFallback); + // rebuild the result to match the expected criteria + result = new PagedResult<Wikitty>(criteria.getFirstIndex(), + result.getNumFound(), criteria.toString(), + result.getFacets(), result.getAll()); + } else { + + PagedResult<String> idFromMain = mainProxy + .findAllIdByCriteria(criteria); + + /* + * we will search to complete the result with id from the + * fallback service so we reduce the number of element requested + * on the fallback service and we add a restriction on wikitty + * id to exclude id already in the first part of the result + * + * it not assume that wikitty id found does not exist on the + * first part of a criteria, for example if first index where + * 12, nothing assure that we found wikitty in the fall back + * that aren't in the 11 first wikitty of the main service + */ + Criteria excluding = idNotInCriteriaConstructor(critFallback, + idFromMain.getAll()); + + excluding.setEndIndex(resultSizeExpected - result.size()); + + PagedResult<Wikitty> resultFallback = fallbackProxy + .findAllByCriteria(excluding); + + List<Wikitty> allresult = result.getAll(); + allresult.addAll(resultFallback.getAll()); + int number = result.getNumFound() + + resultFallback.getNumFound(); + + result = new PagedResult<Wikitty>(criteria.getFirstIndex(), + number, criteria.toString(), result.getFacets(), + allresult); + } + } + + return result; + } public PagedResult<Wikitty>[] findAllByCriteria(Criteria c1, Criteria c2, Criteria... 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(); + return (PagedResult<Wikitty>[]) this.findAllByCriteria(criterias) + .toArray(); } public List<PagedResult<String>> findAllIdByCriteria(List<Criteria> criteria) { - return mainProxy.findAllIdByCriteria(criteria); + + List<PagedResult<String>> result = mainProxy + .findAllIdByCriteria(criteria); + + if (isFallbackService()) { + + for (int i = 0; i < result.size(); i++) { + + /* + * get the curent criteria and corresponding result to check if + * the expected number of result is match + */ + Criteria currentCrit = criteria.get(i); + PagedResult<String> currentResult = result.get(i); + + int resultSizeExpected = currentCrit.getEndIndex() + - currentCrit.getFirstIndex(); + if (currentResult.size() < resultSizeExpected) { + /* + * if result empty, just put the result of the fallback's + * requestresult + */ + + /* + * rebuild the criteria to search properly on the second + * service we search for wikitty not in the same position, + * but in the beginning + */ + Criteria critFallback = Search.query(currentCrit) + .criteria(); + critFallback.setFirstIndex(0); + critFallback.setEndIndex(currentCrit.getEndIndex() + - currentCrit.getFirstIndex()); + + if (result.size() == 0) { + + PagedResult<String> tempPagedResult = fallbackProxy + .findAllIdByCriteria(critFallback); + + // rebuild the result to match the expected criteria + tempPagedResult = new PagedResult<String>( + currentCrit.getFirstIndex(), + tempPagedResult.getNumFound(), + currentCrit.toString(), + tempPagedResult.getFacets(), + tempPagedResult.getAll()); + + result.set(i, tempPagedResult); + } else { + + /* + * we will search to complete the result with id from + * the fallback service so we reduce the number of + * element requested on the fallback service and we add + * a restriction on wikitty id to exclude id already in + * the first part of the result + * + * it not assume that wikitty id found does not exist on + * the first part of a criteria, for example if first + * index where 12, nothing assure that we found wikitty + * in the fall back that aren't in the 11 first wikitty + * of the main service + */ + Criteria excluding = idNotInCriteriaConstructor( + critFallback, currentResult.getAll()); + + excluding.setEndIndex(resultSizeExpected + - result.size()); + + PagedResult<String> resultFallback = fallbackProxy + .findAllIdByCriteria(excluding); + + List<String> allresult = currentResult.getAll(); + allresult.addAll(resultFallback.getAll()); + int number = currentResult.getNumFound() + + resultFallback.getNumFound(); + + // rebuilt the result + PagedResult<String> tempPagedResult = new PagedResult<String>( + currentCrit.getFirstIndex(), number, + currentCrit.toString(), + currentResult.getFacets(), allresult); + // re set the result in the list + result.set(i, tempPagedResult); + } + } + + } + } + + return result; + } public PagedResult<String> findAllIdByCriteria(Criteria criteria) { - return mainProxy.findAllIdByCriteria(criteria); + + PagedResult<String> result = mainProxy.findAllIdByCriteria(criteria); + + int resultSizeExpected = criteria.getEndIndex() + - criteria.getFirstIndex(); + if (isFallbackService() && result.size() < resultSizeExpected) { + // if result empty, just put the result of the fallback's request + // result + + /* + * rebuild the criteria to search properly on the second service we + * search for wikitty not in the same position, but in the beginning + */ + Criteria critFallback = Search.query(criteria).criteria(); + critFallback.setFirstIndex(0); + critFallback.setEndIndex(criteria.getEndIndex() + - criteria.getFirstIndex()); + + if (result.size() == 0) { + + result = fallbackProxy.findAllIdByCriteria(critFallback); + // rebuild the result to match the expected criteria + result = new PagedResult<String>(criteria.getFirstIndex(), + result.getNumFound(), criteria.toString(), + result.getFacets(), result.getAll()); + } else { + + /* + * we will search to complete the result with id from the + * fallback service so we reduce the number of element requested + * on the fallback service and we add a restriction on wikitty + * id to exclude id already in the first part of the result + * + * it not assume that wikitty id found does not exist on the + * first part of a criteria, for example if first index where + * 12, nothing assure that we found wikitty in the fall back + * that aren't in the 11 first wikitty of the main service + */ + Criteria excluding = idNotInCriteriaConstructor(critFallback, + result.getAll()); + + excluding.setEndIndex(resultSizeExpected - result.size()); + + PagedResult<String> resultFallback = fallbackProxy + .findAllIdByCriteria(excluding); + + List<String> allresult = result.getAll(); + allresult.addAll(resultFallback.getAll()); + int number = result.getNumFound() + + resultFallback.getNumFound(); + + result = new PagedResult<String>(criteria.getFirstIndex(), + number, criteria.toString(), result.getFacets(), + allresult); + } + } + + return result; } public PagedResult<String>[] findAllIdByCriteria(Criteria c1, Criteria c2, Criteria... 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(); + return (PagedResult<String>[]) this.findAllIdByCriteria(criterias) + .toArray(); } public List<String> findIdByCriteria(List<Criteria> criteria) { List<String> result = mainProxy.findIdByCriteria(criteria); + // TODO mfortun-2011-05-17 reform criteria + if (isFallbackService()) { + + + if (result == null) { result = fallbackProxy.findIdByCriteria(criteria); } else { @@ -973,4 +1463,19 @@ return result; } + protected Criteria idNotInCriteriaConstructor(Criteria origin, + List<String> toExclude) { + Criteria result = null; + + Search search = Search.query(origin); + + for (String id : toExclude) { + search.idneq(id); + } + + result = search.criteria(); + + return result; + } + }

1 0

r895 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 16 May '11

16 May '11

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) {

1 0

r894 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 16 May '11

16 May '11

Author: mfortun Date: 2011-05-16 17:00:51 +0200 (Mon, 16 May 2011) New Revision: 894 Url: http://nuiton.org/repositories/revision/wikitty/894 Log: * add mutlicontext store support, wikitty originally from fallbackservice are store on fallback not on mainproxy 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 13:38:09 UTC (rev 893) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-16 15:00:51 UTC (rev 894) @@ -3,9 +3,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import org.nuiton.util.ApplicationConfig; import org.nuiton.util.CollectionUtil; import org.nuiton.wikitty.WikittyProxy; @@ -18,6 +15,7 @@ import org.nuiton.wikitty.entities.WikittyUser; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.TreeNodeResult; import org.nuiton.wikitty.services.WikittyEvent; @@ -212,31 +210,133 @@ } public <E extends BusinessEntity> E store(E e) { - return mainProxy.store(e); + + E result = null; + // if there a fallback proxy and e exist on it, we try to store it again + // on fallbackproxy + if (isFallbackService() + && fallbackProxy.restore(e.getWikittyId()) != null) { + result = fallbackProxy.store(e); + } else { + result = mainProxy.store(e); + } + + return result; } public Wikitty store(Wikitty w) { - // TODO mfortun-2011-05-13 store in wich one ? - // check before if wikitty exist on fall back - // and the stock on it if exist and store after on main + Wikitty result = null; + // if there a fallback proxy and e exist on it, we try to store it again + // on fallbackproxy + if (isFallbackService() && fallbackProxy.restore(w.getId()) != null) { + result = fallbackProxy.store(w); + } else { + result = mainProxy.store(w); + } - return mainProxy.store(w); + return result; } public <E extends BusinessEntity> List<E> store(E e1, E e2, E... eN) { - return mainProxy.store(e1, e2, eN); + + List<E> result = new ArrayList<E>(); + result.add(e1); + result.add(e2); + CollectionUtil.addAll(result, eN); + + // delegate to store list, the easiest to handle store in two + // proxy + return this.store(result); } public Wikitty[] store(Wikitty w1, Wikitty w2, Wikitty... wN) { - return mainProxy.store(w1, w2, wN); + + List<Wikitty> result = new ArrayList<Wikitty>(); + result.add(w1); + result.add(w2); + CollectionUtil.addAll(result, wN); + + // delegate to store wikittylist, the easiest to handle store in two + // proxy + return (Wikitty[]) (this.storeWikitty(result).toArray()); } public <E extends BusinessEntity> List<E> store(List<E> objets) { - return mainProxy.store(objets); + + List<E> result = new ArrayList<E>(); + + List<E> tempObject = new ArrayList<E>(); + tempObject.addAll(objets); + + if (isFallbackService()) { + + List<String> ids = new ArrayList<String>(); + + // retrieve string id + for (E e : objets) { + ids.add(e.getWikittyId()); + } + + List<Criteria> criterias = idInIdsCriteriaConstructor(ids); + + // retrieve wikitty's id that exist on fallbackservice + List<String> containedFallId = fallbackProxy + .findIdByCriteria(criterias); + + List<E> toStoreOnFall = new ArrayList<E>(); + // order wikitty that have to be save on fall back + for (E e : objets) { + if (containedFallId.contains(e.getWikittyId())) { + toStoreOnFall.add(e); + tempObject.remove(e); + } + } + // save wikitty on fall back + result.addAll(fallbackProxy.store(toStoreOnFall)); + + } + + result.addAll(mainProxy.store(tempObject)); + return result; } public List<Wikitty> storeWikitty(List<Wikitty> wikitties) { - return mainProxy.storeWikitty(wikitties); + + List<Wikitty> result = new ArrayList<Wikitty>(); + + List<Wikitty> tempObject = new ArrayList<Wikitty>(); + tempObject.addAll(wikitties); + + if (isFallbackService()) { + + List<String> ids = new ArrayList<String>(); + + // retrieve string id + for (Wikitty w : wikitties) { + ids.add(w.getId()); + } + + List<Criteria> criterias = idInIdsCriteriaConstructor(ids); + + // retrieve wikitty's id that exist on fallbackservice + List<String> containedFallId = fallbackProxy + .findIdByCriteria(criterias); + + List<Wikitty> toStoreOnFall = new ArrayList<Wikitty>(); + // order wikitty that have to be save on fall back + for (Wikitty w : wikitties) { + if (containedFallId.contains(w.getId())) { + toStoreOnFall.add(w); + tempObject.remove(w); + } + } + // save wikitty on fall back + result.addAll(fallbackProxy.storeWikitty(toStoreOnFall)); + + } + + result.addAll(mainProxy.storeWikitty(tempObject)); + return result; } public <E extends BusinessEntity> E restore(Class<E> clazz, String id, @@ -392,6 +492,7 @@ public <E extends BusinessEntity> PagedResult<E> findAllByCriteria( Class<E> clazz, Criteria criteria) { + return mainProxy.findAllByCriteria(clazz, criteria); } @@ -427,7 +528,7 @@ } public List<String> findIdByCriteria(List<Criteria> criteria) { - + List<String> result = mainProxy.findIdByCriteria(criteria); if (isFallbackService()) { @@ -444,26 +545,23 @@ } return result; - - - + } public String findIdByCriteria(Criteria criteria) { - + String result = mainProxy.findIdByCriteria(criteria); - + if (isFallbackService() && result == null) { result = fallbackProxy.findIdByCriteria(criteria); } - - return result; + + return result; } public String[] findIdByCriteria(Criteria c1, Criteria c2, Criteria... otherCriteria) { - - + String[] result = mainProxy.findIdByCriteria(c1, c2, otherCriteria); if (isFallbackService()) { @@ -491,8 +589,7 @@ public <E extends BusinessEntity> List<E> findByCriteria(Class<E> clazz, List<Criteria> criterias) { - - + List<E> result = mainProxy.findByCriteria(clazz, criterias); if (isFallbackService()) { @@ -500,8 +597,8 @@ result = fallbackProxy.findByCriteria(clazz, criterias); } else { // merge list - List<E> resultFallback = fallbackProxy - .findByCriteria(clazz, criterias); + List<E> resultFallback = fallbackProxy.findByCriteria(clazz, + criterias); // this allow to element from main to prevail resultFallback.removeAll(result); result.addAll(resultFallback); @@ -513,13 +610,13 @@ public <E extends BusinessEntity> E findByCriteria(Class<E> clazz, Criteria criteria) { - + E result = mainProxy.findByCriteria(clazz, criteria); - + if (isFallbackService() && result == null) { result = fallbackProxy.findByCriteria(clazz, criteria); } - + return result; } @@ -815,4 +912,21 @@ return result; } + /** + * construct list criteria on wikitty id: used to search wikittyid in + * wikittyIDCollection. used to check if an id exist on a wikitty service + * + * @param ids + * @return criterias on id + */ + protected List<Criteria> idInIdsCriteriaConstructor(List<String> ids) { + + List<Criteria> result = new ArrayList<Criteria>(); + + for (String id : ids) { + result.add(Search.query().ideq(id).criteria()); + } + return result; + } + }

1 0

r893 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 16 May '11

16 May '11

Author: mfortun Date: 2011-05-16 15:38:09 +0200 (Mon, 16 May 2011) New Revision: 893 Url: http://nuiton.org/repositories/revision/wikitty/893 Log: * multicontext support except for pagedResult return type and storage 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 10:00:20 UTC (rev 892) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-16 13:38:09 UTC (rev 893) @@ -7,6 +7,7 @@ import java.util.Map.Entry; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.CollectionUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; @@ -117,6 +118,35 @@ return fallbackProxy != null; } + public WikittyProxy getFallbackProxy() { + return fallbackProxy; + } + + public void setFallbackProxy(WikittyProxy fallbackProxy) { + this.fallbackProxy = fallbackProxy; + } + + public WikittyProxy getMainProxy() { + return mainProxy; + } + + public void setMainProxy(WikittyProxy mainProxy) { + this.mainProxy = mainProxy; + } + + public void setFallbackWikittyService(WikittyService service) { + fallbackProxy.setWikittyService(service); + } + + public WikittyService getFallbackWikittyService() { + return fallbackProxy.getWikittyService(); + } + + /* + * Beginning of redefinition method that take care of merge between result + * of the proxy and fallback proxy if any + */ + public void login(String login, String password) { mainProxy.login(login, password); if (isFallbackService()) { @@ -132,7 +162,11 @@ } public String getSecurityToken() { - return mainProxy.getSecurityToken(); + String result = mainProxy.getSecurityToken(); + + // TODO mfortun-2011-05-16 do something on fallback ? + + return result; } public void setSecurityToken(String securityToken) { @@ -143,11 +177,20 @@ } public WikittyUser getUser() { - return mainProxy.getUser(); + WikittyUser result = mainProxy.getUser(); + + // TODO mfortun-2011-05-16 do something on fallback ? + + return result; } public <E extends BusinessEntity> E getUser(Class<E> clazz) { - return mainProxy.getUser(clazz); + + E result = mainProxy.getUser(clazz); + + // TODO mfortun-2011-05-16 do something on fallback ? + + return result; } public WikittyService getWikittyService() { @@ -160,7 +203,12 @@ public <E extends BusinessEntity> E cast(BusinessEntity source, Class<E> target) { - return mainProxy.cast(source, target); + + E result = mainProxy.cast(source, target); + + // TODO mfortun-2011-05-16 do something on fallback ? + + return result; } public <E extends BusinessEntity> E store(E e) { @@ -193,7 +241,13 @@ public <E extends BusinessEntity> E restore(Class<E> clazz, String id, boolean checkExtension) { - return mainProxy.restore(clazz, id, checkExtension); + E result = mainProxy.restore(clazz, id, checkExtension); + + if (isFallbackService() && result == null) { + result = fallbackProxy.restore(clazz, id, checkExtension); + } + + return result; } public Wikitty restore(String id) { @@ -217,11 +271,22 @@ } public List<Wikitty> restore(List<String> id) { - List<Wikitty> result = mainProxy.restore(id); - // TODO mfortun-2011-05-13 need to merge the two list - if (isFallbackService() && result == null) { - result = fallbackProxy.restore(id); + List<Wikitty> result = new ArrayList<Wikitty>(); + + result.addAll(mainProxy.restore(id)); + + if (isFallbackService()) { + // prepare a list with wikitty id that have not been retrieve by the + // first proxy + List<String> unusedId = new ArrayList<String>(); + unusedId.addAll(id); + + for (Wikitty wikitty : result) { + unusedId.remove(wikitty.getId()); + } + + result.addAll(fallbackProxy.restore(unusedId)); } return result; @@ -231,10 +296,23 @@ public <E extends BusinessEntity> List<E> restore(Class<E> clazz, List<String> id, boolean checkExtension) { - List<E> result = mainProxy.restore(clazz, id, checkExtension); + List<E> result = new ArrayList<E>(); - if (isFallbackService() && result == null) { - result = fallbackProxy.restore(clazz, id, checkExtension); + result.addAll(mainProxy.restore(clazz, id, checkExtension)); + + if (isFallbackService()) { + + // prepare a list with wikitty id that have not been retrieve by the + // first proxy + List<String> unusedId = new ArrayList<String>(); + unusedId.addAll(id); + + for (E wikitty : result) { + unusedId.remove(wikitty.getWikittyId()); + } + + result.addAll(fallbackProxy + .restore(clazz, unusedId, checkExtension)); } return result; @@ -242,39 +320,54 @@ public <E extends BusinessEntity> List<E> restore(Class<E> clazz, List<String> id) { - return mainProxy.restore(clazz, id); + + List<E> result = new ArrayList<E>(); + + result.addAll(mainProxy.restore(clazz, id)); + + if (isFallbackService()) { + + // prepare a list with wikitty id that have not been retrieve by the + // first proxy + List<String> unusedId = new ArrayList<String>(); + unusedId.addAll(id); + + for (E wikitty : result) { + unusedId.remove(wikitty.getWikittyId()); + } + + result.addAll(fallbackProxy.restore(clazz, unusedId)); + } + + return result; } public void delete(String id) { mainProxy.delete(id); - if (isFallbackService()){ + if (isFallbackService()) { fallbackProxy.delete(id); } - } public <E extends BusinessEntity> void delete(E object) { mainProxy.delete(object); - if (isFallbackService()){ + if (isFallbackService()) { fallbackProxy.delete(object); } - } public void delete(Collection<String> ids) { mainProxy.delete(ids); - if (isFallbackService()){ + if (isFallbackService()) { fallbackProxy.delete(ids); } - } public <E extends BusinessEntity> void delete(List<E> objets) { mainProxy.delete(objets); - if (isFallbackService()){ + if (isFallbackService()) { fallbackProxy.delete(objets); } - } public <E extends BusinessEntityImpl> PagedResult<E> findAllByExample(E e, @@ -283,7 +376,13 @@ } public <E extends BusinessEntityImpl> E findByExample(E e) { - return mainProxy.findByExample(e); + E result = mainProxy.findByExample(e); + + if (isFallbackService() && result == null) { + result = fallbackProxy.findByExample(e); + } + + return result; } public <E extends BusinessEntity> List<PagedResult<E>> findAllByCriteria( @@ -328,59 +427,200 @@ } public List<String> findIdByCriteria(List<Criteria> criteria) { - return mainProxy.findIdByCriteria(criteria); + + List<String> result = mainProxy.findIdByCriteria(criteria); + + if (isFallbackService()) { + if (result == null) { + result = fallbackProxy.findIdByCriteria(criteria); + } else { + // merge list + List<String> resultFallback = fallbackProxy + .findIdByCriteria(criteria); + // this allow to element from main to prevail + resultFallback.removeAll(result); + result.addAll(resultFallback); + } + } + + return result; + + + } public String findIdByCriteria(Criteria criteria) { - return mainProxy.findIdByCriteria(criteria); + + String result = mainProxy.findIdByCriteria(criteria); + + if (isFallbackService() && result == null) { + result = fallbackProxy.findIdByCriteria(criteria); + } + + return result; } public String[] findIdByCriteria(Criteria c1, Criteria c2, Criteria... otherCriteria) { - return mainProxy.findIdByCriteria(c1, c2, otherCriteria); + + + String[] result = mainProxy.findIdByCriteria(c1, c2, otherCriteria); + + if (isFallbackService()) { + if (result == null) { + result = fallbackProxy.findIdByCriteria(c1, c2, otherCriteria); + } else { + // merge list + List<String> resultFallback = new ArrayList<String>(); + CollectionUtil.addAll(resultFallback, + fallbackProxy.findIdByCriteria(c1, c2, otherCriteria)); + + List<String> resultMain = new ArrayList<String>(); + CollectionUtil.addAll(resultMain, result); + + // this allow to element from main to prevail + resultFallback.removeAll(resultMain); + resultMain.addAll(resultFallback); + + result = (String[]) resultMain.toArray(); + } + } + + return result; } public <E extends BusinessEntity> List<E> findByCriteria(Class<E> clazz, List<Criteria> criterias) { - return mainProxy.findByCriteria(clazz, criterias); + + + List<E> result = mainProxy.findByCriteria(clazz, criterias); + + if (isFallbackService()) { + if (result == null) { + result = fallbackProxy.findByCriteria(clazz, criterias); + } else { + // merge list + List<E> resultFallback = fallbackProxy + .findByCriteria(clazz, criterias); + // this allow to element from main to prevail + resultFallback.removeAll(result); + result.addAll(resultFallback); + } + } + + return result; } public <E extends BusinessEntity> E findByCriteria(Class<E> clazz, Criteria criteria) { - return mainProxy.findByCriteria(clazz, criteria); + + E result = mainProxy.findByCriteria(clazz, criteria); + + if (isFallbackService() && result == null) { + result = fallbackProxy.findByCriteria(clazz, criteria); + } + + return result; } public <E extends BusinessEntity> E[] findByCriteria(Class<E> clazz, Criteria c1, Criteria c2, Criteria... otherCriteria) { - return mainProxy.findByCriteria(clazz, c1, c2, otherCriteria); + + E[] result = mainProxy.findByCriteria(clazz, c1, c2, otherCriteria); + + if (isFallbackService()) { + if (result == null) { + result = fallbackProxy.findByCriteria(clazz, c1, c2, + otherCriteria); + } else { + // merge list + List<E> resultFallback = new ArrayList<E>(); + CollectionUtil.addAll(resultFallback, fallbackProxy + .findByCriteria(clazz, c1, c2, otherCriteria)); + + List<E> resultMain = new ArrayList<E>(); + CollectionUtil.addAll(resultMain, result); + + // this allow to element from main to prevail + resultFallback.removeAll(resultMain); + resultMain.addAll(resultFallback); + + result = (E[]) resultMain.toArray(); + } + } + + return result; } public List<Wikitty> findByCriteria(List<Criteria> criteria) { - return mainProxy.findByCriteria(criteria); + + List<Wikitty> result = mainProxy.findByCriteria(criteria); + + if (isFallbackService()) { + if (result == null) { + result = fallbackProxy.findByCriteria(criteria); + } else { + // merge list + List<Wikitty> resultFallback = fallbackProxy + .findByCriteria(criteria); + // this allow to element from main to prevail + resultFallback.removeAll(result); + result.addAll(resultFallback); + } + } + + return result; } public Wikitty findByCriteria(Criteria criteria) { - return mainProxy.findByCriteria(criteria); + + Wikitty result = mainProxy.findByCriteria(criteria); + + if (isFallbackService() && result == null) { + result = fallbackProxy.findByCriteria(criteria); + } + + return result; } public Wikitty[] findByCriteria(Criteria c1, Criteria c2, Criteria... otherCriteria) { - - - - - return mainProxy.findByCriteria(c1, c2, otherCriteria); + + Wikitty[] result = mainProxy.findByCriteria(c1, c2, otherCriteria); + + if (isFallbackService()) { + if (result == null) { + result = fallbackProxy.findByCriteria(c1, c2, otherCriteria); + } else { + // merge list + List<Wikitty> resultFallback = new ArrayList<Wikitty>(); + CollectionUtil.addAll(resultFallback, + fallbackProxy.findByCriteria(c1, c2, otherCriteria)); + + List<Wikitty> resultMain = new ArrayList<Wikitty>(); + CollectionUtil.addAll(resultMain, result); + + // this allow to element from main to prevail + resultFallback.removeAll(resultMain); + resultMain.addAll(resultFallback); + + result = (Wikitty[]) resultMain.toArray(); + } + } + + return result; } public TreeNodeResult<Wikitty> findTreeNode(String wikittyId, int depth, boolean count, Criteria filter) { - TreeNodeResult<Wikitty> result = mainProxy.findTreeNode(wikittyId, depth, count, filter); - + TreeNodeResult<Wikitty> result = mainProxy.findTreeNode(wikittyId, + depth, count, filter); + if (isFallbackService() && result == null) { - result = fallbackProxy.findTreeNode(wikittyId, depth, count, filter); + result = fallbackProxy + .findTreeNode(wikittyId, depth, count, filter); } - - + return result; } @@ -499,7 +739,13 @@ result.addAll(mainProxy.getAllExtensionIds()); if (isFallbackService()) { - result.addAll(fallbackProxy.getAllExtensionIds()); + + List<String> temp = fallbackProxy.getAllExtensionIds(); + + // assert that not have duplicate entry + result.removeAll(temp); + result.addAll(temp); + } return result; @@ -510,7 +756,12 @@ result.addAll(mainProxy.getAllExtensionsRequires(extensionName)); if (isFallbackService()) { - result.addAll(fallbackProxy.getAllExtensionsRequires(extensionName)); + List<String> temp = fallbackProxy + .getAllExtensionsRequires(extensionName); + + // assert that not have duplicate entry + result.removeAll(temp); + result.addAll(temp); } return result;

1 0

r892 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 16 May '11

16 May '11

Author: mfortun Date: 2011-05-16 12:00:20 +0200 (Mon, 16 May 2011) New Revision: 892 Url: http://nuiton.org/repositories/revision/wikitty/892 Log: * continue multicontext implementation 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 09:24:13 UTC (rev 891) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-16 10:00:20 UTC (rev 892) @@ -1,5 +1,6 @@ package org.nuiton.wikitty.publication; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; @@ -33,9 +34,8 @@ public static String WIKITTY_SERVICE_FALLBACK_URL_KEY; /* - * TODO mfortun-2011-05-13 multicontext the begginning, - * need to think about how invoke method in the different proxy - * properly. + * TODO mfortun-2011-05-13 multicontext the begginning, need to think about + * how invoke method in the different proxy properly. */ /** @@ -119,14 +119,14 @@ public void login(String login, String password) { mainProxy.login(login, password); - if ( isFallbackService()) { + if (isFallbackService()) { fallbackProxy.login(login, password); } } public void logout() { mainProxy.logout(); - if ( isFallbackService()) { + if (isFallbackService()) { fallbackProxy.logout(); } } @@ -137,7 +137,7 @@ public void setSecurityToken(String securityToken) { mainProxy.setSecurityToken(securityToken); - if ( isFallbackService()) { + if (isFallbackService()) { fallbackProxy.setSecurityToken(securityToken); } } @@ -171,7 +171,7 @@ // TODO mfortun-2011-05-13 store in wich one ? // check before if wikitty exist on fall back // and the stock on it if exist and store after on main - + return mainProxy.store(w); } @@ -198,39 +198,46 @@ public Wikitty restore(String id) { Wikitty result = mainProxy.restore(id); - - if ( isFallbackService() && result == null) { + + if (isFallbackService() && result == null) { result = fallbackProxy.restore(id); } - + return result; } public <E extends BusinessEntity> E restore(Class<E> clazz, String id) { E result = mainProxy.restore(clazz, id); - - if ( isFallbackService() && result == null) { + + if (isFallbackService() && result == null) { result = fallbackProxy.restore(clazz, id); } - + return result; } public List<Wikitty> restore(List<String> id) { List<Wikitty> result = mainProxy.restore(id); - + // TODO mfortun-2011-05-13 need to merge the two list - if ( isFallbackService() && result == null) { - result = fallbackProxy.restore( id); + if (isFallbackService() && result == null) { + result = fallbackProxy.restore(id); } - + return result; - + } public <E extends BusinessEntity> List<E> restore(Class<E> clazz, List<String> id, boolean checkExtension) { - return mainProxy.restore(clazz, id, checkExtension); + + List<E> result = mainProxy.restore(clazz, id, checkExtension); + + if (isFallbackService() && result == null) { + result = fallbackProxy.restore(clazz, id, checkExtension); + } + + return result; } public <E extends BusinessEntity> List<E> restore(Class<E> clazz, @@ -240,18 +247,34 @@ public void delete(String id) { mainProxy.delete(id); + if (isFallbackService()){ + fallbackProxy.delete(id); + } + } public <E extends BusinessEntity> void delete(E object) { mainProxy.delete(object); + if (isFallbackService()){ + fallbackProxy.delete(object); + } + } public void delete(Collection<String> ids) { mainProxy.delete(ids); + if (isFallbackService()){ + fallbackProxy.delete(ids); + } + } public <E extends BusinessEntity> void delete(List<E> objets) { mainProxy.delete(objets); + if (isFallbackService()){ + fallbackProxy.delete(objets); + } + } public <E extends BusinessEntityImpl> PagedResult<E> findAllByExample(E e, @@ -342,84 +365,203 @@ public Wikitty[] findByCriteria(Criteria c1, Criteria c2, Criteria... otherCriteria) { + + + + return mainProxy.findByCriteria(c1, c2, otherCriteria); } public TreeNodeResult<Wikitty> findTreeNode(String wikittyId, int depth, boolean count, Criteria filter) { - return mainProxy.findTreeNode(wikittyId, depth, count, filter); + TreeNodeResult<Wikitty> result = mainProxy.findTreeNode(wikittyId, depth, count, filter); + + if (isFallbackService() && result == null) { + result = fallbackProxy.findTreeNode(wikittyId, depth, count, filter); + } + + + return result; } public TreeNodeResult<String> findAllIdTreeNode(String wikittyId, int depth, boolean count, Criteria filter) { - return mainProxy.findAllIdTreeNode(wikittyId, depth, count, filter); + TreeNodeResult<String> result = mainProxy.findAllIdTreeNode(wikittyId, + depth, count, filter); + + if (isFallbackService() && result == null) { + result = fallbackProxy.findAllIdTreeNode(wikittyId, depth, count, + filter); + } + + return result; } public WikittyEvent deleteTree(String treeNodeId) { - return mainProxy.deleteTree(treeNodeId); + + WikittyEvent result = mainProxy.deleteTree(treeNodeId); + + if (isFallbackService()) { + result.add(fallbackProxy.deleteTree(treeNodeId)); + result.setSource(this); + } + + return result; } public Wikitty restoreVersion(String wikittyId, String version) { - return mainProxy.restoreVersion(wikittyId, version); + + Wikitty result = mainProxy.restoreVersion(wikittyId, version); + + if (isFallbackService() && result == null) { + result = fallbackProxy.restoreVersion(wikittyId, version); + } + + return result; } public <E extends BusinessEntity> boolean hasType(Class<E> clazz, String wikittyId) { - return mainProxy.hasType(clazz, wikittyId); + boolean result = mainProxy.hasType(clazz, wikittyId); + + if (isFallbackService()) { + result = result || fallbackProxy.hasType(clazz, wikittyId); + } + + return result; } public WikittyEvent storeExtension(WikittyExtension ext) { - return mainProxy.storeExtension(ext); + + WikittyEvent result = mainProxy.storeExtension(ext); + + if (isFallbackService()) { + result.add(fallbackProxy.storeExtension(ext)); + result.setSource(this); + } + + return result; + } public WikittyEvent storeExtension(Collection<WikittyExtension> exts) { - return mainProxy.storeExtension(exts); + + WikittyEvent result = mainProxy.storeExtension(exts); + + if (isFallbackService()) { + result.add(fallbackProxy.storeExtension(exts)); + result.setSource(this); + } + + return result; } public WikittyExtension restoreExtension(String extensionId) { - return mainProxy.restoreExtension(extensionId); + WikittyExtension result = mainProxy.restoreExtension(extensionId); + + if (isFallbackService() && result == null) { + result = fallbackProxy.restoreExtension(extensionId); + } + + return result; } public WikittyExtension restoreExtensionLastVersion(String extensionName) { - return mainProxy.restoreExtensionLastVersion(extensionName); + WikittyExtension result = mainProxy + .restoreExtensionLastVersion(extensionName); + + if (isFallbackService() && result == null) { + result = fallbackProxy.restoreExtensionLastVersion(extensionName); + } + + return result; } public void deleteExtension(String extName) { mainProxy.deleteExtension(extName); + if (isFallbackService()) { + fallbackProxy.deleteExtension(extName); + } + } public void deleteExtension(Collection<String> extNames) { + mainProxy.deleteExtension(extNames); + if (isFallbackService()) { + fallbackProxy.deleteExtension(extNames); + } } public List<String> getAllExtensionIds() { - return mainProxy.getAllExtensionIds(); + + List<String> result = new ArrayList<String>(); + result.addAll(mainProxy.getAllExtensionIds()); + + if (isFallbackService()) { + result.addAll(fallbackProxy.getAllExtensionIds()); + } + + return result; } public List<String> getAllExtensionsRequires(String extensionName) { - return mainProxy.getAllExtensionsRequires(extensionName); + List<String> result = new ArrayList<String>(); + result.addAll(mainProxy.getAllExtensionsRequires(extensionName)); + + if (isFallbackService()) { + result.addAll(fallbackProxy.getAllExtensionsRequires(extensionName)); + } + + return result; } public WikittyEvent clear() { - return mainProxy.clear(); + WikittyEvent result = mainProxy.clear(); + + // merge wikitty event + if (isFallbackService()) { + WikittyEvent tempEvent = fallbackProxy.clear(); + + result.add(tempEvent); + result.setSource(this); + } + + return result; } public void syncSearchEngine() { mainProxy.syncSearchEngine(); + if (isFallbackService()) { + fallbackProxy.syncSearchEngine(); + } } public Wikitty getWikitty(BusinessEntity entity) { - return mainProxy.getWikitty(entity); + Wikitty result = mainProxy.getWikitty(entity); + + if (isFallbackService() && result == null) { + result = fallbackProxy.getWikitty(entity); + } + + return result; } public boolean isMember(String groupName) { - return mainProxy.isMember(groupName); + boolean result = mainProxy.isMember(groupName); + if (isFallbackService()) { + result = result || fallbackProxy.isMember(groupName); + } + + return result; + } public WikittyUser getLoggedInUser() { - return mainProxy.getLoggedInUser(); + WikittyUser result = mainProxy.getLoggedInUser(); + + // TODO mfortun-2011-05-16 how to merge wikitty user ? + return result; } - - }

1 0