diff --git a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/AssertAnalyzer.java b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/AssertAnalyzer.java
index ea0fc000865159bffb9221feab123792d832f357..b21f6f18972d76e4c9f86ed3c62beea182747852 100644
--- a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/AssertAnalyzer.java
+++ b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/AssertAnalyzer.java
@@ -448,7 +448,7 @@ public class AssertAnalyzer extends AssertProcessorImpl {
 	/**
 	 * Process the XPATH assertion and return it as an OwnedRule
 	 * Mainly used for choices handling
-	 * @param test XPATH assertion (Ex: effectiveTime[@xsi:type='CD'] => test="@xsi:type='CD'")
+	 * @param test XPATH assertion (Ex: effectiveTime[@xsi:type='CD'] => test="@xsi:type='CD'")
 	 * @param element element holding the test
 	 * @param pe [NULLABLE] temporary used package for generation rules
 	 * @return returns the generated ownedRule
diff --git a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/HL7TemplatesConverter.java b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/HL7TemplatesConverter.java
index c90093e737aaa9a9b269cb5a126614f8b622c5b4..258b1cab1a88dd6b4d8a74722670bda73b89a7f6 100644
--- a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/HL7TemplatesConverter.java
+++ b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/HL7TemplatesConverter.java
@@ -28,6 +28,7 @@ public class HL7TemplatesConverter {
      * Default conversion of BBR to UML. Base options are ignoreTemplateIdRequirements = true and versionLabel = null
      * @param bbrpath : path to the BBR to convert
      * @throws JAXBException if decor cannot be unmarshall
+     * @return the XMI String
      */
     public String convertArtDecorXMI(String bbrpath) throws JAXBException {
         return convertArtDecorXMI(bbrpath, false, null);
@@ -39,6 +40,7 @@ public class HL7TemplatesConverter {
      * @param ignoreTemplateIdRequirements : if true, no rule for templateId will be generated in the UML model
      * @param templateVersionFilter : only templates defining this version label will be kept in the model (ignored if null)
      * @throws JAXBException if decor cannot be unmarshall
+     * @return The XMI String
      */
     public String convertArtDecorXMI(String bbrpath, boolean ignoreTemplateIdRequirements, String templateVersionFilter)
             throws JAXBException {
diff --git a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/valueset/script/SVSConsumer.java b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/valueset/script/SVSConsumer.java
index 5547c28adb1eba5389ca457f26597c8266de32dc..c40df486dbff44c03bc7147ead02c176def67a51 100644
--- a/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/valueset/script/SVSConsumer.java
+++ b/hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/valueset/script/SVSConsumer.java
@@ -25,8 +25,8 @@ public class SVSConsumer {
 
 	/**
 	 * 
-	 * @param valueSetId
-	 * @return
+	 * @param valueSetId the valueSet Id
+	 * @return List of retrieved concepts
 	 */
 	public List<Concept> getConceptsListFromValueSet(String valueSetId, String lang) {
 		if (listConcept.get(valueSetId + lang) != null) {
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ArchetypeInstantiatorMaven.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ArchetypeInstantiatorMaven.java
index f9ebb028249194ca6b93dd3653291216ebffb129..672e856997a3d6394122ea9b813bf3fd762128ff 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ArchetypeInstantiatorMaven.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ArchetypeInstantiatorMaven.java
@@ -41,6 +41,10 @@ public class ArchetypeInstantiatorMaven implements ArchetypeInstantiator {
     /**
      * Creates an instance of the class with a defined root path to create archetypes instances.
      * @param workspacesRoot : root path where workspaces will be created.
+     * @param mvnExecutionPath : binary path for maven
+     * @param gocLogger : The instance of the logger
+     * @param processExecutor : The instance of the process Executor
+     * @param valueSetExtractor : The instance of the valueSet Extractor
      */
     public ArchetypeInstantiatorMaven(String workspacesRoot, String mvnExecutionPath, GOCLogger gocLogger, ProcessExecutor processExecutor,
                                       ValueSetExtractor valueSetExtractor){
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/GeneratedValidatorArchiverImpl.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/GeneratedValidatorArchiverImpl.java
index 27d67fc3fbda28d70dfdd2568f32117b9374a8b7..09c404b4c2d69f1de4af92e2944a5ee6afe23f2e 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/GeneratedValidatorArchiverImpl.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/GeneratedValidatorArchiverImpl.java
@@ -25,6 +25,7 @@ public class GeneratedValidatorArchiverImpl implements GeneratedValidatorArchive
 
     /**
      * Public constructor for the class
+     * @param workspacesRoot workspace root
      */
     public GeneratedValidatorArchiverImpl(String workspacesRoot){
         setWorkspacesRoot(workspacesRoot);
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ImportUpdaterImpl.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ImportUpdaterImpl.java
index 2c80d107df63cf3be2561ee87b1d9abd8bc005ac..121893ec55dddb47611b75a7b3552b75b5fc7798 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ImportUpdaterImpl.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ImportUpdaterImpl.java
@@ -62,7 +62,7 @@ public class ImportUpdaterImpl implements ImportUpdater {
      * Update imports in generated validator classes to import model classes based on which configuration is used.
      * @param workspace : workspace where the java code will be generated.
      * @param validatorConfiguration : holds the name of the project that will be used to generate the java code.
-     * @throws IOException
+     * @throws IOException Throws IOException if updating failed
      */
     @Override
     public void updateImportsForValidator(Workspace workspace, ValidatorConfiguration validatorConfiguration) throws IOException {
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/UMLModelGenerator.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/UMLModelGenerator.java
index 355f84aba9b65fca4ec7fa305af86e94e22c0088..e56aa17bada24376ab231d042138b35b5e3e4946 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/UMLModelGenerator.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/UMLModelGenerator.java
@@ -36,6 +36,7 @@ public class UMLModelGenerator implements ModelGenerator {
     /**
      * Creates an instance of the class with a defined root path to workspaces.
      * @param workspacesRoot : root path where workspaces will be created.
+     * @param gocLogger : The instance of the logger
      */
     public UMLModelGenerator(String workspacesRoot, GOCLogger gocLogger){
         setWorkspacesRoot(workspacesRoot);
@@ -45,6 +46,7 @@ public class UMLModelGenerator implements ModelGenerator {
 
     /**
      * Getter for the workspaceRoot property.
+     * @return the workspace root
      */
     public String getWorkspacesRoot() {
         if (this.workspacesRoot != null){
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ValidatorGeneratorPlugin.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ValidatorGeneratorPlugin.java
index 0a9c6a62bc89a8babdb3b376703a5d86b72f75fd..9b4b32d7317cb8a563c3fa51186ba3e9ce094d4e 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ValidatorGeneratorPlugin.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ValidatorGeneratorPlugin.java
@@ -35,9 +35,14 @@ public class ValidatorGeneratorPlugin implements ValidatorGenerator {
     private ValidatorGeneratorPlugin(){
     }
 
+
     /**
      * Creates an instance of the class with a defined root path to create workspaces.
      * @param workspacesRoot : root path where workspaces will be created.
+     * @param mvnExecutionPath : path of binary maven
+     * @param gocLogger : The instance of the logger
+     * @param processExecutor : The instance of the executor
+     * @param validatorRightUpdater : The instance of the rightUpdater
      */
     public ValidatorGeneratorPlugin(String workspacesRoot, String mvnExecutionPath, GOCLogger gocLogger, ProcessExecutor processExecutor,
                                     ValidatorRightUpdater validatorRightUpdater){
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ValueSetExtractorImpl.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ValueSetExtractorImpl.java
index 8dfdd5ee10236bc60845ca136128e9a970942f7a..15802767b1d3595357841956c1322626d709ed63 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ValueSetExtractorImpl.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ValueSetExtractorImpl.java
@@ -34,6 +34,7 @@ public class ValueSetExtractorImpl implements ValueSetExtractor {
 
     /**
      * Getter for workspaceRoot property.
+     * @return workspace root
      */
     public String getWorkspaceRoot() {
         if (workspaceRoot != null){
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ZipUtility.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ZipUtility.java
index d8a803123792250e882a0eaf4e80eab4ae5b49c6..4061e8ef8a154f15a299d0d006dfe6b1f19e3b3e 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ZipUtility.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/adapters/ZipUtility.java
@@ -93,6 +93,9 @@ public class ZipUtility {
 
     /**
      * copie le fichier source dans le fichier resultat retourne vrai si cela réussit
+     * @param source source File
+     * @param dest destination File
+     * @return true if copying is done, else false
      */
     public static boolean copyFile(File source, File dest) {
         try {
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/application/GOCPackager.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/application/GOCPackager.java
index e087683692e1e44754d079d8997d3bdd292ba914..47dd60aa90873fb2cacbe6a457a9be39e15d5255 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/application/GOCPackager.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/application/GOCPackager.java
@@ -49,6 +49,7 @@ public class GOCPackager {
 	 * Entry point of the whole packaging process to create a validator
 	 * @param workspace : workspace for the generation.
 	 * @param validatorConfiguration : ValidatorConfiguration used for the generation.
+	 * @throws PackagerProcessException throws a PackagerProcessException if one of main operations failed
 	 */
 	public void packageBBRToGOCValidationTool(Workspace workspace, ValidatorConfiguration validatorConfiguration)
 			throws PackagerProcessException {
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/application/ValidatorConfiguration.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/application/ValidatorConfiguration.java
index af2fbc835b074db9e73ef61a46c2bef0ff120600..f91ee6fc6fb4b77ee62e07094caa8492892a38cd 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/application/ValidatorConfiguration.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/application/ValidatorConfiguration.java
@@ -142,7 +142,7 @@ public class ValidatorConfiguration {
     /**
      * Setter for the serviceName property directly from the input string.
      *
-     * @param serviceName
+     * @param serviceName service name
      */
     public void setServiceName(String serviceName) {
         this.serviceName = serviceName;
@@ -160,7 +160,7 @@ public class ValidatorConfiguration {
     /**
      * Setter for the projectNaming property directly from the input string.
      *
-     * @param projectNaming
+     * @param projectNaming project naming
      */
     public void setProjectNaming(ProjectNaming projectNaming) {
         this.projectNaming = projectNaming;
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/FileWriterImpl.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/FileWriterImpl.java
index 6c2c8df5775cb4caabac9a33bc279f2b8c7ff4d2..e4f184981b5e3e505fefce54f6e5a645bdca13dd 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/FileWriterImpl.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/FileWriterImpl.java
@@ -11,7 +11,7 @@ public class FileWriterImpl implements FileWriter {
      * Write the content of a resource from an URL to a specific file.
      * @param resourceURL : URL of the resource to write in the file.
      * @param fileOutputPath : path of the file where the resource will be written.
-     * @throws IOException
+     * @throws IOException throws IOException if writing failed
      */
     public void writeContentInFile(URL resourceURL, String fileOutputPath) throws IOException{
         try (InputStream resourceInputStream = resourceURL.openStream()) {
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/FolderCreatorImpl.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/FolderCreatorImpl.java
index f7dfd859ef03d41c7539a931a1b936c9dc011439..fa62eb37044336757f12c7e633409b62831d0885 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/FolderCreatorImpl.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/FolderCreatorImpl.java
@@ -26,7 +26,7 @@ public class FolderCreatorImpl implements FolderCreator {
      * Reset the folder at path given in parameter. This means if it exist it will delete it and create it again. If it does not already
      * exists, it will simply create it.
      * @param folderToResetPath : path to the folder to reset.
-     * @throws IOException
+     * @throws IOException throw IOException if the reset failed
      */
     public void resetFolder(String folderToResetPath) throws IOException {
         File folderToReset = new File(folderToResetPath);
@@ -47,7 +47,7 @@ public class FolderCreatorImpl implements FolderCreator {
     /**
      * Create a folder at given path. Does nothing if folder already exists.
      * @param folderToCreatePath : path to the folder to create.
-     * @throws IOException
+     * @throws IOException throws and IOException if the creation failed
      */
     public void createFolder(String folderToCreatePath) throws  IOException {
         File folderToCreate = new File(folderToCreatePath);
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCLoggerImpl.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCLoggerImpl.java
index d2947f78d868927c99b240d68fb4550f3c9a43d2..1f513f9a5699039f5da1fbba4fe46e302b51e7b2 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCLoggerImpl.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCLoggerImpl.java
@@ -86,7 +86,6 @@ public class GOCLoggerImpl implements GOCLogger {
      * Log the output of the process
      * @param inputStream : the input stream to be logged
      * @param errorStream : the error stream to be logged
-     * @throws IOException
      */
     @Override
     public void logExecutionOutput(InputStream inputStream, InputStream errorStream, String command) {
diff --git a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCPackagerFactory.java b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCPackagerFactory.java
index 79cfb7c0f491c1d198b26cb45cee73f7f865e7b0..83da3056d8f11994136310fe5491a0ec60fda0dd 100644
--- a/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCPackagerFactory.java
+++ b/hl7templates/hl7templates-packager-jar/src/main/java/net/ihe/gazelle/lib/hl7templatespackager/peripherals/GOCPackagerFactory.java
@@ -24,6 +24,10 @@ public class GOCPackagerFactory {
      * Generate an instance of GOCPackager able to generate validators in a given workspace.
      * @param workspacesRoot : root path for the workspaces that will be used for generation
      * @param mvnExecutionPath : path to maven execution (eg: mvn)
+     * @param generationDate : generation date, used for creating logs folder
+     * @param gocLogger : The instance of the logger
+     * @param processExecutor : the instance of the process executor
+     * @return returns the packager
      */
     public GOCPackager createGOCPackager(String workspacesRoot, String mvnExecutionPath, String generationDate, GOCLogger gocLogger,
             ProcessExecutor processExecutor){