May 2010 - Topia-commits - mailman.cloud.codelutin.com

r1975 - in trunk/topia-persistence/src: main/java/org/nuiton/topia main/java/org/nuiton/topia/framework main/java/org/nuiton/topia/persistence test/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org May 26, 2010

May 26, 2010

Author: fdesbois Date: 2010-05-26 11:59:37 +0200 (Wed, 26 May 2010) New Revision: 1975 Url: http://nuiton.org/repositories/revision/topia/1975 Log: - Evo #637 : deprecate all execute methods with no topiaContext in argument + constructor with DAO. Add method findByQuery in TopiaContext. - For subQuery, no need of flag in argument for SELECT or WHERE statement, only WHERE statement support subqueries. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2010-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -31,6 +31,7 @@ import org.nuiton.topia.event.TopiaEntityVetoable; import org.nuiton.topia.event.TopiaTransactionListener; import org.nuiton.topia.event.TopiaTransactionVetoable; +import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.persistence.TopiaEntity; @@ -174,6 +175,17 @@ TopiaEntity findByTopiaId(String topiaId) throws TopiaException; /** + * Retrieve results executing a simple {@code query}. Generally this method + * is used for complex query where output type is specific (more than one + * element in the SELECT). + * + * @param query TopiaQuery to execute + * @return a List of results as hibernate give us + * @throws TopiaException + */ + List findByQuery(TopiaQuery query) throws TopiaException; + + /** * Permet de faire une requete HQL hibernate directement sur la base. * * @param hql la requete a faire Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -920,6 +920,11 @@ return result; } + @Override + public List findByQuery(TopiaQuery query) throws TopiaException { + return query.execute(this); + } + /* * (non-Javadoc) * @see TopiaContext#find(java.lang.String, java.lang.Object[]) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -265,6 +265,11 @@ protected String mainAlias; + /** + * @deprecated since 2.4 : need calling right execute method directly from + * DAO + */ + @Deprecated protected TopiaDAO<? extends TopiaEntity> dao; /** Enum to simmplify using operation in query */ @@ -340,7 +345,10 @@ * added to the select part of the query if it is needed. * * @param dao DAO linked to the entity to threat + * @deprecated since 2.4 : instantiate the query from DAO {@link + * TopiaDAO#createQuery()} */ + @Deprecated public TopiaQuery(TopiaDAO<? extends TopiaEntity> dao) { this(); setFrom(dao.getEntityClass()); @@ -353,7 +361,10 @@ * * @param dao DAO linked to the entity to threat * @param alias of the main entity in the query + * @deprecated since 2.4 : instantiate the query from DAO {@link + * TopiaDAO#createQuery(String)} */ + @Deprecated public TopiaQuery(TopiaDAO<? extends TopiaEntity> dao, String alias) { this(); setFrom(dao.getEntityClass(), alias); @@ -402,7 +413,7 @@ /** * Add an other entity type to the from in the query. * - * @param entityClass different from the mainEntity in the DAO + * @param entityClass different from the mainEntity * @return the TopiaQuery */ public TopiaQuery addFrom(Class<? extends TopiaEntity> entityClass) { @@ -412,7 +423,7 @@ /** * Add an other entity type to the from in the query with an alias. * - * @param entityClass different from the mainEntity in the DAO + * @param entityClass different from the mainEntity * @param alias of the entity in the query * @return the TopiaQuery */ @@ -486,31 +497,23 @@ /** * Method used to add a subquery in an existing query. The params will be * automatically checked and copied from the subquery to the current one. - * This method is used to inject {@code subquery} in SELECT or WHERE parts - * of the query. The flag {@code select} is used to tell the method that the - * element will be added to the select (if false, the element will be added - * to the where). The {@code queryPart} is the element in the query to bind - * with the {@code subquery}. The ? character is used to inject the subquery + * This method is used to inject {@code subquery} in WHERE part of the query. + * The {@code queryPart} is the element in the query to bind with the {@code + * subquery}. The ? character is used to inject the subquery * into the {@code queryPart}. Ex : * <pre> - * // Add a SUM(subquery) into the SELECT of the query - * query.addSubQuery("SUM(?)", subquery, true); - * // Add a SUB_ELMT = (subquery) into the WHERE of the query + * // Add a SUB_ELMT = (subquery) into the query * query.addSubQuery("SUB_ELMT = (?)", subquery, false); * </pre> * * @param queryPart part of the query where subquery need to be injected * @param subquery existing topiaQuery as subquery - * @param select If true, the queryPart will be added to the SELECT - * statement, if false the default query statement is the - * WHERE * @return the TopiaQuery * @see TopiaQuery#getValueName(String) * @since 2.4 */ public TopiaQuery addSubQuery(String queryPart, - TopiaQuery subquery, - boolean select) { + TopiaQuery subquery) { List<Object> subqueryParams = subquery.getParams(); String subqueryString = subquery.fullQuery(); @@ -548,9 +551,6 @@ // Replace ? injection by the subquery String result = queryPart.replace("?", subqueryString); - if (select) { - return addSelect(result); - } return add(result); } @@ -973,7 +973,9 @@ * @return a List of results * @throws TopiaException for error during execution * @see #execute(TopiaContext) + * @deprecated since 2.4, need transaction, use {@link #execute(TopiaContext)} */ + @Deprecated public List execute() throws TopiaException { validateDAO(); return execute(dao.getContext()); @@ -1134,7 +1136,10 @@ * @return an Object * @throws TopiaException for error on query execution * @see #executeToObject(TopiaContext, String) + * @deprecated since 2.4, need transaction, use {@link #executeToObject(TopiaContext, + * String)} */ + @Deprecated public Object executeToObject(String select) throws TopiaException { validateDAO(); return executeToObject(dao.getContext(), select); @@ -1163,7 +1168,10 @@ * @return an Integer * @throws TopiaException for error on query execution * @see #executeToInteger(TopiaContext, String) + * @deprecated since 2.4, need transaction, use {@link #executeToInteger(TopiaContext, + * String)} */ + @Deprecated public int executeToInteger(String select) throws TopiaException { validateDAO(); return executeToInteger(dao.getContext(), select); @@ -1191,7 +1199,10 @@ * @return a String result * @throws TopiaException for error on query execution * @see #executeToString(TopiaContext, String) + * @deprecated since 2.4, need transaction, use {@link #executeToString(TopiaContext, + * String)} */ + @Deprecated public String executeToString(String select) throws TopiaException { validateDAO(); return executeToString(dao.getContext(), select); @@ -1243,6 +1254,7 @@ return executeCount(dao.getContext()); } + @Deprecated protected boolean validateDAO() throws TopiaException { if (dao == null) { throw new TopiaException( Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -455,17 +455,23 @@ @Override public TopiaQuery createQuery() { + // Need to be change by constructor with entity only, only when + // method from TopiaQuery will be removed return new TopiaQuery(this); } @Override public TopiaQuery createQuery(String entityAlias) { + // Need to be change by constructor with entity only, only when + // method from TopiaQuery will be removed return new TopiaQuery(this, entityAlias); } @Override public E findByTopiaId(String id) throws TopiaException { - return findByQuery(createQuery().add(TopiaEntity.TOPIA_ID, id)); + TopiaQuery query = createQuery().add(TopiaEntity.TOPIA_ID, id); + E result = findByQuery(query); + return result; } @Override @@ -480,26 +486,6 @@ @Override public E findByProperties(String propertyName, Object value, Object... others) throws TopiaException { -// Map<String, Object> properties = new HashMap<String, Object>(); -// properties.put(propertyName, value); -// Object name = null; -// for (int i = 0; i < others.length;) { -// try { -// name = others[i++]; -// value = others[i++]; -// properties.put((String) name, value); -// } catch (ClassCastException eee) { -// throw new IllegalArgumentException( -// "Les noms des propriétés doivent être des chaines et " + -// "non pas " + propertyName.getClass().getName(), -// eee); -// } catch (ArrayIndexOutOfBoundsException eee) { -// throw new IllegalArgumentException( -// "Le nombre d'argument n'est pas un nombre pair: " -// + (others.length + 2) -// + " La dernière propriété était: " + name, eee); -// } -// } Map<String, Object> properties = convertPropertiesArrayToMap(propertyName, value, others); E result = findByProperties(properties); @@ -509,22 +495,28 @@ @Override public E findByProperties(Map<String, Object> properties) throws TopiaException { - return findByQuery(createQuery().add(properties)); + TopiaQuery query = createQuery().add(properties); + E result = findByQuery(query); + return result; } @Override public E findByQuery(TopiaQuery query) throws TopiaException { - return query.executeToEntity(context, getEntityClass()); + E result = query.executeToEntity(context, getEntityClass()); + return result; } @Override public List<E> findAll() throws TopiaException { - return findAllByQuery(createQuery()); + List<E> results = findAllByQuery(createQuery()); + return results; } @Override public List<String> findAllIds() throws TopiaException { - return createQuery().setSelect(TopiaEntity.TOPIA_ID).execute(); + TopiaQuery query = createQuery().setSelect(TopiaEntity.TOPIA_ID); + List<String> results = context.findByQuery(query); + return results; } @Override @@ -539,26 +531,6 @@ @Override public List<E> findAllByProperties(String propertyName, Object value, Object... others) throws TopiaException { -// Map<String, Object> properties = new HashMap<String, Object>(); -// properties.put(propertyName, value); -// Object name = null; -// for (int i = 0; i < others.length;) { -// try { -// name = others[i++]; -// value = others[i++]; -// properties.put((String) name, value); -// } catch (ClassCastException eee) { -// throw new IllegalArgumentException( -// "Les noms des propriétés doivent être des chaines et " + -// "non pas " + propertyName.getClass().getName(), -// eee); -// } catch (ArrayIndexOutOfBoundsException eee) { -// throw new IllegalArgumentException( -// "Le nombre d'argument n'est pas un nombre pair: " -// + (others.length + 2) -// + " La dernière propriété était: " + name, eee); -// } -// } Map<String, Object> properties = convertPropertiesArrayToMap(propertyName, value, others); List<E> result = findAllByProperties(properties); @@ -568,33 +540,41 @@ @Override public List<E> findAllByProperties(Map<String, Object> properties) throws TopiaException { - return findAllByQuery(createQuery().add(properties)); + TopiaQuery query = createQuery().add(properties); + List<E> results = findAllByQuery(query); + return results; } @Override public List<E> findAllByQuery(TopiaQuery query) throws TopiaException { - return query.executeToEntityList(context, getEntityClass()); + List<E> results = query.executeToEntityList(context, getEntityClass()); + return results; } @Override public Map<String, E> findAllMappedByQuery(TopiaQuery query) throws TopiaException { - return query.executeToEntityMap(context, getEntityClass()); + Map<String, E> results = + query.executeToEntityMap(context, getEntityClass()); + return results; } @Override public <K> Map<K, E> findAllMappedByQuery(TopiaQuery query, String keyName, Class<K> keyClass) throws TopiaException { - return query.executeToEntityMap(context, getEntityClass(), keyName, - keyClass); + Map<K, E> results = + query.executeToEntityMap(context, getEntityClass(), + keyName, keyClass); + return results; } @Override public List<E> findAllWithOrder(String... propertyNames) throws TopiaException { TopiaQuery query = createQuery().addOrder(propertyNames); - return findAllByQuery(query); + List<E> results = findAllByQuery(query); + return results; } @Override @@ -615,7 +595,7 @@ @Override public boolean existByQuery(TopiaQuery query) throws TopiaException { - int count = query.executeCount(); + int count = countByQuery(query); boolean result = count > 0; return result; } @@ -629,17 +609,20 @@ @Override @Deprecated public long size() throws TopiaException { - return count(); + long result = count(); + return result; } @Override public int count() throws TopiaException { - return countByQuery(createQuery()); + int result = countByQuery(createQuery()); + return result; } @Override public int countByQuery(TopiaQuery query) throws TopiaException { - return query.executeCount(context); + int result = query.executeCount(context); + return result; } /** @@ -778,8 +761,10 @@ * @param properties * @return the list of entities corresponding to the request * @throws TopiaException if any pb + * @deprecated since 2.4 */ @Override + @Deprecated public List<E> findAllContainsProperties(Map<String, Collection<?>> properties) throws TopiaException { List<E> all = findAll(); @@ -833,9 +818,12 @@ return result; } + /** @deprecated since 2.4 */ @Override + @Deprecated public List<E> findAllContainsProperties(String propertyName, - Collection<?> values, Object... others) throws TopiaException { + Collection<?> values, Object... others) + throws TopiaException { Map<String, Collection<?>> properties = new HashMap<String, Collection<?>>(); properties.put(propertyName, values); Object name = null; Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -27,18 +27,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topiatest.QueriedEntity; -/** - * - * @author fdesbois - */ +/** @author fdesbois */ public class TopiaQueryTest { private static final Log log = LogFactory.getLog(TopiaQueryTest.class); @@ -52,7 +45,7 @@ query.add(QueriedEntity.TEST_ADD, value); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE testAdd = :testAdd", + "WHERE testAdd = :testAdd", query.fullQuery()); // Test with null paramValue @@ -61,7 +54,7 @@ query.add(QueriedEntity.TEST_ADD, nullValue); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE testAdd IS NULL", + "WHERE testAdd IS NULL", query.fullQuery()); // Test with two paramValues @@ -70,7 +63,7 @@ query.add(QueriedEntity.TEST_ADD, value, value2); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE testAdd IN(:testAdd1, :testAdd2)", + "WHERE testAdd IN(:testAdd1, :testAdd2)", query.fullQuery()); // Test with two paramValues + null @@ -78,14 +71,14 @@ query.add(QueriedEntity.TEST_ADD, value, value2, null); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE (testAdd IN(:testAdd1, :testAdd2) OR testAdd IS NULL)", + "WHERE (testAdd IN(:testAdd1, :testAdd2) OR testAdd IS NULL)", query.fullQuery()); } @Test public void testAddSubQuery() { - // Test 1 : Subquery in select part with two params with different values + // Test 1 : Subquery with two params with different values TopiaQuery query = new TopiaQuery(QueriedEntity.class). add(QueriedEntity.TEST_ADD, "value1"); // Exist 2 params @@ -94,14 +87,14 @@ TopiaQuery subquery = new TopiaQuery(QueriedEntity.class). add(QueriedEntity.TEST_ADD, "value2"); - query.addSubQuery("SUM(?)", subquery, true); + query.addSubQuery("Q1 = (?)", subquery); log.debug(query); // Add other params from subquery Assert.assertEquals(4, query.getParams().size()); - // Test 2 : Subquery in select part with two params with different values - // one of both is null + // Test 2 : Subquery with two params with different values + // one of them is null query = new TopiaQuery(QueriedEntity.class). add(QueriedEntity.TEST_ADD, TopiaQuery.Op.EQ, null); // Exist 0 param (null value) @@ -110,13 +103,13 @@ subquery = new TopiaQuery(QueriedEntity.class). add(QueriedEntity.TEST_ADD, "value1"); - query.addSubQuery("SUM(?)", subquery, true); + query.addSubQuery("Q1 = (?)", subquery); log.debug(query); // Add 2 params from subquery Assert.assertEquals(2, query.getParams().size()); - // Test 3 : Subquery in where part with two params with same value + // Test 3 : Subquery with two params with same value query = new TopiaQuery(QueriedEntity.class, "Q1"). add(QueriedEntity.TEST_ADD, "value1"); // Exist 2 params @@ -125,7 +118,7 @@ subquery = new TopiaQuery(QueriedEntity.class, "Q2"). add(QueriedEntity.TEST_ADD, "value1"); - query.addSubQuery("Q1 = (?)", subquery, false); + query.addSubQuery("Q1 = (?)", subquery); log.debug(query); // Still 2 params Assert.assertEquals(2, query.getParams().size());

