r356 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage - Wikitty-commits

28 Sep 2010

Author: echatellier
Date: 2010-09-28 14:45:38 +0200 (Tue, 28 Sep 2010)
New Revision: 356

Url: http://nuiton.org/repositories/revision/wikitty/356

Log:
Rename disableAutoVersionIncrement parameter to force.

Modified:
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java
   trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java
   trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java
   trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyJMSUtil.java
   trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageJMS.java
   trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageSubscriberJMS.java
   trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java
   trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyStorageAdapter.java
   trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java
   trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java
===================================================================

--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -178,12 +178,12 @@
      *
      * @param securityToken security token
      * @param wikitties list of wikitty to be persisted
-     * @param disableAutoVersionIncrement boolean to disable version increment
-     *         on saved wikitty
+     * @param force boolean force non version version increment on saved wikitty
+     *              or force version on wikitty creation (version 0.0)
      * @return update response
      */
     public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties,
-            boolean disableAutoVersionIncrement);
+            boolean force);
 
 
     /**
@@ -193,12 +193,12 @@
      * @param securityToken security token
      * @param transaction transaction used to do the action (must not be null)
      * @param wikitties list of wikitty to be persisted
-     * @param disableAutoVersionIncrement boolean to disable version increment
-     *         on saved wikitty
+     * @param force boolean force non version version increment on saved wikitty
+     *              or force version on wikitty creation (version 0.0)
      * @return update response
      */
     public UpdateResponse store(String securityToken, WikittyTransaction transaction,
-            Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement);
+            Collection<Wikitty> wikitties, boolean force);
 
     /**
      * Return all extension id (ex: "extName[version])").

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -576,13 +576,14 @@
      * Overriden to put wikitty in cache
      *
      * @param wikitties
-     * @param disableAutoVersionIncrement
+     * @param force boolean force non version version increment on saved wikitty
+     *              or force version on wikitty creation (version 0.0)
      * @return
      */
     @Override
     public UpdateResponse store(String securityToken,
-            Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
-        UpdateResponse result = ws.store(securityToken, wikitties, disableAutoVersionIncrement);
+            Collection<Wikitty> wikitties, boolean force) {
+        UpdateResponse result = ws.store(securityToken, wikitties, force);
 
         for (Wikitty w : wikitties) {
             result.update(w);
@@ -596,14 +597,15 @@
      * Overriden to put wikitty in cache
      *
      * @param wikitties
-     * @param disableAutoVersionIncrement
+     * @param force boolean force non version version increment on saved wikitty
+     *              or force version on wikitty creation (version 0.0)
      * @return
      */
     @Override
     public UpdateResponse store(String securityToken, WikittyTransaction transaction,
-            Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+            Collection<Wikitty> wikitties, boolean force) {
         UpdateResponse result = ws.store(securityToken, transaction,
-                wikitties, disableAutoVersionIncrement);
+                wikitties, force);
 
         for (Wikitty w : wikitties) {
             result.update(w);

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -107,17 +107,15 @@
 
     @Override
     public UpdateResponse store(String securityToken,
-            Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
-        return delegate.store(securityToken, wikitties,
-                disableAutoVersionIncrement);
+            Collection<Wikitty> wikitties, boolean force) {
+        return delegate.store(securityToken, wikitties, force);
     }
 
     @Override
     public UpdateResponse store(String securityToken,
             WikittyTransaction transaction, Collection<Wikitty> wikitties,
-            boolean disableAutoVersionIncrement) {
-        return delegate.store(securityToken, transaction, wikitties,
-                disableAutoVersionIncrement);
+            boolean force) {
+        return delegate.store(securityToken, transaction, wikitties, force);
     }
 
     @Override

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -148,7 +148,7 @@
 
     @Override
     public UpdateResponse store(String securityToken, WikittyTransaction transaction,
-            Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+            Collection<Wikitty> wikitties, boolean force) {
         checkConstraint(wikitties);
 
         // update/store extension if necessary
@@ -160,7 +160,7 @@
 
         // try to commit command
         UpdateResponse extUpdate = getExtensionStorage().store(transaction, allExtensions);
-        UpdateResponse wikUpdate = getWikittyStorage().store(transaction, wikitties, disableAutoVersionIncrement);
+        UpdateResponse wikUpdate = getWikittyStorage().store(transaction, wikitties, force);
         UpdateResponse indexUpdate = getSearchEngin().store(transaction, wikitties);
 
         UpdateResponse result = new UpdateResponse();
@@ -189,6 +189,9 @@
                 
                 transaction.commit();
                 return result;
+            } catch (WikittyObsoleteException ex) {
+                transaction.rollback();
+                throw ex;
             } catch (Exception eee) {
                 transaction.rollback();
                 throw new WikittyException(eee);
@@ -214,6 +217,9 @@
 
             transaction.commit();
             return result;
+        } catch (WikittyObsoleteException ex) {
+            transaction.rollback();
+            throw ex;
         } catch (Exception eee) {
             transaction.rollback();
             throw new WikittyException(eee);
@@ -224,19 +230,24 @@
      * Store and index wikitties object.
      * 
      * @param wikitties
+     * @param force boolean force non version version increment on saved wikitty
+     *              or force version on wikitty creation (version 0.0)
      */
     @Override
     public UpdateResponse store(String securityToken,
-            Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+            Collection<Wikitty> wikitties, boolean force) {
         WikittyTransaction transaction = new WikittyTransaction();
         try {
             transaction.begin();
             
             UpdateResponse result = store(securityToken,
-                    transaction, wikitties, disableAutoVersionIncrement);
+                    transaction, wikitties, force);
 
             transaction.commit();
             return result;
+        } catch (WikittyObsoleteException ex) {
+            transaction.rollback();
+            throw ex;
         } catch (Exception eee) {
             transaction.rollback();
             throw new WikittyException(eee);

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -221,9 +221,9 @@
 
     @Override
     public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties,
-            boolean disableAutoVersionIncrement) {
+            boolean force) {
         UpdateResponse updateResponse = ws.store(
-                securityToken, wikitties, disableAutoVersionIncrement);
+                securityToken, wikitties, force);
         // update wikitty
         for (Wikitty wikitty : wikitties) {
             updateResponse.update(wikitty);
@@ -235,9 +235,9 @@
 
     @Override
     public UpdateResponse store(String securityToken, WikittyTransaction transaction,
-            Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+            Collection<Wikitty> wikitties, boolean force) {
         UpdateResponse updateResponse = ws.store(securityToken, transaction,
-                wikitties, disableAutoVersionIncrement);
+                wikitties, force);
         // update wikitty
         for (Wikitty wikitty : wikitties) {
             updateResponse.update(wikitty);

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -316,9 +316,9 @@
     }
     
     @Override
-    public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+    public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties, boolean force) {
         Collection<Wikitty> wikittiesToStore = removeUnauthorizedModifications(securityToken, wikitties);
-        UpdateResponse result = ws.store(securityToken, wikittiesToStore, disableAutoVersionIncrement);
+        UpdateResponse result = ws.store(securityToken, wikittiesToStore, force);
         return result;
     }
     
@@ -365,9 +365,9 @@
     }
 
     @Override
-    public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+    public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) {
         Collection<Wikitty> wikittiesToStore = removeUnauthorizedModifications(securityToken, wikitties);
-        UpdateResponse result = ws.store(securityToken, transaction, wikittiesToStore, disableAutoVersionIncrement);
+        UpdateResponse result = ws.store(securityToken, transaction, wikittiesToStore, force);
         return result;
     }
     

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -35,11 +35,12 @@
      * 
      * @param transaction transaction
      * @param wikitties wikitty collection
-     * @param disableAutoVersionIncrement
+     * @param force boolean force non version version increment on saved wikitty
+     *              or force version on wikitty creation (version 0.0)
      * 
      * @return information usefull for client side update data
      */
-    public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement);
+    public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force);
 
     /**
      * Return true if id exists in storage.

Modified: trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java
===================================================================
--- trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -86,8 +86,7 @@
 
     @Override
     public UpdateResponse store(WikittyTransaction transaction,
-            Collection<Wikitty> wikitties,
-            boolean disableAutoVersionIncrement) throws WikittyException {
+            Collection<Wikitty> wikitties, boolean force) throws WikittyException {
         try {
             UpdateResponse result = new UpdateResponse();
             List<Put> puts = new ArrayList<Put>();
@@ -105,7 +104,7 @@
 
                 // compute new version, but not change wikitty during prepare
                 String newVersion = null;
-                if (disableAutoVersionIncrement) {
+                if (force) {
                     if (actualVersion == null) { //no version in place
                         if (requestedVersion == null) { //no version requested
                             newVersion = WikittyUtil.DEFAULT_VERSION;

Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java
===================================================================
--- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -160,8 +160,7 @@
 
     @Override
     public UpdateResponse store(WikittyTransaction transaction,
-            Collection<Wikitty> wikitties,
-            boolean disableAutoVersionIncrement) throws WikittyException {
+            Collection<Wikitty> wikitties, boolean force) throws WikittyException {
         Connection connection = getConnection(conf);
         try {
             UpdateResponse result = new UpdateResponse();
@@ -183,7 +182,7 @@
                 
                 // compute new version, but not change wikitty
                 String newVersion = null;
-                if (disableAutoVersionIncrement) {
+                if (force) {
                     if (actualVersion == null) { //no version in place
                         if (requestedVersion == null) { //no version requested
                             newVersion = WikittyUtil.DEFAULT_VERSION;
@@ -208,7 +207,7 @@
                         // wikitty is not modified, do nothing
                         continue;
                     } else if (WikittyUtil.versionGreaterThan(actualVersion, requestedVersion)) {
-                        throw new WikittyException(String.format(
+                        throw new WikittyObsoleteException(String.format(
                                 "Your wikitty '%s' is obsolete", wikitty.getId()));
                     } else {
                         newVersion = WikittyUtil.incrementMajorRevision(actualVersion);

Modified: trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyJMSUtil.java
===================================================================
--- trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyJMSUtil.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyJMSUtil.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -60,8 +60,8 @@
 
     /** parameter wikitties in message with List<Wikitty>*/
     static final public String PARAM_WIKITTIES = "wikitties";
