Author: echatellier Date: 2010-09-21 12:21:04 +0200 (Tue, 21 Sep 2010) New Revision: 327 Url: http://nuiton.org/repositories/revision/wikitty/327 Log: Add new WikittyObseleteException when trying to save obselete wikitty Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java Modified: 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-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java 2010-09-21 10:21:04 UTC (rev 327) @@ -0,0 +1,23 @@ +package org.nuiton.wikitty; + +/** + * Wikitty exception. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyObseleteException extends WikittyException { + + private static final long serialVersionUID = 1L; + + public WikittyObseleteException(String message) { + super(message); + } + + public WikittyObseleteException(String message, Throwable cause) { + super(message, cause); + } +} Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObseleteException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL 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-21 10:17:20 UTC (rev 326) +++ trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java 2010-09-21 10:21:04 UTC (rev 327) @@ -17,11 +17,15 @@ package org.nuiton.wikitty.hbase; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.client.ResultScanner; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.F_ADMIN; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.F_DATA; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.NULL; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.Q_DELETE_DATE; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.Q_EXTENSION; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.Q_ID; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.Q_VERSION; +import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.T_WIKITTY; -import static org.nuiton.wikitty.hbase.WikittyHBaseUtil.*; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -30,12 +34,15 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.util.Bytes; import org.nuiton.wikitty.FieldType; @@ -45,6 +52,7 @@ import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; import org.nuiton.wikitty.WikittyImpl; +import org.nuiton.wikitty.WikittyObseleteException; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; @@ -113,7 +121,7 @@ } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer newVersion = requestedVersion; } else { //requested version is obsolete - throw new WikittyException(String.format( + throw new WikittyObseleteException(String.format( "Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikitty.getId(), requestedVersion, actualVersion)); } } 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-21 10:17:20 UTC (rev 326) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-21 10:21:04 UTC (rev 327) @@ -74,6 +74,7 @@ import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; import org.nuiton.wikitty.WikittyImpl; +import org.nuiton.wikitty.WikittyObseleteException; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; @@ -198,7 +199,7 @@ } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer newVersion = requestedVersion; } else { //requested version is obsolete - throw new WikittyException(String.format( + throw new WikittyObseleteException(String.format( "Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikitty.getId(), requestedVersion, actualVersion)); } } 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-21 10:17:20 UTC (rev 326) +++ trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java 2010-09-21 10:21:04 UTC (rev 327) @@ -21,6 +21,12 @@ import java.util.Date; import java.util.Iterator; import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.PersistenceUnit; +import javax.persistence.Query; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.FieldType; @@ -29,14 +35,10 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyObseleteException; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; - -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnit; -import javax.persistence.Query; import org.springframework.beans.factory.annotation.Autowired; /** @@ -99,7 +101,7 @@ } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer newVersion = requestedVersion; } else { //requested version is obsolete - throw new WikittyException(String.format( + throw new WikittyObseleteException(String.format( "Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikittyId, requestedVersion, actualVersion)); } }