1 0

r1974 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: framework persistence
by fdesbois＠users.nuiton.org May 26, 2010

May 26, 2010

Author: fdesbois Date: 2010-05-26 11:15:19 +0200 (Wed, 26 May 2010) New Revision: 1974 Url: http://nuiton.org/repositories/revision/topia/1974 Log: Evo #637 : add count() method in DAO, deprecate size() in TopiaDAO and executeCount() in TopiaQuery Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 09:12:03 UTC (rev 1973) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 09:15:19 UTC (rev 1974) @@ -1128,6 +1128,19 @@ } /** + * DAO must be defined to use this method. + * + * @param select part of the query redefined temporarly for execution. + * @return an Object + * @throws TopiaException for error on query execution + * @see #executeToObject(TopiaContext, String) + */ + public Object executeToObject(String select) throws TopiaException { + validateDAO(); + return executeToObject(dao.getContext(), select); + } + + /** * Execute the query and get an Integer for result. Used only for query with * aggration select which return a Long : COUNT, SUM ... The select is * overriden to get only the right value for return. @@ -1185,19 +1198,6 @@ } /** - * DAO must be defined to use this method. - * - * @param select part of the query redefined temporarly for execution. - * @return an Object - * @throws TopiaException for error on query execution - * @see #executeToObject(TopiaContext, String) - */ - public Object executeToObject(String select) throws TopiaException { - validateDAO(); - return executeToObject(dao.getContext(), select); - } - - /** * Execute a simple count on the query, i.e. the number of results get from * the query. The order is not considered to count the elements and will be * temporarly disabled. The distinct constraint will be manage if necessary @@ -1235,7 +1235,9 @@ * @return an int corresponding to the number of result in the query * @throws TopiaException for error on query execution * @see #executeCount(TopiaContext) + * @deprecated since 2.4, use {@link TopiaDAO#countByQuery(TopiaQuery)} */ + @Deprecated public int executeCount() throws TopiaException { validateDAO(); return executeCount(dao.getContext()); 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 2010-05-26 09:12:03 UTC (rev 1973) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-05-26 09:15:19 UTC (rev 1974) @@ -403,10 +403,30 @@ * * @return le nombre total d'entites existantes * @throws TopiaException if any pb while getting datas + * @deprecated since 2.4 ambiguous name, use {@link #count()} instead. */ + @Deprecated long size() throws TopiaException; /** + * Count the number of existing entities. + * + * @return number of total entities + * @throws TopiaException if any pb while getting datas + * @since 2.4 + */ + int count() throws TopiaException; + + /** + * Count the number of entities based on {@code query}. + * + * @return number of entities filtered by the query + * @throws TopiaException if any pb while getting datas + * @since 2.4 + */ + int countByQuery(TopiaQuery query) throws TopiaException; + + /** * Recherche la classe en utilisant la cle naturelle, chaque champs de la * cle naturelle est une entre de la map passe en argument. * Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-05-26 09:12:03 UTC (rev 1973) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-05-26 09:15:19 UTC (rev 1974) @@ -624,12 +624,24 @@ * Count number of existing entities using {@link TopiaQuery#executeCount(TopiaContext)} * * @return a long for the number of entities in database + * @deprecated since 2.4 ambiguous name, use {@link #count()} instead. */ @Override + @Deprecated public long size() throws TopiaException { - return createQuery().executeCount(context); + return count(); } + @Override + public int count() throws TopiaException { + return countByQuery(createQuery()); + } + + @Override + public int countByQuery(TopiaQuery query) throws TopiaException { + return query.executeCount(context); + } + /** * Convert a properties array to a proper map used to find entities in * methods {@link #findByProperties(String, Object, Object...)} and {@link