-    /** parameter disableAutoVersionIncrement in message with boolean */
-    static final public String PARAM_DISABLE_AUTO_VERSION_INCREMENT = "disableAutoVersionIncrement";
+    /** parameter forceVersion in message with boolean */
+    static final public String PARAM_FORCE_VERSION = "forceVersion";
     /** parameter ids in message with List<String> */
     static final public String PARAM_IDS = "ids";
     /** parameter action in message specifying action to perform */

Modified: trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageJMS.java
===================================================================
--- trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageJMS.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageJMS.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -21,7 +21,7 @@
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.ACTION_DELETE;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.ACTION_STORE;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.JNDI_PROVIDER_URL;
-import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_DISABLE_AUTO_VERSION_INCREMENT;
+import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_FORCE_VERSION;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_IDS;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_WIKITTIES;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.TOPIC_WIKITTY_STORAGE;
@@ -109,15 +109,17 @@
      * </ul>
      * 
      * @param transaction
-     * @param extensions
+     * @param wikitties wikitties to store
+     * @param force boolean force non version version increment on saved wikitty
+     *              or force version on wikitty creation (version 0.0)
      */
     @Override
-    public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+    public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) {
         try {
             WikittyJMSUtil.addXAResource(transaction, topicSession);
             WikittyActionMessage message = new WikittyActionMessage();
             message.setAction(ACTION_STORE);
-            message.addParameter(PARAM_DISABLE_AUTO_VERSION_INCREMENT, disableAutoVersionIncrement);
+            message.addParameter(PARAM_FORCE_VERSION, force);
             message.addParameter(PARAM_WIKITTIES, new ArrayList<Wikitty>(wikitties));
             
             ObjectMessage sendMessage = WikittyActionMessage.createSendMessage(message);

Modified: trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageSubscriberJMS.java
===================================================================
--- trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageSubscriberJMS.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageSubscriberJMS.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -21,7 +21,7 @@
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.ACTION_DELETE;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.ACTION_STORE;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.JNDI_PROVIDER_URL;
-import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_DISABLE_AUTO_VERSION_INCREMENT;
+import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_FORCE_VERSION;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_IDS;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_WIKITTIES;
 import static org.nuiton.wikitty.jms.WikittyJMSUtil.TOPIC_WIKITTY_STORAGE;
@@ -220,7 +220,7 @@
                 (ArrayList<Wikitty>) message.getParameter(PARAM_WIKITTIES);
 
         Boolean disableAutoVersionIncrement =
-                (Boolean) message.getParameter(PARAM_DISABLE_AUTO_VERSION_INCREMENT);
+                (Boolean) message.getParameter(PARAM_FORCE_VERSION);
 
         delegateStorage.store(transaction, wikitties, disableAutoVersionIncrement);
     }

Modified: trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java
===================================================================
--- trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -225,7 +225,7 @@
     WikittyStorage delegateStorage = new WikittyStorageAdapter() {
         @Override
         public UpdateResponse store(WikittyTransaction transaction,
-                Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+                Collection<Wikitty> wikitties, boolean force) {
             test_wikitties = wikitties;
             return null;
         }

Modified: trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyStorageAdapter.java
===================================================================
--- trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyStorageAdapter.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyStorageAdapter.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -22,7 +22,7 @@
      */
     @Override
     public UpdateResponse store(WikittyTransaction transaction,
-            Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+            Collection<Wikitty> wikitties, boolean force) {
         return null;
     }
 

Modified: trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java
===================================================================
--- trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -66,8 +66,7 @@
 
     @Override
     public UpdateResponse store(WikittyTransaction transaction,
-            Collection<Wikitty> wikitties,
-            boolean disableAutoVersionIncrement) throws WikittyException {
+            Collection<Wikitty> wikitties, boolean force) throws WikittyException {
         EntityManager entityManager = WikittyJPAUtil.getEntityManager(entityManagerFactory, transaction);
 
         UpdateResponse result = new UpdateResponse();
@@ -85,7 +84,7 @@
 
             // compute new version, but not change wikitty during prepare
             String newVersion = null;
-            if (disableAutoVersionIncrement) {
+            if (force) {
                 if (actualVersion == null) { //no version in place
                     if (requestedVersion == null) { //no version requested
                         newVersion = WikittyUtil.DEFAULT_VERSION;

Modified: trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java
===================================================================
--- trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java	2010-09-28 11:52:09 UTC (rev 355)
+++ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java	2010-09-28 12:45:38 UTC (rev 356)
@@ -50,15 +50,15 @@
     }
 
     @Override
-    public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) {
+    public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) {
         List<WikittyStorage> wikittyStorageMasters = configuration.getWikittyStorageMasters();
         for (WikittyStorage wikittyStorage : wikittyStorageMasters) {
-            wikittyStorage.store(transaction, wikitties, disableAutoVersionIncrement);
+            wikittyStorage.store(transaction, wikitties, force);
         }
 
         List<WikittyStorage> wikittyStorageReplications = configuration.getWikittyStorageReplications();
         for (WikittyStorage wikittyStorage : wikittyStorageReplications) {
-            wikittyStorage.store(transaction, wikitties, disableAutoVersionIncrement);
+            wikittyStorage.store(transaction, wikitties, force);
         }
 
         // nothing to put in result

    

echatellier＠users.nuiton.org

tags

participants (1)