Author: athimel Date: 2013-11-28 01:43:28 +0100 (Thu, 28 Nov 2013) New Revision: 2900 Url: http://nuiton.org/projects/topia/repository/revisions/2900 Log: fixes #2923 Fix the latests impacts of deprecated code removal Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaSqlSupport.java trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-11-27 18:18:10 UTC (rev 2899) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaApplicationContext.java 2013-11-28 00:43:28 UTC (rev 2900) @@ -119,7 +119,7 @@ persistenceContexts.add(persistenceContext); } - // TODO AThimel 25/11/13 I don't like it to be public, but necessary for services. Review it + // FIXME AThimel 25/11/13 I don't like it to be public, but necessary for services. Review it public HibernateProvider getHibernateProvider() { if (hibernateProvider == null) { hibernateProvider = new HibernateProvider(configuration, topiaServiceSupport, sessionRegistry); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-11-27 18:18:10 UTC (rev 2899) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/AbstractTopiaPersistenceContext.java 2013-11-28 00:43:28 UTC (rev 2900) @@ -131,6 +131,28 @@ this.sqlSupport = new HibernateTopiaSqlSupport(hibernateSupport); } + protected TopiaFiresSupport getFiresSupport() { + return firesSupport; + } + + public TopiaHibernateSupport getHibernateSupport() { + return hibernateSupport; + } + + public TopiaSqlSupport getSqlSupport() { + return sqlSupport; + } + + @Override + public TopiaIdFactory getTopiaIdFactory() { + return topiaIdFactory; + } + + @Override + public TopiaFiresSupport getTopiaFiresSupport() { + return firesSupport; + } + /** * This subclass of TopiaHibernateSupport is made to be used only internally within this persistence context. This * class only acts as an information container (as a structure does). @@ -215,14 +237,6 @@ } } - protected TopiaFiresSupport getFiresSupport() { - return firesSupport; - } - - public TopiaHibernateSupport getHibernateSupport() { - return hibernateSupport; - } - @Override public <E extends TopiaEntity> E findByTopiaId(String topiaId) { checkClosed(); @@ -245,16 +259,6 @@ } @Override - public TopiaIdFactory getTopiaIdFactory() { - return topiaIdFactory; - } - - @Override - public TopiaFiresSupport getTopiaFiresSupport() { - return firesSupport; - } - - @Override public <E extends TopiaEntity> TopiaDao<E> getDao(Class<E> entityClass) { Preconditions.checkArgument(entityClass != null, "The method 'getDao' requires a non null 'entityClass' parameter"); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaSqlSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaSqlSupport.java 2013-11-27 18:18:10 UTC (rev 2899) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/HibernateTopiaSqlSupport.java 2013-11-28 00:43:28 UTC (rev 2900) @@ -45,10 +45,11 @@ this.hibernateSupport = hibernateSupport; } - public static class SQLWork implements Work { - private final String script; + public static class HibernateSqlWork implements Work { - public SQLWork(String script) { + protected final String script; + + public HibernateSqlWork(String script) { this.script = script; } @@ -63,12 +64,11 @@ } } - // FIXME AThimel 22/11/2013 WTF name ? - public static class TopiaSQLWorkWork implements Work { + public static class HibernateTopiaSqlWork implements Work { - final TopiaSqlWork work; + protected final TopiaSqlWork work; - public TopiaSQLWorkWork(TopiaSqlWork work) { + public HibernateTopiaSqlWork(TopiaSqlWork work) { this.work = work; } @@ -78,15 +78,15 @@ } } - public static class TopiaSqlQueryWork<O> implements Work { + public static class HibernateTopiaSqlQueryWork<O> implements Work { - final TopiaSqlQuery<O> query; + protected final TopiaSqlQuery<O> query; - final boolean multipleResult; + protected final boolean multipleResult; - final List<O> result = new ArrayList<O>(); + protected final List<O> result = new ArrayList<O>(); - public TopiaSqlQueryWork(TopiaSqlQuery<O> query, boolean multipleResult) { + public HibernateTopiaSqlQueryWork(TopiaSqlQuery<O> query, boolean multipleResult) { this.query = query; this.multipleResult = multipleResult; } @@ -129,7 +129,7 @@ @Override public void executeSql(String sqlScript) { - SQLWork work = new SQLWork(sqlScript); + HibernateSqlWork work = new HibernateSqlWork(sqlScript); try { hibernateSupport.getHibernateSession().doWork(work); } catch (HibernateException e) { @@ -139,7 +139,7 @@ @Override public void doSqlWork(TopiaSqlWork sqlWork) { - TopiaSQLWorkWork work = new TopiaSQLWorkWork(sqlWork); + HibernateTopiaSqlWork work = new HibernateTopiaSqlWork(sqlWork); try { hibernateSupport.getHibernateSession().doWork(work); } catch (HibernateException e) { @@ -150,7 +150,7 @@ @Override public <O> O findSingleResult(final TopiaSqlQuery<O> query) throws TopiaException { - TopiaSqlQueryWork<O> work = new TopiaSqlQueryWork<O>(query, false); + HibernateTopiaSqlQueryWork<O> work = new HibernateTopiaSqlQueryWork<O>(query, false); hibernateSupport.getHibernateSession().doWork(work); final List<O> result = work.getResult(); return result.isEmpty() ? null : result.get(0); @@ -159,7 +159,7 @@ @Override public <O> List<O> findMultipleResult(final TopiaSqlQuery<O> query) throws TopiaException { - TopiaSqlQueryWork<O> work = new TopiaSqlQueryWork<O>(query, true); + HibernateTopiaSqlQueryWork<O> work = new HibernateTopiaSqlQueryWork<O>(query, true); hibernateSupport.getHibernateSession().doWork(work); final List<O> result = work.getResult(); return result; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java 2013-11-27 18:18:10 UTC (rev 2899) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java 2013-11-28 00:43:28 UTC (rev 2900) @@ -33,10 +33,8 @@ * @author poussin <poussin@codelutin.com> * @version $Id$ */ -// TODO AThimel 03/08/13 Extends TopiaException ? -public class TopiaVetoException extends RuntimeException { +public class TopiaVetoException extends TopiaException { - /** Version UID */ private static final long serialVersionUID = 6809613247516488399L; /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java 2013-11-27 18:18:10 UTC (rev 2899) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java 2013-11-28 00:43:28 UTC (rev 2900) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.exception.SQLGrammarException; import org.nuiton.topia.AbstractTopiaApplicationContext; +import org.nuiton.topia.AbstractTopiaPersistenceContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaPersistenceContext; import org.nuiton.topia.TopiaSqlQuery; @@ -122,7 +123,7 @@ } String firstSequenceKey = sequences.keySet().iterator().next(); TopiaPersistenceContext newContext = ctxt.newPersistenceContext(); - TopiaSqlSupport sqlSupport = null; // TODO AThimel 23/11/13 Get an instance of TopiaSqlSupprt + TopiaSqlSupport sqlSupport = ((AbstractTopiaPersistenceContext)newContext).getSqlSupport(); boolean exists = existSequence(firstSequenceKey, sqlSupport); if (!exists) {