1 0

r1973 - trunk/topia-persistence/src/test/java/org/nuiton/topiatest
by fdesbois＠users.nuiton.org May 26, 2010

May 26, 2010

Author: fdesbois Date: 2010-05-26 11:12:03 +0200 (Wed, 26 May 2010) New Revision: 1973 Url: http://nuiton.org/repositories/revision/topia/1973 Log: Add missing test implementation for Evo #636 Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java 2010-05-26 09:12:03 UTC (rev 1973) @@ -0,0 +1,16 @@ +package org.nuiton.topiatest; + +import org.nuiton.topia.TopiaException; + +/** + * Created: 26 mai 2010 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ +public class ExtraDAOEntityDAOImpl<E extends ExtraDAOEntity> extends ExtraDAOEntityDAOAbstract<E> { + + @Override + public void extra() throws TopiaException { + } +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1972 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/xmi
by fdesbois＠users.nuiton.org May 26, 2010

May 26, 2010

Author: fdesbois Date: 2010-05-26 11:01:27 +0200 (Wed, 26 May 2010) New Revision: 1972 Url: http://nuiton.org/repositories/revision/topia/1972 Log: Evo #636 : Use dependency for extra operations on entity DAO Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-05-25 16:48:59 UTC (rev 1971) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-05-26 09:01:27 UTC (rev 1972) @@ -34,6 +34,9 @@ import org.nuiton.eugene.models.object.ObjectModelAssociationClass; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; @@ -78,6 +81,13 @@ Map<ObjectModelClass, Set<ObjectModelClass>> usages; + /** + * Map of extra operations for DAO. The key of the map is the qualified + * name of the entity relative to the DAO. + */ + Map<String, Collection<ObjectModelOperation>> extraOperations = + new HashMap<String, Collection<ObjectModelOperation>>(); + @Override public void transformFromModel(ObjectModel model) { @@ -85,6 +95,44 @@ } @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)) { + return; + } + + // Extra operations from <<dao>> interfacez + collectExtraOperations(interfacez); + } + + /** + * EVO #636 : Manage extra operations for DAO from "dao" dependency + * between an interface with stereotype <<dao>> (dependency client) and + * a class with stereotype <<entity>> (dependency supplier). + * + * @param interfacez The interface with <<dao>> stereotype + */ + protected void collectExtraOperations(ObjectModelInterface interfacez) { + ObjectModelDependency dependency = + interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); + + ObjectModelClassifier classifier = dependency.getSupplier(); + + if (classifier.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { + + // Only direct operations will be used. No need to have more + // operations. + Collection<ObjectModelOperation> operations = + interfacez.getOperations(); + + if (log.isDebugEnabled()) { + log.debug("add extra operations for DAO"); + } + + extraOperations.put(classifier.getQualifiedName(), operations); + } + } + + @Override public void transformFromClass(ObjectModelClass clazz) { if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { return; @@ -833,15 +881,29 @@ return false; } - public static Collection<ObjectModelOperation> getDAOOperations( + public Collection<ObjectModelOperation> getDAOOperations( ObjectModelClass clazz) { + // Note : this collection will contains extra operations for DAO. + // Overriding existing generated methods is not managed yet Collection<ObjectModelOperation> results = new ArrayList<ObjectModelOperation>(); + + // This code will be deprecated for (ObjectModelOperation op : clazz.getOperations()) { if (op.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)) { results.add(op); } } + // New method : interface dependency + Collection<ObjectModelOperation> extra = + extraOperations.get(clazz.getQualifiedName()); + + if (extra != null) { + for (ObjectModelOperation op : extra) { + results.add(op); + } + } + return results; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2010-05-25 16:48:59 UTC (rev 1971) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2010-05-26 09:01:27 UTC (rev 1972) @@ -27,8 +27,14 @@ import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; +import java.util.ArrayList; +import java.util.List; + /** * Created: 14 déc. 2009 * @@ -39,7 +45,36 @@ */ public class DAOImplTransformer extends ObjectModelTransformerToJava { + /** + * Collection used to identify entities full qualified name that have + * a dependency for DAO extra operations. So no need to generate the + * DAOImpl in this case, it will be created by the developper. + */ + List<String> noGenerationNeeded = new ArrayList<String>(); + @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)) { + return; + } + + /** + * EVO #636 : Manage extra operations for DAO from "dao" dependency + * between an interface with stereotype <<dao>> (dependency client) and + * a class with stereotype <<entity>> (dependency supplier). + */ + + ObjectModelDependency dependency = + interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); + + ObjectModelClassifier classifier = dependency.getSupplier(); + + if (classifier.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { + noGenerationNeeded.add(classifier.getQualifiedName()); + } + } + + @Override public void transformFromClass(ObjectModelClass clazz) { if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY) || hasDAOOperations(clazz)) { return; @@ -62,12 +97,17 @@ * @param clazz The ObjectModelClass with operations (Corresponding to the Entity) * @return true if the class has some dao operations, false if not */ - public static boolean hasDAOOperations(ObjectModelClass clazz) { + public boolean hasDAOOperations(ObjectModelClass clazz) { + // This code will be deprecated for (ObjectModelOperation op : clazz.getOperations()) { if (op.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)) { return true; } } + // New method : interface dependency + if (noGenerationNeeded.contains(clazz.getQualifiedName())) { + return true; + } return false; } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-05-25 16:48:59 UTC (rev 1971) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-05-26 09:01:27 UTC (rev 1972) @@ -114,6 +114,11 @@ */ public static final String STEREOTYPE_ARRAY = "array"; /** + * dependency to add extra operations for entity dao. + * @since 2.4 + */ + public static final String DEPENDENCIES_DAO = "dao"; + /** * Tag pour le type de persistence */ public static final String TAG_PERSISTENCE_TYPE = "persistenceType"; Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r1971 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework test/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org May 25, 2010

