Author: athimel Date: 2013-12-17 17:02:49 +0100 (Tue, 17 Dec 2013) New Revision: 2926 Url: http://nuiton.org/projects/topia/repository/revisions/2926 Log: p***** static [final] No more 'to use log facility, just put in your code: log.info("...");' Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -67,7 +67,6 @@ */ public class TopiaUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaUtil.class); /** 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 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -64,7 +64,6 @@ */ public class TopiaEntityHelper { - /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(TopiaEntityHelper.class); /** Le pattern d'une reference sur une association */ Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -52,7 +52,7 @@ public abstract class AbstractTopiaMigrationCallback { /** Logger */ - static private Log log = LogFactory.getLog(AbstractTopiaMigrationCallback.class); + private static final Log log = LogFactory.getLog(AbstractTopiaMigrationCallback.class); /** @return the available versions from the call back */ public abstract Version[] getAvailableVersions(); Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -47,7 +47,7 @@ public abstract class TopiaMigrationCallbackByMethod extends AbstractTopiaMigrationCallback { /** Logger */ - static private Log log = LogFactory.getLog(TopiaMigrationCallbackByMethod.class); + private static final Log log = LogFactory.getLog(TopiaMigrationCallbackByMethod.class); @Override protected void migrateForVersion(Version version, Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -66,9 +66,9 @@ */ public abstract class AbstractTopiaReplicationServiceTest extends Assert { - static protected AbstractTopiaApplicationContext sourceContext; + protected static AbstractTopiaApplicationContext sourceContext; - static protected TopiaPersistenceContext sourcePC; + protected static TopiaPersistenceContext sourcePC; protected AbstractTopiaApplicationContext destinationContext; @@ -76,13 +76,13 @@ protected ReplicationModel model; - static protected boolean init; + protected static boolean init; - static private Long testsTimeStamp; + private static Long testsTimeStamp; - static private File testsBasedir; + private static File testsBasedir; - static private final String TEST_BASEDIR = "target%1$ssurefire-tests%1$s%2$td_%2$tm_%2$tY%1$s%2$tH_%2$tM_%2$tS"; + private static final String TEST_BASEDIR = "target%1$ssurefire-tests%1$s%2$td_%2$tm_%2$tY%1$s%2$tH_%2$tM_%2$tS"; protected static final Function<Properties,AbstractTopiaApplicationContext> CREATE_TOPIA_TEST_APPLICATION_CONTEXT = new Function<Properties, AbstractTopiaApplicationContext>() { @Override Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -80,11 +80,11 @@ PetImpl.class.getName() + "," + RaceImpl.class.getName(); - static protected Person person, person2; + protected static Person person, person2; - static protected Pet pet, pet2; + protected static Pet pet, pet2; - static protected Race race, race2; + protected static Race race, race2; protected static File tesDir; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -75,11 +75,11 @@ PetImpl.class.getName() + "," + RaceImpl.class.getName(); - static protected Person person, person2; + protected static Person person, person2; - static protected Pet pet, pet2, pet3; + protected static Pet pet, pet2, pet3; - static protected Race race, race2, race3; + protected static Race race, race2, race3; protected static File tesDir; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -75,11 +75,11 @@ protected static final String entitiesList = PersonImpl.class.getName() + "," + PetImpl.class.getName() + "," + RaceImpl.class.getName(); - static protected Person person, person2; + protected static Person person, person2; - static protected Pet pet, pet2, pet3; + protected static Pet pet, pet2, pet3; - static protected Race race, race2, race3; + protected static Race race, race2, race3; protected static File tesDir; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -84,8 +84,7 @@ public class TopiaSecurityServiceImpl implements TopiaSecurityService, TopiaTransactionVetoable { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaSecurityServiceImpl.class); + private static final Log log = LogFactory.getLog(TopiaSecurityServiceImpl.class); /* Context ToPIA */ Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -48,7 +48,7 @@ public class TopiaAssociationAuthorizationImpl extends TopiaAssociationAuthorizationAbstract { - static private Log log = LogFactory.getLog(TopiaAssociationAuthorizationImpl.class); + private static final Log log = LogFactory.getLog(TopiaAssociationAuthorizationImpl.class); private static final long serialVersionUID = 1L; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/user/TopiaUserImpl.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -37,8 +37,7 @@ */ public class TopiaUserImpl extends TopiaUserAbstract { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaUserImpl.class); + private static final Log log = LogFactory.getLog(TopiaUserImpl.class); private static final long serialVersionUID = 1L; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityFactoryFilter.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -43,8 +43,7 @@ */ public class TopiaSecurityFactoryFilter { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaSecurityUtil.class); + private static final Log log = LogFactory.getLog(TopiaSecurityUtil.class); private static final long serialVersionUID = 1L; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -70,8 +70,7 @@ */ public class TopiaSecurityUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaSecurityUtil.class); + private static final Log log = LogFactory.getLog(TopiaSecurityUtil.class); public static final int LOAD = 0x1; public static final String LOAD_TEXT = "LOAD"; @@ -132,7 +131,7 @@ * @param ch ? * @return ? */ - static public String digestSHAHex(String ch){ + public static String digestSHAHex(String ch){ if(ch == null){ return null; } 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 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -92,7 +92,7 @@ */ public class TaasService implements TopiaService, TopiaTransactionVetoable { - static private Log log = LogFactory.getLog(TaasService.class); + private static final Log log = LogFactory.getLog(TaasService.class); public static final String SERVICE_NAME = "taas"; Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -60,8 +60,8 @@ */ public class TaasUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TaasUtil.class); + + private static final Log log = LogFactory.getLog(TaasUtil.class); public static final int LOAD = 0x1; public static final String LOAD_TEXT = "LOAD"; @@ -109,7 +109,7 @@ * @param ch la chaine a traiter * @return le checksum SHA en mode hexadecimal */ - static public String digestSHAHex(String ch){ + public static String digestSHAHex(String ch){ if(ch == null){ return null; } Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2013-12-17 15:56:08 UTC (rev 2925) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2013-12-17 16:02:49 UTC (rev 2926) @@ -804,7 +804,7 @@ return classes; } - static public final Comparator<ObjectModelClass> + public static final Comparator<ObjectModelClass> OBJECT_MODEL_CLASS_COMPARATOR = new Comparator<ObjectModelClass>() {