Author: tchemit Date: 2008-02-02 10:18:36 +0000 (Sat, 02 Feb 2008) New Revision: 568 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: implantation getVersions Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-01 16:26:09 UTC (rev 567) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/ElementGenerator.java 2008-02-02 10:18:36 UTC (rev 568) @@ -223,7 +223,8 @@ for (int i = 0; i < wordcount; i++) { sb.append(randomstrings[r.nextInt(cs)]).append(" "); } - InputStream is = new ByteArrayInputStream(sb.toString().getBytes()); + InputStream is; + is = new ByteArrayInputStream(sb.toString().getBytes()); return is; } } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-01 16:26:09 UTC (rev 567) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-02 10:18:36 UTC (rev 568) @@ -18,19 +18,18 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +import com.healthmarketscience.rmiio.RemoteInputStream; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; + import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; -import com.healthmarketscience.rmiio.RemoteInputStream; - -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; - /** @author tony */ public class MockStorageServiceImpl implements StorageService { @@ -40,6 +39,7 @@ protected List<String> mockDataIndex; + protected MetaDataGenerator metaGenerator; protected ElementGenerator generator; public SortedMap<String, MetaData> mockData() { @@ -95,12 +95,12 @@ public int findFullTextCount(String token, String query, boolean onlyLatest) throws SimExplorerServiceException { //TODO Changer - return findApplicationsCount(token,onlyLatest); + return findApplicationsCount(token, onlyLatest); } public MetaData[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws SimExplorerServiceException { //TODO Changer - return findApplications(token,onlyLatest,indexStart,count,dateOrder); + return findApplications(token, onlyLatest, indexStart, count, dateOrder); } public int findApplicationsCount(String token, boolean onlyLatest) throws SimExplorerServiceException { @@ -134,12 +134,11 @@ } public MetaData[] getVersions(String token, String uuid) throws SimExplorerServiceException { - //TODO - return new MetaData[0]; + return getMetaGenerator().generateVersionnedMetaDataEntity(); } public String loginUser(String login, String password) throws SimExplorerServiceException { - if (login==null) { + if (login == null) { throw new SimExplorerServiceException(new NullPointerException("login can not be null")); } return "password"; @@ -152,14 +151,21 @@ return generator; } + public MetaDataGenerator getMetaGenerator() { + if (metaGenerator == null) { + metaGenerator = new MetaDataGenerator(); + } + return metaGenerator; + } + public void deleteElement(String token, String uuid, String version) { // TODO Auto-generated method stub - + } public void deleteElement(String token, String uuid) { // TODO Auto-generated method stub - + } }