May 25, 2010

Author: fdesbois Date: 2010-05-25 18:48:59 +0200 (Tue, 25 May 2010) New Revision: 1971 Url: http://nuiton.org/repositories/revision/topia/1971 Log: Evo #634 and Ano #635 : problem with addParams method, need new method for subquery case : addSubQuery(String queryPart, TopiaQuery subquery, boolean select); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-24 12:32:28 UTC (rev 1970) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-25 16:48:59 UTC (rev 1971) @@ -26,6 +26,8 @@ package org.nuiton.topia.framework; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -481,6 +483,77 @@ return this; } + /** + * Method used to add a subquery in an existing query. The params will be + * automatically checked and copied from the subquery to the current one. + * This method is used to inject {@code subquery} in SELECT or WHERE parts + * of the query. The flag {@code select} is used to tell the method that the + * element will be added to the select (if false, the element will be added + * to the where). The {@code queryPart} is the element in the query to bind + * with the {@code subquery}. The ? character is used to inject the subquery + * into the {@code queryPart}. Ex : + * <pre> + * // Add a SUM(subquery) into the SELECT of the query + * query.addSubQuery("SUM(?)", subquery, true); + * // Add a SUB_ELMT = (subquery) into the WHERE of the query + * query.addSubQuery("SUB_ELMT = (?)", subquery, false); + * </pre> + * + * @param queryPart part of the query where subquery need to be injected + * @param subquery existing topiaQuery as subquery + * @param select If true, the queryPart will be added to the SELECT + * statement, if false the default query statement is the + * WHERE + * @return the TopiaQuery + * @see TopiaQuery#getValueName(String) + * @since 2.4 + */ + public TopiaQuery addSubQuery(String queryPart, + TopiaQuery subquery, + boolean select) { + + List<Object> subqueryParams = subquery.getParams(); + String subqueryString = subquery.fullQuery(); + + // If no params is still defined, use those from subquery. + if (CollectionUtils.isEmpty(params)) { + addParams(subqueryParams); + } else { + for (int i = 0; i < subqueryParams.size(); i += 2) { + + String paramName = (String) subqueryParams.get(i); + Object paramValue = subqueryParams.get(i + 1); + + // Check existence of paramName + int index = params.indexOf(paramName); + + // If already defined + if (index != -1) { + Object existingValue = params.get(index + 1); + + // Only change paramName in not equals case + if (!ObjectUtils.equals(existingValue, paramValue)) { + String newParamName = getValueName(paramName); + // Replace old paramName in subquery + subqueryString = + subqueryString.replace(":" + paramName, + ":" + newParamName); + + // Add the param to the current query + addParam(newParamName, paramValue); + } + } + } + } + + // Replace ? injection by the subquery + String result = queryPart.replace("?", subqueryString); + if (select) { + return addSelect(result); + } + return add(result); + } + public List<Object> getParams() { if (params == null) { params = new ArrayList<Object>(); @@ -822,6 +895,7 @@ /** * Helper method for array type. Each value will be separated by a comma. + * TODO-fdesbois-2010-05-25 : replace this algo by StringUtil.join() * * @param array of String * @return a String with values of the array separated by a comma Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-05-24 12:32:28 UTC (rev 1970) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-05-25 16:48:59 UTC (rev 1971) @@ -25,6 +25,8 @@ package org.nuiton.topia.framework; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -39,25 +41,8 @@ */ public class TopiaQueryTest { - public TopiaQueryTest() { - } + private static final Log log = LogFactory.getLog(TopiaQueryTest.class); - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - @Test public void testAdd() { @@ -97,4 +82,54 @@ query.fullQuery()); } + @Test + public void testAddSubQuery() { + + // Test 1 : Subquery in select part with two params with different values + TopiaQuery query = new TopiaQuery(QueriedEntity.class). + add(QueriedEntity.TEST_ADD, "value1"); + // Exist 2 params + Assert.assertEquals(2, query.getParams().size()); + + TopiaQuery subquery = new TopiaQuery(QueriedEntity.class). + add(QueriedEntity.TEST_ADD, "value2"); + + query.addSubQuery("SUM(?)", subquery, true); + log.debug(query); + // Add other params from subquery + Assert.assertEquals(4, query.getParams().size()); + + + // Test 2 : Subquery in select part with two params with different values + // one of both is null + query = new TopiaQuery(QueriedEntity.class). + add(QueriedEntity.TEST_ADD, TopiaQuery.Op.EQ, null); + // Exist 0 param (null value) + Assert.assertEquals(0, query.getParams().size()); + + subquery = new TopiaQuery(QueriedEntity.class). + add(QueriedEntity.TEST_ADD, "value1"); + + query.addSubQuery("SUM(?)", subquery, true); + log.debug(query); + // Add 2 params from subquery + Assert.assertEquals(2, query.getParams().size()); + + + // Test 3 : Subquery in where part with two params with same value + query = new TopiaQuery(QueriedEntity.class, "Q1"). + add(QueriedEntity.TEST_ADD, "value1"); + // Exist 2 params + Assert.assertEquals(2, query.getParams().size()); + + subquery = new TopiaQuery(QueriedEntity.class, "Q2"). + add(QueriedEntity.TEST_ADD, "value1"); + + query.addSubQuery("Q1 = (?)", subquery, false); + log.debug(query); + // Still 2 params + Assert.assertEquals(2, query.getParams().size()); + + } + }

