Author: bleny Date: 2013-11-22 17:13:38 +0100 (Fri, 22 Nov 2013) New Revision: 2877 Url: http://nuiton.org/projects/topia/repository/revisions/2877 Log: fixes TODO by adding throws TopiaNoResultException to findByTopiaId Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-11-22 14:24:00 UTC (rev 2876) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/AbstractTopiaDao.java 2013-11-22 16:13:38 UTC (rev 2877) @@ -627,9 +627,9 @@ } @Override - public E findByTopiaId(String id) { + public E findByTopiaId(String topiaId) throws TopiaNoResultException { // AThimel 30/10/13 Not using findUnique to avoid querying several elements (cf. findUnique implementation) - E result = forTopiaIdEquals(id).findAny(); + E result = forTopiaIdEquals(topiaId).findAny(); return result; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2013-11-22 14:24:00 UTC (rev 2876) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2013-11-22 16:13:38 UTC (rev 2877) @@ -24,13 +24,13 @@ * #L% */ -import java.util.List; -import java.util.Map; - +import com.google.common.base.Optional; +import org.nuiton.topia.TopiaNoResultException; import org.nuiton.topia.event.TopiaEntityListener; import org.nuiton.topia.event.TopiaEntityVetoable; -import com.google.common.base.Optional; +import java.util.List; +import java.util.Map; /** * This contract represents the common operation any DAO should @@ -209,12 +209,15 @@ * * @param topiaId the identifier of the entity to look for * @return The entity found - * @throws SomeException when not result is found // TODO AThimel 30/10/13 Find the right exception + * @throws TopiaNoResultException if result is found, if you + * do not want an exception to be raised, use + * {@link #tryFindByTopiaId(String)} */ - E findByTopiaId(String topiaId); + E findByTopiaId(String topiaId) throws TopiaNoResultException; /** - * Tries to find the entity with the given topiaId. If not found, the result.isPresent() will be <code>false</code>. + * Tries to find the entity with the given topiaId. + * If not found, the result.isPresent() will be <code>false</code>. * * @param topiaId the identifier of the entity to look for * @return The entity found wrapped by an Optional