Author: glandais Date: 2008-03-20 16:40:26 +0000 (Thu, 20 Mar 2008) New Revision: 1426 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java Log: Format Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-03-20 16:40:12 UTC (rev 1425) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-03-20 16:40:26 UTC (rev 1426) @@ -24,10 +24,12 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; import fr.cemagref.simexplorer.is.exceptions.SimExplorerTechnicalException; +/** + * The Class StorageServiceHelper. + */ public class StorageServiceHelper { /** @@ -45,67 +47,64 @@ */ public static MetaData exportElementTo(String token, StorageService fromService, StorageService toService, String uuid, String version) throws SimExplorerException { - + String currentUuid = uuid; String currentVersion = version; - + boolean sameElements; // Remote element LoggableElement toElement; - - do { + do { // Extract element from source service LoggableElement fromElement = fromService.getLoggableElement(token, currentUuid, currentVersion); InputStream fromElementStream = fromService.retrieveElementFull(token, currentUuid, currentVersion); // Store element in remote service try { if (fromElementStream instanceof SerializableInputStream) { - toElement = toService.saveElement(token, - (SerializableInputStream) fromElementStream); + toElement = toService.saveElement(token, (SerializableInputStream) fromElementStream); } else { - toElement = toService.saveElement(token, - new SerializableInputStream(fromElementStream)); + toElement = toService.saveElement(token, new SerializableInputStream(fromElementStream)); } } catch (IOException e) { throw new SimExplorerTechnicalException(e); } - + // Check if remote element is equal to local element sameElements = fromElement.equals(toElement); - + // If not - if (!sameElements) { + if (!sameElements) { // Resave localy remote element - + // Get new remote element - InputStream toElementStream = toService.retrieveElementFull( - token, toElement.getMetaData().getUuid(), toElement - .getMetaData().getVersion().toString()); - + InputStream toElementStream = toService.retrieveElementFull(token, toElement.getMetaData().getUuid(), + toElement.getMetaData().getVersion().toString()); + // Save new remote element try { if (toElementStream instanceof SerializableInputStream) { - fromElement = fromService.saveElement(token, - (SerializableInputStream) toElementStream); + fromElement = fromService.saveElement(token, (SerializableInputStream) toElementStream); } else { - fromElement = fromService.saveElement(token, - new SerializableInputStream(toElementStream)); + fromElement = fromService.saveElement(token, new SerializableInputStream(toElementStream)); } } catch (IOException e) { throw new SimExplorerTechnicalException(e); } - + currentUuid = fromElement.getMetaData().getUuid(); currentVersion = fromElement.getMetaData().getVersion().toString(); } - - } while (!sameElements); + } while (!sameElements); + return toElement.getMetaData(); } + /** + * Instantiates a new storage service helper. + */ protected StorageServiceHelper() { // not instanciable }