1 0

r1970 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org May 24, 2010

May 24, 2010

Author: tchemit Date: 2010-05-24 14:32:28 +0200 (Mon, 24 May 2010) New Revision: 1970 Url: http://nuiton.org/repositories/revision/topia/1970 Log: - improve ListUpdator api - use last version of nuiton-utils (binder api) Modified: trunk/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-20 16:54:46 UTC (rev 1969) +++ trunk/pom.xml 2010-05-24 12:32:28 UTC (rev 1970) @@ -233,7 +233,7 @@  <eugene.version>2.0.2-SNAPSHOT</eugene.version> - <lutinutil.version>1.3</lutinutil.version> + <lutinutil.version>1.3.1-SNAPSHOT</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java 2010-05-20 16:54:46 UTC (rev 1969) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java 2010-05-24 12:32:28 UTC (rev 1970) @@ -41,9 +41,9 @@ * Some factory methods are defined to simplify the generic cast, prefer used them * instead of the (protected) constructor. * + * @author tchemit <chemit(a)codelutin.com> * @param <P> type of parent of childs * @param <E> type of child - * @author tchemit <chemit(a)codelutin.com> */ public class EntityListUpdator<P extends TopiaEntity, E extends TopiaEntity> implements ListUpdator<P, E> { @@ -51,13 +51,24 @@ return new EntityListUpdator<P, E>(parentClass, childClass, propertyName); } + /** name of the field containing the childs */ protected String propertyName; + /** descriptor of the filed containing the childs */ protected PropertyDescriptor descriptor; + protected Method getMethod; + protected Method addMethod; + protected Method removeMethod; + protected Method removeAllMethod; + + protected Method sizeMethod; + + protected Method emptyMethod; + protected EntityListUpdator(Class<P> parentClass, Class<E> childClass, String propertyName) { this.propertyName = propertyName; @@ -71,22 +82,40 @@ getMethod = parentClass.getMethod("get" + cap + "ByTopiaId", String.class); addMethod = parentClass.getMethod("add" + cap, childClass); removeMethod = parentClass.getMethod("remove" + cap, childClass); + removeAllMethod = parentClass.getMethod("clear" + cap); + sizeMethod = parentClass.getMethod("size" + cap); + emptyMethod = parentClass.getMethod("is" + cap + "Empty"); } catch (NoSuchMethodException e) { throw new RuntimeException(e); } } @Override + public String getPropertyName() { + return propertyName; + } + + @Override public E getChild(P parent, String topiaId) { return EntityListUpdator.<E>invokeWithResult(getMethod, parent, topiaId); } @Override public Collection<E> getChilds(P parent) { - return EntityListUpdator.invokeWithResult(descriptor.getReadMethod(), parent); + return EntityListUpdator.<Collection<E>>invokeWithResult(descriptor.getReadMethod(), parent); } @Override + public int size(P parent) { + return EntityListUpdator.<Integer>invokeWithResult(sizeMethod, parent); + } + + @Override + public boolean isEmpty(P parent) { + return EntityListUpdator.<Boolean>invokeWithResult(emptyMethod, parent); + } + + @Override public void setChilds(P parent, Collection<E> childs) { invoke(descriptor.getWriteMethod(), parent, childs); } @@ -101,6 +130,11 @@ invoke(removeMethod, parent, bean); } + @Override + public void removeAll(P parent) { + invoke(removeAllMethod, parent); + } + protected static void invoke(Method m, Object bean, Object... args) { try { m.invoke(bean, args); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java 2010-05-20 16:54:46 UTC (rev 1969) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java 2010-05-24 12:32:28 UTC (rev 1970) @@ -42,6 +42,13 @@ public interface ListUpdator<P, E> { /** + * Obtain the name of the property containing childs. + * + * @return the name of the property containing childs. + */ + String getPropertyName(); + + /** * Obtain a child from the entity given his id. * * @param parent the entity to query @@ -60,6 +67,22 @@ Collection<E> getChilds(P parent); /** + * Obtain the number of childs for the given parent. + * + * @param parent the entity to query + * @return the number of childs for the given entity + */ + int size(P parent); + + /** + * Tests if the given entity has some childs. + * + * @param parent the entity to query + * @return {@code true} is the given parent has no child. + */ + boolean isEmpty(P parent); + + /** * Set the childs of an entity * * @param parent the entity to be setted @@ -70,7 +93,7 @@ /** * Add a erntity to his parent * - * @param parent the parent entity + * @param parent the entity to modifiy * @param e the entity to add in parent. * @throws TopiaException if any db problem while operation */ @@ -79,9 +102,16 @@ /** * Remove from a prent entity a given child. * - * @param parent the parent entity + * @param parent the entity to modifiy * @param e the child to remove. * @throws TopiaException if any pb while operation. */ void removeFromList(P parent, E e) throws TopiaException; + + /** + * Remove all childs of the given parent. + * + * @param parent the entity to modify + */ + void removeAll(P parent); }

