Author: tchemit Date: 2010-03-20 18:25:40 +0100 (Sat, 20 Mar 2010) New Revision: 1846 Log: fix javadoc + remove deprecated methods Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-03-17 13:06:52 UTC (rev 1845) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2010-03-20 17:25:40 UTC (rev 1846) @@ -49,9 +49,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.beanutils.MethodUtils; import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.util.ObjectUtil; /** * Une classe avec des méthodes utiles sur les entités. @@ -63,16 +61,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaEntityHelper.class); - protected static final Integer ZERO = 0; - - protected static final Float ZEROF = 0f; - - protected static final Long ZEROL = 0l; - - protected static final Double ZEROD = 0.; - - protected static final Byte ZEROB = 0; - /** * Le pattern d'une reference sur une association */ @@ -80,73 +68,6 @@ "%1$s[@" + TopiaEntity.TOPIA_ID + "=\"%2$s\"]"; /** - * - * @param type the type to test - * @return null object (default value for primitive types) - * @deprecated since 2.3.0, prefer use the - * {@link ObjectUtil#getNullValue(Class)} method - */ - @Deprecated - protected static Object getNullValue(Class<?> type) { - if (type.isPrimitive()) { - type = MethodUtils.getPrimitiveWrapper(type); - if (Boolean.class.isAssignableFrom(type)) { - return Boolean.FALSE; - } - if (Integer.class.isAssignableFrom(type)) { - return ZERO; - } - if (Float.class.isAssignableFrom(type)) { - return ZEROF; - } - if (Long.class.isAssignableFrom(type)) { - return ZEROL; - } - if (Double.class.isAssignableFrom(type)) { - return ZEROD; - } - if (Byte.class.isAssignableFrom(type)) { - return ZEROB; - } - } - return null; - } - - /** - * @param value the value to test - * @return {@code true} if value is null or default value for primitive - * types) - * @deprecated since 2.3.0, prefer use the - * {@link ObjectUtil#isNullValue(Object)} method - */ - @Deprecated - public static boolean isNullValue(Object value) { - if (value == null) { - return true; - } - Class<?> type = value.getClass(); - if (type.isPrimitive()) { - type = MethodUtils.getPrimitiveWrapper(type); - } - if (Boolean.class.isAssignableFrom(type)) { - return Boolean.FALSE.equals(value); - } - if (Integer.class.isAssignableFrom(type)) { - return ZERO.equals(value); - } - if (Float.class.isAssignableFrom(type)) { - return ZEROF.equals(value); - } - if (Long.class.isAssignableFrom(type)) { - return ZEROL.equals(value); - } - if (Double.class.isAssignableFrom(type)) { - return ZEROD.equals(value); - } - return Byte.class.isAssignableFrom(type) && ZEROB.equals(value); - } - - /** * Bind les valeurs techniques depuis une entitée vers une autre. * * @param from l'entité source @@ -302,11 +223,13 @@ if (!dbDirectory.exists()) { if (!dbDirectory.mkdirs()) { - throw new IOException("could not create directory " + dbDirectory); + throw new IOException( + "could not create directory " + dbDirectory); } } - log.info("create database from [" + databaseDump + "] at [" + dbDirectory + "]"); + log.info("create database from [" + databaseDump + "] at [" + + dbDirectory + "]"); TopiaContext ctxt = topiaContext.beginTransaction(); @@ -328,7 +251,8 @@ * @param topiaContext the topiaContext of the db to store * @throws TopiaException if any pb while saving db * @throws NullPointerException if parameters are null - * @throws IOException if could not create gzipFile container directory + * @throws IOException if could not create gzipFile container + * directory */ public static void saveDB( File gzipFile, TopiaContext topiaContext) @@ -385,7 +309,8 @@ * * @param entities the list of entities to filter * @param filterClass the type of entities to keep - * @return the list of filtered entities for the given entity type in the list + * @return the list of filtered entities for the given entity type in the + * list * @since 2.1.4 */ public static List<TopiaEntity> filter( @@ -454,7 +379,8 @@ TopiaEntityEnum[] contracts, Set<Class<? extends TopiaEntity>> classes) { Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> dico; - dico = new HashMap<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>>(); + dico = new HashMap<Class<? extends TopiaEntity>, + Class<? extends TopiaEntity>>(); try { Set<Class<? extends TopiaEntity>> result = new HashSet<Class<? extends TopiaEntity>>(); @@ -511,7 +437,7 @@ * @return l'ensemble des types d'entites decouverts (uniquement les * contrats des entites). * - * @throws TopiaException + * @throws TopiaException if a problem while visiting entities */ public static Set<Class<? extends TopiaEntity>> detectTypes( final TopiaEntityEnum[] contracts, @@ -564,7 +490,7 @@ * @return l'ensemble des entites decouverts (on converse uniquement les * entites dont le contract est dans l'ensemble voulu). * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities */ public static Map<Class<? extends TopiaEntity>, List<TopiaEntity>> detectEntities(final TopiaEntityEnum[] contracts, @@ -626,7 +552,7 @@ * @return l'ensemble des ids d'entites decouverts (on converse uniquement les * entites dont le contract est dans l'ensemble voulu). * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities */ public static Map<Class<? extends TopiaEntity>, List<String>> detectEntityIds(final TopiaEntityEnum[] contracts, @@ -685,7 +611,7 @@ * @param entities les entites a parcourir * @return l'ensemble des references decouvertes. * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities * * @see TopiaEntityRef */ @@ -706,7 +632,7 @@ * @param entities les entites a parcourir * @return l'ensemble des references decouvertes. * - * @throws TopiaException + * @throws TopiaException if a pb while visiting entities * * @see TopiaEntityRef */