This is an automated email from the git hooks/post-receive script. New commit to branch feature/3858_javadoc_jdk8 in repository topia. See http://git.nuiton.org/topia.git commit d73ad89cf96f5802a0293117d6c13c85fa35acfc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 30 16:36:52 2015 +0100 Fix javadoc in service replication module (See #3858) --- .../topia/replication/TopiaReplicationContext.java | 4 ++-- .../replication/TopiaReplicationModelBuilder.java | 12 +++++------ .../replication/TopiaReplicationOperation.java | 14 ++++++------- .../TopiaReplicationOperationProvider.java | 2 +- .../TopiaReplicationOperationUndoable.java | 4 ++-- .../topia/replication/TopiaReplicationService.java | 24 +++++++++++----------- .../topia/replication/model/ReplicationLink.java | 6 +++--- .../topia/replication/model/ReplicationModel.java | 2 +- .../topia/replication/model/ReplicationNode.java | 2 +- .../replication/model/ReplicationOperationDef.java | 8 ++++---- .../model/ReplicationOperationPhase.java | 2 +- .../topia/replication/operation/AttachLink.java | 14 ++++++------- .../replication/operation/DettachAssociation.java | 2 +- .../topia/replication/operation/Duplicate.java | 2 +- .../topia/replication/operation/LoadLink.java | 2 +- .../AbstractTopiaReplicationServiceTest.java | 2 +- .../replication/TopiaReplicationOperationTest.java | 2 +- .../TopiaReplicationServiceImplAllTest.java | 2 +- .../TopiaReplicationServiceImplTest.java | 12 +++++------ 19 files changed, 59 insertions(+), 59 deletions(-) diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java index 414e4ff..b605854 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java @@ -43,7 +43,7 @@ import java.util.List; /** * Defines the context used to replicate. - * <p/> + * * It contains : * <ul> * <li>the {@link #replicationModel}</li> @@ -131,7 +131,7 @@ public class TopiaReplicationContext { /** * Init the replication context. - * <p/> + * * Comptute the universe to replicate and store it in {@link #data}. * * @throws TopiaException for any error when initializing the replication context diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java index 069ee47..c8a39eb 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java @@ -64,7 +64,7 @@ public class TopiaReplicationModelBuilder { /** * Prepare le modele de replication pour les entites données dans * {@code topiaIds} et de leur couverture. - * <p/> + * * Le paramètre {@code computeOrder} détermine si on doit calculer l'ordre * de replication des données (valeur à {@code true}), sinon (valeur * à {@code false}) on utilise l'ordre induit par le paramètre @@ -93,12 +93,12 @@ public class TopiaReplicationModelBuilder { /** * Prepare le modele de replication pour toutes les entites des types * donnes. - * <p/> + * * La méthode calcule l'ordre de replication des données. - * <p/> + * * Actuellement, on n'est pas capable de calculer l'ordre si le graphe des * entités contient des cycles. - * <p/> + * * TODO : faire en sorte de pouvoir gérer les cycles. * * @param contracts les contrats des types a repliquer @@ -190,7 +190,7 @@ public class TopiaReplicationModelBuilder { /** * Instantie un nouveau modèle de réplication pour les entités données par * leur ids. - * <p/> + * * L'ordre de réplication dépend du paramètre {@code computeOrder}. Si * celui-ci vaut {@code true}, on calcule l'ordre de réplication, sinon on * utilise l'ordre induit par les {@code contracts}. @@ -227,7 +227,7 @@ public class TopiaReplicationModelBuilder { /** * Instantie un nouveau modèle de réplication pour toutes les entitées. - * <p/> + * * Ici, l'ordre est toujours calculé. * * @param contracts les types d'entités diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java index f742952..7e6c138 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java @@ -37,18 +37,18 @@ import java.util.ServiceLoader; /** * Le contrat d'une operation a effectuer lors de la replication. - * <p/> + * * Le module propose des operations de base dans le paquetage * {@code org.nuiton.topia.replication.operation}. - * <p/> - * <p/> + * + * * Pour definir une nouvelle implantation d'operation, il faut l'enregister * en tant que service (au sens de la classe {@link ServiceLoader}, * c'est à dire ajouter dans un fichier (du class-path) * {@code META-INF/services/org.nuiton.topia.replication.TopiaReplicationOperation} - * <p/> + * * une ligne avec le nom qualifie de votre implantation. - * <p/> + * * Lors du chargement du service, on detecte toutes les operations disponibles. * * @author Tony Chemit - chemit@codelutin.com @@ -59,7 +59,7 @@ public interface TopiaReplicationOperation { /** * Creer et enregister une operation utilisateur apres la creation du * modele via la methode - * <p/> + * * {@link TopiaReplicationService#prepare(TopiaEntityEnum[], boolean, String...)}. * * @param model le modele de replication @@ -82,7 +82,7 @@ public interface TopiaReplicationOperation { /** * Execute l'operation avec le parametrage donnee. - * <p/> + * * Note : le commit sur le context cible doit etre geree dans la methode. * * @param replicationContext le contexte de replication diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java index 5bcae9d..6262096 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java @@ -54,7 +54,7 @@ public class TopiaReplicationOperationProvider { /** * Obtains all {@link TopiaReplicationOperation} available * via {@link ServiceLoader}. - * <p/> + * * If {@link #operations} is null, then load operations, otherwise just * return the already computed result. * diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java index 3071e60..b8dd756 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java @@ -30,7 +30,7 @@ import org.nuiton.topia.replication.model.ReplicationOperationDef; /** * Le contrat d'une operation {@link TopiaReplicationOperation} qui peut être * rollbacker lorsque la replication a échouée. - * <p/> + * * * @author Tony Chemit - chemit@codelutin.com * @since 2.4.3 @@ -40,7 +40,7 @@ public interface TopiaReplicationOperationUndoable extends TopiaReplicationOpera /** * Execute l'operation inverse avec le parametrage donnee * (pour annuler l'opération). - * <p/> + * * Note : le commit sur le context cible doit etre geree dans la methode. * * @param operationDef la definition de l'operation a realiser diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java index 80049d7..c32542b 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java @@ -32,17 +32,17 @@ import org.nuiton.topia.replication.model.ReplicationModel; /** * User visible interface for replication engin - * <p/> + * * To use replicator you must have properties defined in config file: - * <li>topia.replication.engin=[class used to indexation] <li>possible specific - * property for index engin used - * <p/> + * <ul> + * <li>topia.replication.engin=[class used to indexation]</li> + * <li>possible specific property for index engin used</li> + * </ul> * The replication is always done in two phases : - * <p/> - * <li> - prepare the replication model - ({@link #prepare(TopiaEntityEnum[], boolean, String...)} - ({@link #prepareForAll(TopiaEntityEnum[])} - * <p/> - * <li> - lanch replication {@link #doReplicate(ReplicationModel, - * TopiaApplicationContext)} + * <ul> + * <li> - prepare the replication model - ({@link #prepare(TopiaEntityEnum[], boolean, String...)} - ({@link #prepareForAll(TopiaEntityEnum[])}</li> + * <li> - lanch replication {@link #doReplicate(ReplicationModel,TopiaApplicationContext)}</li> + * </ul> * * @author Tony Chemit - chemit@codelutin.com * @since 2.2.0 @@ -76,12 +76,12 @@ public interface TopiaReplicationService extends TopiaService { /** * Prepare le modele de replication pour toutes les entites des types * donnes. - * <p/> + * * La méthode calcule l'ordre de replication des données. - * <p/> + * * Actuellement, on n'est pas capable de calculer l'ordre si le graphe des * entités contient des cycles. - * <p/> + * * TODO : faire en sorte de pouvoir gérer les cycles. * * @param contracts les contrats des types a repliquer diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java index d897be5..8dd03f0 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java @@ -44,7 +44,7 @@ public class ReplicationLink { /** * liste des noeuds requis. - * <p/> + * * TODO tchemit 2010-08-14 Expliquer à quoi ça sert vraiment... */ protected final Set<ReplicationNode> requires; @@ -90,9 +90,9 @@ public class ReplicationLink { /** * Teste si on peut reattacher le lien en connaissant l'univers des * noeuds disponibles. - * <p/> + * * On teste si toutes les pre-requis sont disponibles. - * <p/> + * * Si oui, on peut reattacher. * * @param universe l'univers des noeuds disponibles diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java index 0855f2d..82cbefe 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java @@ -53,7 +53,7 @@ import java.util.Set; /** * Model of replication. - * <p/> + * * the object contains the required {@link #nodes} to replicate : * <ul> * <li>all entities for the given {@code nodes} if flag {@link #replicateAll} is diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java index e8298eb..ddbb04f 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Model of a replication's node. - * <p/> + * * The invariant of a replication's node is his {@link #contract}, means the * type of entity to replicate. * diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java index 4939ad3..8516ff4 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java @@ -32,7 +32,7 @@ import java.util.Arrays; /** * Definition of a concrete operation to execute. - * <p/> + * * A such operation involves : * <ul> * <li>the replication node</li> @@ -40,12 +40,12 @@ import java.util.Arrays; * <li>the replication operation type</li> * <li>the replication operation arguments</li> * </ul> - * <p/> + * * This definition is detected when building replication model. - * <p/> + * * Then when starting replication, based on this definition, we can instanciate * the operation to execute. - * <p/> + * * <b>Note:</b> Such objects can be comparable via their {@link #phase}. * * @author Tony Chemit - chemit@codelutin.com diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java index f5e6914..aced1d8 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java @@ -28,7 +28,7 @@ import org.nuiton.topia.replication.operation.Duplicate; /** * Une enumeration pour definir quand appliquer une operation. - * <p/> + * * L'ordre induit par cette enumeration sera utilisé pour trier les operations * a realiser sur chaque noeud de replication. * diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java index 779ace5..6f03dae 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java @@ -45,20 +45,20 @@ import org.nuiton.topia.replication.model.ReplicationOperationPhase; /** * Pour attacher une association. - * <p/> + * * Deux cas peuvent se produire : - * <p/> + * * - le noeud de l'operation est la source de l'association, dans ce cas la - * <code>nodeEntities</code> contient les entites sources de l'association et on + * {@code nodeEntities} contient les entites sources de l'association et on * retrouve les entites associes a partir du type de l'association - * <p/> + * * Ce premier cas est verifie quand reverse (le econd parametre) est a false - * <p/> + * * - le noeud de l'operation est la cible de l'association, dans ce cas la - * <code>nodeEntities</code> contient les entities associes (cibles) de + * {@code nodeEntities} contient les entities associes (cibles) de * l'assocation et on retrouve les entities a partir d'un troisieme parametre * qui donne le node source des entities sources. - * <p/> + * * Note : cette operation est interne, et n'est pas creable par l'utilisateur * via la methode {@link #register(ReplicationModel, ReplicationNode, * ReplicationOperationPhase, Object...)}. diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java index 3eb1b08..31610b9 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java @@ -41,7 +41,7 @@ import org.nuiton.topia.replication.model.ReplicationOperationPhase; /** * Pour dettacher une association. - * <p/> + * * Note : cette operation est interne, et n'est pas creable par * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java index 6144c0e..1790026 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java @@ -43,7 +43,7 @@ import java.util.List; /** * L'operation de duplication d'un noeud de replication. - * <p/> + * * Note : cette operation est interne, et n'est pas creable par * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java index 458057b..a871031 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java @@ -42,7 +42,7 @@ import java.util.List; /** * Pour charger une association sur le noeud de l'operation. - * <p/> + * * Note : cette operation est interne, et n'est pas creable par * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java index 898ad47..7079f38 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java @@ -58,7 +58,7 @@ import java.util.Set; /** * TopiaReplicationServiceImplTest. - * <p/> + * * Created: 07 jun. 09 17:14:22 * * @author Tony Chemit - chemit@codelutin.com diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java index cf24fdb..85231ad 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java @@ -50,7 +50,7 @@ import org.nuiton.topia.replication.operation.UnregistredOperation; /** * TopiaReplicationServiceImplTest on model TopiaTest - * <p/> + * * Created: 07 jun. 09 17:14:22 * * @author Tony Chemit - chemit@codelutin.com diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java index 98ba656..988de37 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java @@ -46,7 +46,7 @@ import org.nuiton.topia.persistence.TopiaPersistenceContext; /** * TopiaReplicationServiceImplTest on model TopiaTest - * <p/> + * * Created: 07 jun. 09 17:14:22 * * @author Tony Chemit - chemit@codelutin.com diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java index 8f71cb1..5f143bd 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java @@ -52,7 +52,7 @@ import org.nuiton.topia.replication.operation.UnregistredOperation; /** * TopiaReplicationServiceImplTest on model TopiaTest - * <p/> + * * Created: 07 jun. 09 17:14:22 * * @author Tony Chemit - chemit@codelutin.com @@ -237,7 +237,7 @@ public class TopiaReplicationServiceImplTest extends AbstractTopiaReplicationSer /** * Cette methode montre pourquoi la simple replication ne peut pas * fonctionner :) - * <p/> + * * Le replicateur ne deplique pas dans le bon ordre et on a donc des * violations de clef etrangeres... * @@ -269,7 +269,7 @@ public class TopiaReplicationServiceImplTest extends AbstractTopiaReplicationSer /** * Cette methode montre comment manuellement on peut effectuer la * replication (en dettachant les dependances qui forment des cycles) - * <p/> + * * La methode utilisee ici peut ne pas fonctionner : si une clef metier est * posee sur une dependance alors cela ne fonctionne pas. * @@ -316,13 +316,13 @@ public class TopiaReplicationServiceImplTest extends AbstractTopiaReplicationSer /** * Cette methode montre comment manuellement on peut effectuer la * replication (en dettachant les associations qui forment des cycles) - * <p/> + * * La methode utilisee ici fonctionne mieux que la precedante : il parrait * dificille de pose une une clef metier sur une association :). - * <p/> + * * On remarque que l'on dettache l'assocation qui forme un cycle et que l'on * est pas obligee de la reattachee car elle est bi-directionnelle. - * <p/> + * * On doit optimiser l'algorithme dans la methode {@link * ReplicationModel#adjustOperations(TopiaEntityIdsMap)}. * -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.