1 0

r1969 - in trunk/topia-service-security/src/main/java/org/nuiton/topia/taas: . jaas
by sletellier＠users.nuiton.org May 20, 2010

May 20, 2010

Author: sletellier Date: 2010-05-20 18:54:46 +0200 (Thu, 20 May 2010) New Revision: 1969 Url: http://nuiton.org/repositories/revision/topia/1969 Log: Add debbug and error logs Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2010-05-20 15:12:39 UTC (rev 1968) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2010-05-20 16:54:46 UTC (rev 1969) @@ -246,11 +246,16 @@ /** * Permet de r�cup�rer le subject en cours - * * @return subject */ public Subject findSubject() { - return subjectFinder.findSubject(); + Subject subject = subjectFinder.findSubject(); + + if (log.isDebugEnabled()) { + log.debug("findSubject : " + subjectFinder + " value " + subject); + } + + return subject; } /** Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java 2010-05-20 15:12:39 UTC (rev 1968) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java 2010-05-20 16:54:46 UTC (rev 1969) @@ -99,88 +99,94 @@ */ @Override public boolean login() throws LoginException { - if (callbackHandler == null) { - throw new LoginException("CallbackHandler cannot be null"); - } - if (taasService == null) { - throw new LoginException("TaasService property must be set"); - } + try { + if (callbackHandler == null) { + throw new LoginException("CallbackHandler cannot be null"); + } + if (taasService == null) { + throw new LoginException("TaasService property must be set"); + } - String login, password; + String login, password; - NameCallback nc = new NameCallback("login"); - PasswordCallback pc = new PasswordCallback("password", false); + NameCallback nc = new NameCallback("login"); + PasswordCallback pc = new PasswordCallback("password", false); - Callback[] callbacks = new Callback[2]; + Callback[] callbacks = new Callback[2]; - callbacks[0] = nc; - callbacks[1] = pc; + callbacks[0] = nc; + callbacks[1] = pc; - try { - //Récupération du login et mot de passe - callbackHandler.handle(callbacks); - } catch (Exception eee) { - if (log.isWarnEnabled()) { - log.warn("Utilisation du CallbackHandler impossible", eee); + try { + //Récupération du login et mot de passe + callbackHandler.handle(callbacks); + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Utilisation du CallbackHandler impossible", eee); + } + LoginException le = new LoginException( + "Utilisation du CallbackHandler impossible"); + le.initCause(eee); + throw le; } - LoginException le = new LoginException( - "Utilisation du CallbackHandler impossible"); - le.initCause(eee); - throw le; - } - login = nc.getName(); - password = new String(pc.getPassword()); - pc.clearPassword(); + login = nc.getName(); + password = new String(pc.getPassword()); + pc.clearPassword(); - String hashed = TaasUtil.hash(password); - - //Vérification du login/pass et récupération des Principals - TopiaContext transaction = null; - try { - TopiaContext rootContext = taasService.getRootContextNoSecure(); - transaction = rootContext.beginTransaction(); - - TaasUserDAO userDAO = TopiaSecurityDAOHelper.getTaasUserDAO(transaction); - TaasUser user = userDAO.findByLogin(login); + String hashed = TaasUtil.hash(password); - if(user != null && user.getPassword().equals(hashed) && user.getEnabled()) { - privateCredential = user; - - // Update connection information - user.setLastConnectionDate(new Date()); - int numberOfConnection = user.getNumberOfConnection(); - user.setNumberOfConnection(numberOfConnection + 1); - user.update(); - - // Récupération des principals - principals = new HashSet<TaasPrincipalWrapper>(); - - Collection<TaasPrincipal> taasPrincipals = user.getPrincipals(); - for (TaasPrincipal taasPrincipal : taasPrincipals) { - principals.add(new TaasPrincipalWrapper(taasPrincipal)); - } - } else { - // Echec d'authentification - principals = null; - privateCredential = null; - throw new LoginException("Erreur lors de l'authentification " + login); - } - } catch (Exception e) { - LoginException le = new LoginException("Erreur lors de l'authentification" + login); - le.initCause(e); - log.error(e); - throw le; - } finally { - if (transaction != null) { - try { - transaction.commitTransaction(); - transaction.closeContext(); - } catch (TopiaException e) { + //Vérification du login/pass et récupération des Principals + TopiaContext transaction = null; + try { + TopiaContext rootContext = taasService.getRootContextNoSecure(); + transaction = rootContext.beginTransaction(); + + TaasUserDAO userDAO = TopiaSecurityDAOHelper.getTaasUserDAO(transaction); + TaasUser user = userDAO.findByLogin(login); + + if(user != null && user.getPassword().equals(hashed) && user.getEnabled()) { + privateCredential = user; + + // Update connection information + user.setLastConnectionDate(new Date()); + int numberOfConnection = user.getNumberOfConnection(); + user.setNumberOfConnection(numberOfConnection + 1); + user.update(); + + // Récupération des principals + principals = new HashSet<TaasPrincipalWrapper>(); + + Collection<TaasPrincipal> taasPrincipals = user.getPrincipals(); + for (TaasPrincipal taasPrincipal : taasPrincipals) { + principals.add(new TaasPrincipalWrapper(taasPrincipal)); + } + } else { + // Echec d'authentification + principals = null; + privateCredential = null; throw new LoginException("Erreur lors de l'authentification " + login); } + } catch (Exception e) { + LoginException le = new LoginException("Erreur lors de l'authentification" + login); + le.initCause(e); + log.error(e); + throw le; + } finally { + if (transaction != null) { + try { + transaction.commitTransaction(); + transaction.closeContext(); + } catch (TopiaException e) { + throw new LoginException("Erreur lors de l'authentification " + login); + } + } } + } catch(LoginException eee) { + log.error("LoginException : ", eee); + } catch(Throwable eee){ + log.error(eee); + throw new LoginException(eee.getMessage()); } - return true; } Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java 2010-05-20 15:12:39 UTC (rev 1968) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java 2010-05-20 16:54:46 UTC (rev 1969) @@ -44,6 +44,8 @@ import java.security.Permission; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.taas.entities.TaasAuthorization; /** @@ -55,6 +57,8 @@ private static final long serialVersionUID = 1L; + private static Log log = LogFactory.getLog(TaasPermission.class); + public String authorizationExpression; public int authorizationActions; @@ -156,10 +160,18 @@ * @return vrai si thisId implique thatId */ public boolean impliesExpression(String thisExpression, String thatExpression) { - return thisExpression.equals(thatExpression) || + boolean result = thisExpression.equals(thatExpression) || "*".equals(thisExpression) || - thatExpression.startsWith(thisExpression.substring(0, thisExpression.length()-1)) + thatExpression.startsWith(thisExpression.substring(0, thisExpression.length() - 1)) && thisExpression.endsWith("*"); + + if (log.isDebugEnabled()) { + log.debug("Implies expression : " + thisExpression + + " with " + thatExpression + + " return " + result); + } + + return result; } /**

