Author: tchemit Date: 2012-05-23 15:33:30 +0200 (Wed, 23 May 2012) New Revision: 2512 Url: http://nuiton.org/repositories/revision/topia/2512 Log: usage of TopiaIdUtil instead of TopiaId Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.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/listener/EntityVetoable.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 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 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -54,7 +54,7 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaDAOImpl; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaIdUtil; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -832,7 +832,7 @@ public TopiaEntity findByTopiaId(String id) throws TopiaException { checkClosed("findByTopiaId"); - Class<TopiaEntity> entityClass = TopiaId.getClassName(id); + Class<TopiaEntity> entityClass = TopiaIdUtil.getClassName(id); TopiaDAO<TopiaEntity> dao = getDAO(entityClass); TopiaEntity result = dao.findByTopiaId(id); return result; @@ -927,7 +927,7 @@ checkClosed("add"); String id = e.getTopiaId(); - Class<TopiaEntity> entityClass = TopiaId.getClassName(id); + Class<TopiaEntity> entityClass = TopiaIdUtil.getClassName(id); TopiaDAO<TopiaEntity> dao = getDAO(entityClass); dao.update(e); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -30,7 +30,7 @@ import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaIdUtil; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -169,7 +169,7 @@ if (hasReference()) { try { - Class<?> referenceClass = TopiaId.getClassName(referenceId); + Class<?> referenceClass = TopiaIdUtil.getClassName(referenceId); if (referenceClass.isAssignableFrom(entityClass)) { result = true; } 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 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -265,7 +265,7 @@ protected E create0(E result) throws TopiaException { // XXX AThimel 22/05/2012 Add it back here because it does not work in PrePersist event - String topiaId = TopiaId.create(entityClass); + String topiaId = TopiaIdUtil.create(entityClass); result.setTopiaId(topiaId); // on fait un save maintenant, car puisqu'on a creer l'entity au Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdUtil.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -12,6 +12,8 @@ /** * Useful methods around the {@code topia-id}. * + * TODO-tchemit-2012-05-23 Finish javadoc + * * @author tchemit <chemit@codelutin.com> * @since 3.0 */ Modified: trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java =================================================================== --- trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-persistence-tck/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -30,10 +30,10 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaIdUtil; import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.topia.persistence.TopiaId; import org.nuiton.topia.tck.it.Company; import org.nuiton.topia.tck.it.CompanyImpl; import org.nuiton.topia.tck.it.Department; @@ -166,11 +166,11 @@ public void testDetector() throws Exception { Company company = new CompanyImpl(); - company.setTopiaId(TopiaId.create(Company.class)); + company.setTopiaId(TopiaIdUtil.create(Company.class)); Employe employe = new EmployeImpl(); - employe.setTopiaId(TopiaId.create(Employe.class)); + employe.setTopiaId(TopiaIdUtil.create(Employe.class)); Department department = new DepartmentImpl(); - department.setTopiaId(TopiaId.create(Department.class)); + department.setTopiaId(TopiaIdUtil.create(Department.class)); detectEntities(new Class<?>[]{Company.class, Employe.class, Department.class}, new int[]{1, 1, 1}, company, employe, department); detectEntityIds(new Class<?>[]{Company.class, Employe.class, Department.class}, new int[]{1, 1, 1}, company, employe, department); 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 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/TopiaSecurityServiceImpl.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -35,7 +35,7 @@ import org.nuiton.topia.event.TopiaTransactionEvent; import org.nuiton.topia.event.TopiaTransactionVetoable; import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaIdUtil; import org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO; import org.nuiton.topia.security.entities.authorization.TopiaAuthorization; import org.nuiton.topia.security.entities.authorization.TopiaAuthorizationDAO; @@ -297,7 +297,7 @@ Set<Permission> permissions = new HashSet<Permission>(); permissionsCache.put(principalName, permissions); - String className = TopiaId.getClassNameAsString(principalName); + String className = TopiaIdUtil.getClassNameAsString(principalName); // AddEmptyPrincipals pr�cise si il faut les autorisations dont les principals sont vide boolean addEmptyPrincipals = className.equals(TopiaUser.class.getName()); @@ -428,7 +428,7 @@ */ protected int getRealActions(String topiaId, int actions) { try { - Class<?> klass = TopiaId.getClassName(topiaId); + Class<?> klass = TopiaIdUtil.getClassName(topiaId); //if(TopiaSecurityUtil.isImplement(klass, NoSecurityLoad.class)) { if (NoSecurityLoad.class.isAssignableFrom(klass)) { 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 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -32,7 +32,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaIdUtil; /** * Classe permettant les autorisations de type association. C'est à dire l'autorisation @@ -62,7 +62,7 @@ @Override public boolean impliesExpression(String thisExpression, String thatExpression) { String select = "count(test)"; - String from = TopiaId.getClassNameAsString(thisExpression) + " test join test." + nameAssociation + " as association"; + String from = TopiaIdUtil.getClassNameAsString(thisExpression) + " test join test." + nameAssociation + " as association"; String where = "test.topiaId=:test and association.topiaId=:association"; TopiaContext context = getTopiaContext(); try { Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -43,7 +43,7 @@ import org.nuiton.topia.event.TopiaEntityEvent; import org.nuiton.topia.event.TopiaEntityVetoable; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaIdUtil; import org.nuiton.topia.security.TopiaSecurityServiceImpl; import static org.nuiton.topia.security.util.TopiaSecurityUtil.CREATE; @@ -72,7 +72,7 @@ String topiaId = entity.getTopiaId(); Class<? extends TopiaEntity> clazz; try { - clazz = TopiaId.getClassName(topiaId); + clazz = TopiaIdUtil.getClassName(topiaId); } catch (TopiaNotFoundException e) { // Ne devrait jamais ce produire throw new SecurityException("Access denied to entity creation", e); 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 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -43,7 +43,7 @@ import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImpl; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaIdUtil; import org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl; import org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl; import org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl; @@ -227,7 +227,7 @@ Subject subject = Subject.getSubject(AccessController.getContext()); if (subject != null) { for (Principal principal : subject.getPrincipals()) { - String className = TopiaId.getClassNameAsString(principal.getName()); + String className = TopiaIdUtil.getClassNameAsString(principal.getName()); if(className.equals(TopiaUser.class.getName())) { return principal.getName(); } 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 2012-05-23 13:25:58 UTC (rev 2511) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java 2012-05-23 13:33:30 UTC (rev 2512) @@ -50,7 +50,7 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaIdUtil; import org.nuiton.topia.taas.entities.TaasAuthorizationImpl; import org.nuiton.topia.taas.entities.TaasPrincipalImpl; import org.nuiton.topia.taas.entities.TaasUserImpl; @@ -449,7 +449,7 @@ Class<? extends TopiaEntity> klass; try { - klass = TopiaId.getClassName(topiaId); + klass = TopiaIdUtil.getClassName(topiaId); } catch (TopiaNotFoundException e) { throw new SecurityException("Invalid topiaId", e); }