1 0

r1968 - trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas
by sletellier＠users.nuiton.org May 20, 2010

May 20, 2010

Author: sletellier Date: 2010-05-20 17:12:39 +0200 (Thu, 20 May 2010) New Revision: 1968 Url: http://nuiton.org/repositories/revision/topia/1968 Log: Add finally block to close transaction Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java 2010-05-20 12:45:07 UTC (rev 1967) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java 2010-05-20 15:12:39 UTC (rev 1968) @@ -54,6 +54,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaSecurityDAOHelper; import org.nuiton.topia.taas.TaasService; @@ -134,9 +135,10 @@ String hashed = TaasUtil.hash(password); //Vérification du login/pass et récupération des Principals + TopiaContext transaction = null; try { TopiaContext rootContext = taasService.getRootContextNoSecure(); - TopiaContext transaction = rootContext.beginTransaction(); + transaction = rootContext.beginTransaction(); TaasUserDAO userDAO = TopiaSecurityDAOHelper.getTaasUserDAO(transaction); TaasUser user = userDAO.findByLogin(login); @@ -148,7 +150,7 @@ user.setLastConnectionDate(new Date()); int numberOfConnection = user.getNumberOfConnection(); user.setNumberOfConnection(numberOfConnection + 1); - userDAO.update(user); + user.update(); // Récupération des principals principals = new HashSet<TaasPrincipalWrapper>(); @@ -163,14 +165,20 @@ privateCredential = null; throw new LoginException("Erreur lors de l'authentification " + login); } - - transaction.commitTransaction(); - transaction.closeContext(); } catch (Exception e) { - LoginException le = new LoginException("Erreur lors de l'authentification"); + LoginException le = new LoginException("Erreur lors de l'authentification" + login); le.initCause(e); log.error(e); throw le; + } finally { + if (transaction != null) { + try { + transaction.commitTransaction(); + transaction.closeContext(); + } catch (TopiaException e) { + throw new LoginException("Erreur lors de l'authentification " + login); + } + } } return true;

1 0

r1967 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by jpepin＠users.nuiton.org May 20, 2010

May 20, 2010

Author: jpepin Date: 2010-05-20 14:45:07 +0200 (Thu, 20 May 2010) New Revision: 1967 Url: http://nuiton.org/repositories/revision/topia/1967 Log: evo #618 : add lazy managment tag for association class Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2010-05-20 11:57:51 UTC (rev 1966) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2010-05-20 12:45:07 UTC (rev 1967) @@ -227,8 +227,9 @@ String notNull = " " + generateFromTagValue(attr, TopiaGeneratorUtil.TAG_NOT_NULL, "not-null"); String attrName = getName(attr, true); String attrType = getType(attr, true); + String lazy = generateFromTagValue(attr, TopiaGeneratorUtil.TAG_LAZY, "lazy"); String attrColumn = TopiaGeneratorUtil.getDBName(attr); -/*{<%=prefix%> <many-to-one name="<%=attrName%>" class="<%=attrType%>" column="<%=attrColumn%>" node="<%=attrName%>/@topiaId" embed-xml="false" <%=notNull%>/> +/*{<%=prefix%> <many-to-one name="<%=attrName%>" class="<%=attrType%>" <%=lazy%>column="<%=attrColumn%>" node="<%=attrName%>/@topiaId" embed-xml="false" <%=notNull%>/> }*/ // } //Ne sert plus grâce à l'utilisation de la navigabilité

1 0

r1966 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org May 20, 2010

May 20, 2010

Author: tchemit Date: 2010-05-20 13:57:51 +0200 (Thu, 20 May 2010) New Revision: 1966 Url: http://nuiton.org/repositories/revision/topia/1966 Log: add constant dependency support for entity Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-05-20 10:46:33 UTC (rev 1965) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-05-20 11:57:51 UTC (rev 1966) @@ -49,6 +49,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Set; import static org.nuiton.eugene.GeneratorUtil.getSimpleName; import static org.nuiton.topia.generator.TopiaGeneratorUtil.STEREOTYPE_ENTITY; @@ -209,6 +210,12 @@ addImport(output, TopiaEntity.class); + Set<String> constants = addConstantsFromDependency(input, output); + + if (log.isDebugEnabled()) { + log.debug("Add constants from dependency : " + constants); + } + if (TopiaGeneratorUtil.hasDocumentation(input)) { setDocumentation(output,input.getDocumentation()); }

1 0